emacs,shell: back to tango(mod) and doom-one

[~bandali/configs] / .emacs.d / init.el

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 076a7b5..9f5d07f 100644 (file)
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -618,6 +618,18 @@ around if needed."
                            (interactive)
                            (start-process-shell-command
                             "rofi-pass" nil "rofi-pass")))
+          ([?\s-h] . windmove-left)
+          ([?\s-j] . windmove-down)
+          ([?\s-k] . windmove-up)
+          ([?\s-l] . windmove-right)
+          ([?\s-H] . windmove-swap-states-left)
+          ([?\s-J] . windmove-swap-states-down)
+          ([?\s-K] . windmove-swap-states-up)
+          ([?\s-L] . windmove-swap-states-right)
+          ([?\M-\s-h] . shrink-window-horizontally)
+          ([?\M-\s-l] . enlarge-window-horizontally)
+          ([?\M-\s-k] . shrink-window)
+          ([?\M-\s-j] . enlarge-window)
           ([?\s-\[] . (lambda ()
                         (interactive)
                         (exwm-workspace-switch-create
@@ -681,7 +693,9 @@ around if needed."
           ([XF86ScreenSaver] .
            (lambda ()
                     (interactive)
-                    (start-process "" nil "dm-tool" "lock")))))
+                    (start-process "" nil "dm-tool" "lock")))
+          ([\s-XF86Back] . previous-buffer)
+          ([\s-XF86Forward] . next-buffer)))
 
   ;; Line-editing shortcuts
   (setq exwm-input-simulation-keys
@@ -1493,54 +1507,53 @@ This function is intended for use with `ivy-ignore-buffers'."
   :custom
   (doom-modeline-buffer-file-name-style 'relative-to-project))
 
-(use-package doom-themes
-  :disabled)
+(use-package doom-themes)
 
 (use-package solarized-theme
+  :disabled
+  :config
+  (load-theme 'solarized-light t))
+
+(use-package moody
   :demand
   :config
-  (load-theme 'solarized-light t)
+  (setq x-underline-at-descent-line t)
   (let ((line (face-attribute 'mode-line :underline)))
     (set-face-attribute 'mode-line          nil :overline   line)
     (set-face-attribute 'mode-line-inactive nil :overline   line)
     (set-face-attribute 'mode-line-inactive nil :underline  line)
     (set-face-attribute 'mode-line          nil :box        nil)
     (set-face-attribute 'mode-line-inactive nil :box        nil)
-    (set-face-attribute 'mode-line-inactive nil :background "#f9f2d9")))
-
-(use-package moody
-  :demand
-  :config
-  (setq x-underline-at-descent-line t)
+    (set-face-attribute 'mode-line-inactive nil :background "#eeeeee")) ; d3d7cf
   (moody-replace-mode-line-buffer-identification)
   (moody-replace-vc-mode))
 
 (defvar b/org-mode-font-lock-keywords
-  "For use with the `doom-tomorrow-night' theme."
   '(("[ \t]*\\(#\\+\\(BEGIN\\|END\\|begin\\|end\\)_\\(\\S-+\\)\\)[ \t]*\\([^\n:]*\\)"
       (1 '(:foreground "#5a5b5a" :background "#292b2b") t) ; directive
       (3 '(:foreground "#81a2be" :background "#292b2b") t) ; kind
-      (4 '(:foreground "#c5c8c6") t))))                    ; title
+      (4 '(:foreground "#c5c8c6") t)))                     ; title
+  "For use with the `doom-tomorrow-night' theme.")
 
 (defun b/lights-on ()
   "Enable my favourite light theme."
   (interactive)
   (mapc #'disable-theme custom-enabled-themes)
-  (load-theme 'solarized-light t)
+  (load-theme 'tangomod t)
   ;; (sml/apply-theme 'automatic)
-  ;; (font-lock-remove-keywords
-  ;;  'org-mode b/org-mode-font-lock-keywords)
-  (run-with-timer 0.01 nil 'exwm-systemtray--refresh))
+  (font-lock-remove-keywords
+   'org-mode b/org-mode-font-lock-keywords)
+  (exwm-systemtray--refresh))
 
 (defun b/lights-off ()
   "Go dark."
   (interactive)
   (mapc #'disable-theme custom-enabled-themes)
-  (load-theme 'solarized-dark t)
+  (load-theme 'doom-one t)
   ;; (sml/apply-theme 'automatic)
-  ;; (font-lock-add-keywords
-  ;;  'org-mode b/org-mode-font-lock-keywords t)
-  (run-with-timer 0.01 nil 'exwm-systemtray--refresh))
+  (font-lock-add-keywords
+   'org-mode b/org-mode-font-lock-keywords t)
+  (exwm-systemtray--refresh))
 
 (bind-keys
  ("C-c t d" . b/lights-off)
@@ -2497,6 +2510,7 @@ https://csclub.uwaterloo.ca/~abandali")
   (erc-track-enable-keybindings nil)
   (erc-track-exclude-types '("JOIN" "MODE" "NICK" "PART" "QUIT"
                              "324" "329" "332" "333" "353" "477"))
+  (erc-track-position-in-mode-line t)
   (erc-track-priority-faces-only 'all)
   (erc-track-shorten-function nil))