X-Git-Url: https://git.shemshak.org/gitweb.cgi/~bandali/configs/blobdiff_plain/d7e1ea831d7803a040135edf00d224ba6e80f613..1f56a9b9b2f22d5df1db092c7fbe51485f569449:/init.org?ds=sidebyside

diff --git a/init.org b/init.org
index 1c847ff..4ff8b94 100644
--- a/init.org
+++ b/init.org
@@ -348,7 +348,7 @@ in my shell.
   (exec-path-from-shell-copy-env "SSH_AUTH_SOCK"))
 #+end_src
 
-** Only one custom theme at a time
+** COMMENT Only one custom theme at a time
 
 #+begin_src emacs-lisp
 (defadvice load-theme (before clear-previous-themes activate)
@@ -716,23 +716,17 @@ customizing it.
 (use-package evil
   :demand t
   ;; :hook (org-src-mode . evil-motion-state)
-  :init
-  (setq evil-want-integration nil)
   :config
   (evil-mode 1)
   (general-swap-key nil '(normal motion) ";" ":")
 
-  (setq
-   evil-want-visual-char-semi-exclusive t
-   evil-move-beyond-eol  t
-   ;; evil-move-cursor-back nil
-   )
+  (setq evil-want-visual-char-semi-exclusive t)
 
-  ;; motion state modes
-  (dolist (mode '(ebdb-mode
-                  helpful-mode
-                  view-mode))
-    (evil-set-initial-state mode 'motion))
+  ;; custom mode state mappings
+  (dolist (mspair '((ebdb-mode    . emacs)
+                    (helpful-mode . motion)
+                    (view-mode    . motion)))
+    (evil-set-initial-state (car mspair) (cdr mspair)))
 
   ;; fix tab and indentation in src blocks inside org-mode buffer
   ;; also see https://git.sr.ht/~bandali/dotfiles/commit/0e2ffd584aafdd4cf256bcdf2473f01c3aaaed55
@@ -796,6 +790,9 @@ customizing it.
 (amin--leader-keys
   "/"   '(:ignore t :wk "search")
 
+  "a"   '(:ignore t :wk "apps")
+  "a i" 'ielm
+
   "b"   '(:ignore t :wk "buffers")
   "b k" 'kill-this-buffer
   "b s" 'save-buffer
@@ -804,8 +801,6 @@ customizing it.
   "e b" 'eval-buffer
   "e r" 'eval-region
 
-  "e e" 'shell-pop
-
   "f"   '(:ignore t :wk "files")
 
   "F"   '(:ignore t :wk "frames")
@@ -1254,12 +1249,14 @@ TODO: break this giant source block down into individual org sections.
                (list (regexp-quote (system-name)) nil nil)))
 
 (use-package undo-tree
-  :bind (("C-?" . undo-tree-undo)
-         ("M-_" . undo-tree-redo))
   :config
-  (global-undo-tree-mode)
-  (setq undo-tree-mode-lighter ""
-        undo-tree-auto-save-history t))
+  (global-undo-tree-mode -1))
+  ;; :bind (("C-?" . undo-tree-undo)
+  ;;        ("M-_" . undo-tree-redo))
+  ;; :config
+  ;; (global-undo-tree-mode)
+  ;; (setq undo-tree-mode-lighter ""
+  ;;       undo-tree-auto-save-history t))
 #+end_src
 
 * Editing
@@ -1700,16 +1697,48 @@ Emacs package that displays available keybindings in popup
   :config (which-key-mode))
 #+end_src
 
+** theme
+
+#+begin_src emacs-lisp
+(add-to-list 'custom-theme-load-path "~/.emacs.d/lisp")
+(load-theme 'tangomod t)
+#+end_src
+
 ** [[https://github.com/Malabarba/smart-mode-line][smart-mode-line]]
 
 #+begin_src emacs-lisp
 (use-package smart-mode-line
   :config
   (sml/setup)
-  ;; (sml/apply-theme 'light)
+  (sml/apply-theme 'light)
   (remove-hook 'display-time-hook 'sml/propertize-time-string))
 #+end_src
 
+** theme helper functions
+
+#+begin_src emacs-lisp
+(defun amin/light ()
+  "Load light theme(s)."
+  (interactive)
+  (progn
+    (mapc #'disable-theme custom-enabled-themes)
+    (load-theme 'tangomod t)
+    (sml/apply-theme 'light)))
+
+(defun amin/dark ()
+  "Load dark theme(s)."
+  (interactive)
+  (progn
+    (mapc #'disable-theme custom-enabled-themes)
+    (load-theme 'tangomod-dark t)
+    (sml/apply-theme 'dark)))
+
+(amin--leader-keys
+  "t"   '(:ignore t :wk "theme")
+  "t d" 'amin/dark
+  "t l" 'amin/light)
+#+end_src
+
 ** [[https://github.com/bbatsov/crux][crux]]
 
 #+begin_src emacs-lisp
@@ -1784,6 +1813,7 @@ Emacs package that displays available keybindings in popup
 #+begin_src emacs-lisp
 (use-package shell-pop
   :defer 1
+  :general (amin--leader-keys "a s" 'shell-pop)
   :init
   (setq shell-pop-universal-key "C-c e"
         shell-pop-shell-type '("eshell" "*eshell*" (lambda nil (eshell)))))
@@ -2055,7 +2085,7 @@ For when I /have to/ use GH.
              (nnimap-server-port 143)
              (nnimap-authenticator plain)
              (nnimap-user "abandali@uwaterloo.ca")))
-   gnus-message-archive-group "nnimap:Sent"
+   gnus-message-archive-group "nnimap+amin:Sent"
    gnus-parameters
    '(("gnu.*"
       (gcc-self . t)))