Merge branch 'master' of gitlab.com:dwt1/dotfiles

.config/emacs/config.el

@@ -109,16 +109,27 @@
           evil-split-window-below t
           evil-undo-system 'undo-redo)  ;; Adds vim-like C-r redo functionality
     (evil-mode))
-  (use-package evil-collection
-    :after evil
-    :config
-    ;; Do not uncomment this unless you want to specify each and every mode
-    ;; that evil-collection should works with.  The following line is here 
-    ;; for documentation purposes in case you need it.  
-    ;; (setq evil-collection-mode-list '(calendar dashboard dired ediff info magit ibuffer))
-    (add-to-list 'evil-collection-mode-list 'help) ;; evilify help mode
-    (evil-collection-init))
-  (use-package evil-tutor)
+
+(use-package evil-collection
+  :after evil
+  :config
+  ;; Do not uncomment this unless you want to specify each and every mode
+  ;; that evil-collection should works with.  The following line is here 
+  ;; for documentation purposes in case you need it.  
+  ;; (setq evil-collection-mode-list '(calendar dashboard dired ediff info magit ibuffer))
+  (add-to-list 'evil-collection-mode-list 'help) ;; evilify help mode
+  (evil-collection-init))
+
+(use-package evil-tutor)
+
+;; Using RETURN to follow links in Org/Evil 
+;; Unmap keys in 'evil-maps if not done, (setq org-return-follows-link t) will not work
+(with-eval-after-load 'evil-maps
+  (define-key evil-motion-state-map (kbd "SPC") nil)
+  (define-key evil-motion-state-map (kbd "RET") nil)
+  (define-key evil-motion-state-map (kbd "TAB") nil))
+;; Setting RETURN key in org-mode to follow links
+  (setq org-return-follows-link  t)
 
 (use-package flycheck
   :ensure t
@@ -312,6 +323,7 @@
   (dt/leader-keys
     "o" '(:ignore t :wk "Open")
     "o d" '(dashboard-open :wk "Dashboard")
+    "o e" '(elfeed :wk "Elfeed RSS")
     "o f" '(make-frame :wk "Open buffer in new frame")
     "o F" '(select-frame-by-name :wk "Select frame by name"))
 

.config/emacs/config.org

@@ -38,7 +38,7 @@
   - [[#source-code-block-tag-expansion][Source Code Block Tag Expansion]]
 - [[#perspective][PERSPECTIVE]]
 - [[#projectile][PROJECTILE]]
-- [[#rainbow-delimters][RAINBOW DELIMTERS]]
+- [[#rainbow-delimiters][RAINBOW DELIMITERS]]
 - [[#rainbow-mode][RAINBOW MODE]]
 - [[#sane-defaults][SANE DEFAULTS]]
 - [[#shells-and-terminals][SHELLS AND TERMINALS]]
@@ -215,16 +215,28 @@ An RSS newsfeed reader for Emacs.  Move through the articles with 'j/k'.  Move t
           evil-split-window-below t
           evil-undo-system 'undo-redo)  ;; Adds vim-like C-r redo functionality
     (evil-mode))
-  (use-package evil-collection
-    :after evil
-    :config
-    ;; Do not uncomment this unless you want to specify each and every mode
-    ;; that evil-collection should works with.  The following line is here 
-    ;; for documentation purposes in case you need it.  
-    ;; (setq evil-collection-mode-list '(calendar dashboard dired ediff info magit ibuffer))
-    (add-to-list 'evil-collection-mode-list 'help) ;; evilify help mode
-    (evil-collection-init))
-  (use-package evil-tutor)
+
+(use-package evil-collection
+  :after evil
+  :config
+  ;; Do not uncomment this unless you want to specify each and every mode
+  ;; that evil-collection should works with.  The following line is here 
+  ;; for documentation purposes in case you need it.  
+  ;; (setq evil-collection-mode-list '(calendar dashboard dired ediff info magit ibuffer))
+  (add-to-list 'evil-collection-mode-list 'help) ;; evilify help mode
+  (evil-collection-init))
+
+(use-package evil-tutor)
+
+;; Using RETURN to follow links in Org/Evil 
+;; Unmap keys in 'evil-maps if not done, (setq org-return-follows-link t) will not work
+(with-eval-after-load 'evil-maps
+  (define-key evil-motion-state-map (kbd "SPC") nil)
+  (define-key evil-motion-state-map (kbd "RET") nil)
+  (define-key evil-motion-state-map (kbd "TAB") nil))
+;; Setting RETURN key in org-mode to follow links
+  (setq org-return-follows-link  t)
+
 #+end_src
 
 * FLYCHECK
@@ -439,6 +451,7 @@ You can use the bindings CTRL plus =/- for zooming in/out.  You can also use CTR
   (dt/leader-keys
     "o" '(:ignore t :wk "Open")
     "o d" '(dashboard-open :wk "Dashboard")
+    "o e" '(elfeed :wk "Elfeed RSS")
     "o f" '(make-frame :wk "Open buffer in new frame")
     "o F" '(select-frame-by-name :wk "Select frame by name"))
 
@@ -727,7 +740,7 @@ Org-tempo is not a separate package but a module within org that can be enabled.
   (projectile-mode 1))
 #+end_src
 
-* RAINBOW DELIMTERS
+* RAINBOW DELIMITERS
 Adding rainbow coloring to parentheses.
 
 #+begin_src emacs-lisp