sway: disable mouse warping and use the right ctrl for win

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

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 94b096d..1f31d3b 100644 (file)
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -181,8 +181,6 @@
 (setq use-package-always-defer t)
 (require 'bind-key)
 
 (setq use-package-always-defer t)
 (require 'bind-key)
 

-(use-package delight)
-

 \f
 ;;; Initial setup
 
 \f
 ;;; Initial setup
 


@@ -395,16 +393,22 @@ For disabling the behaviour for certain buffers and/or modes."
   (global-auto-revert-non-file-buffers nil))
 
 ;; time and battery in mode-line
   (global-auto-revert-non-file-buffers nil))
 
 ;; time and battery in mode-line

-(comment
-  (use-feature time
-    :init
-    (setq display-time-default-load-average nil)
-    :config
-    (display-time-mode))
+(use-feature time
+  :disabled
+  :demand
+  :config
+  (display-time-mode)
+  :custom
+  (display-time-default-load-average nil)
+  (display-time-format "%a %b %-e, %-l:%M%P"))

 
 

-  (use-feature battery
-    :config
-    (display-battery-mode)))
+(use-feature battery
+  :disabled
+  :demand
+  :config
+  (display-battery-mode)
+  :custom
+  (battery-mode-line-format " %p%% %t"))

 
 (use-feature fringe
   :demand
 
 (use-feature fringe
   :demand


@@ -562,171 +566,223 @@ For disabling the behaviour for certain buffers and/or modes."
   :disabled
   :demand
   :config
   :disabled
   :demand
   :config

-  (require 'exwm-config)
-
-  ;; Set the initial workspace number.
-  (setq exwm-workspace-number 4)
-
-  ;; Make class name the buffer name, truncating beyond 50 characters
-  (defun exwm-rename-buffer ()
+  ;; make class name the buffer name, truncating beyond 60 characters
+  (defun b/exwm-rename-buffer ()

     (interactive)
     (exwm-workspace-rename-buffer
      (concat exwm-class-name ":"
     (interactive)
     (exwm-workspace-rename-buffer
      (concat exwm-class-name ":"

-             (if (<= (length exwm-title) 50) exwm-title
-               (concat (substring exwm-title 0 49) "...")))))
-  (add-hook 'exwm-update-class-hook 'exwm-rename-buffer)
-  (add-hook 'exwm-update-title-hook 'exwm-rename-buffer)
-
-  ;; 's-R': Reset
-  (exwm-input-set-key (kbd "s-R") #'exwm-reset)
-  ;; 's-\': Switch workspace
-  (exwm-input-set-key (kbd "s-\\") #'exwm-workspace-switch)
-  ;; 's-N': Switch to certain workspace
-  (dotimes (i 10)
-    (exwm-input-set-key
-     (kbd (format "s-%d" i))
-     (lambda ()
-       (interactive)
-       (exwm-workspace-switch-create i))))
-  ;; 's-SPC': Launch application
-  ;; (exwm-input-set-key
-  ;;  (kbd "s-SPC")
-  ;;  (lambda (command)
-  ;;    (interactive (list (read-shell-command "➜ ")))
-  ;;    (start-process-shell-command command nil command)))
-
-  (exwm-input-set-key (kbd "M-s-SPC") #'counsel-linux-app)
-
-  ;; Shorten 'C-c C-q' to 'C-q'
-  (define-key exwm-mode-map [?\C-q] #'exwm-input-send-next-key)
-
-  ;; Line-editing shortcuts
-  (setq exwm-input-simulation-keys
-       '(;; movement
-          ([?\C-b] . [left])
-          ([?\M-b] . [C-left])
-          ([?\C-f] . [right])
-          ([?\M-f] . [C-right])
-          ([?\C-p] . [up])
-          ([?\C-n] . [down])
-          ([?\C-a] . [home])
-          ([?\C-e] . [end])
-          ([?\M-v] . [prior])
-          ([?\C-v] . [next])
-          ([?\C-d] . [delete])
-          ([?\C-k] . [S-end delete])
-          ;; cut/copy/paste
-          ;; ([?\C-w] . [?\C-x])
-          ([?\M-w] . [?\C-c])
-          ([?\C-y] . [?\C-v])
-          ;; search
-          ([?\C-s] . [?\C-f])))
-
+             (if (<= (length exwm-title) 60) exwm-title
+               (concat (substring exwm-title 0 59) "...")))))

   ;; Enable EXWM
   (exwm-enable)
   ;; Enable EXWM
   (exwm-enable)

+  :hook ((exwm-update-class . b/exwm-rename-buffer)
+         (exwm-update-title . b/exwm-rename-buffer)))

 
 

-  (add-hook 'exwm-init-hook #'exwm-config--fix/ido-buffer-window-other-frame)
+(use-feature exwm-config
+  :demand
+  :after exwm
+  :hook (exwm-init . exwm-config--fix/ido-buffer-window-other-frame))
+
+(use-feature exwm-input
+  :demand
+  :after exwm
+  :config
+  (defun b/exwm-ws-prev-index ()
+    "Return the index for the previous EXWM workspace, wrapping
+around if needed."
+    (if (= exwm-workspace-current-index 0)
+        (1- exwm-workspace-number)
+      (1- exwm-workspace-current-index)))
+
+  (defun b/exwm-ws-next-index ()
+    "Return the index for the next EXWM workspace, wrapping
+around if needed."
+    (if (= exwm-workspace-current-index
+           (1- exwm-workspace-number))
+        0
+      (1+ exwm-workspace-current-index)))
+
+  ;; shorten 'C-c C-q' to 'C-q'
+  (define-key exwm-mode-map [?\C-q] #'exwm-input-send-next-key)

 
 

-  (require 'exwm-systemtray)
-  (exwm-systemtray-enable)
+  (setq exwm-workspace-number 4
+        exwm-input-global-keys
+        `(([?\s-R] . exwm-reset)
+          ([?\s-\\] . exwm-workspace-switch)
+          ([?\s-\s] . dmenu)
+          ([?\S-\s-\s] . (lambda (command)
+                              (interactive
+                               (list (read-shell-command "➜ ")))
+                              (start-process-shell-command
+                               command nil command)))
+          ([s-return] . (lambda ()
+                          (interactive)
+                          (start-process "" nil "urxvt")))
+          ([?\C-\s-\s] . counsel-linux-app)
+          ([?\M-\s-\s] . (lambda ()
+                           (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
+                         (b/exwm-ws-prev-index))))
+          ([?\s-\]] . (lambda ()
+                        (interactive)
+                        (exwm-workspace-switch-create
+                         (b/exwm-ws-next-index))))
+          ([?\s-{] . (lambda ()
+                       (interactive)
+                       (exwm-workspace-move-window
+                        (b/exwm-ws-prev-index))))
+          ([?\s-}] . (lambda ()
+                       (interactive)
+                       (exwm-workspace-move-window
+                        (b/exwm-ws-next-index))))
+          ,@(mapcar (lambda (i)
+                      `(,(kbd (format "s-%d" i)) .
+                        (lambda ()
+                          (interactive)
+                          (exwm-workspace-switch-create ,i))))
+                    (number-sequence 0 (1- exwm-workspace-number)))
+          ([?\s-t] . exwm-floating-toggle-floating)
+          ([?\s-f] . exwm-layout-toggle-fullscreen)
+          ([?\s-W] . (lambda ()
+                       (interactive)
+                       (kill-buffer (current-buffer))))
+          ([?\s-Q] . (lambda ()
+                       (interactive)
+                       (exwm-manage--kill-client)))
+          ([?\s-\'] . (lambda ()
+                        (interactive)
+                        (start-process-shell-command
+                         "rofi-light" nil "rofi-light")))
+          ([XF86AudioMute] .
+           (lambda ()
+             (interactive)
+             (start-process "" nil "pamixer" "--toggle-mute")))
+          ([XF86AudioLowerVolume] .
+           (lambda ()
+             (interactive)
+             (start-process
+              "" nil "pamixer" "--allow-boost" "--decrease" "5")))
+          ([XF86AudioRaiseVolume] .
+           (lambda ()
+             (interactive)
+             (start-process
+              "" nil "pamixer" "--allow-boost" "--increase" "5")))
+          ([XF86AudioPlay] .
+           (lambda ()
+             (interactive)
+             (start-process "" nil "mpc" "toggle")))
+          ([XF86AudioPrev] .
+           (lambda ()
+             (interactive)
+             (start-process "" nil "mpc" "prev")))
+          ([XF86AudioNext] .
+           (lambda ()
+             (interactive)
+             (start-process "" nil "mpc" "next")))
+          ([XF86ScreenSaver] .
+           (lambda ()
+                    (interactive)
+                    (start-process "" nil "dm-tool" "lock")))
+          ([\s-XF86Back] . previous-buffer)
+          ([\s-XF86Forward] . next-buffer)))

 
 

-  (require 'exwm-randr)
+  ;; Line-editing shortcuts
+  (setq exwm-input-simulation-keys
+    '(;; movement
+      ([?\C-b] . [left])
+      ([?\M-b] . [C-left])
+      ([?\C-f] . [right])
+      ([?\M-f] . [C-right])
+      ([?\C-p] . [up])
+      ([?\C-n] . [down])
+      ([?\C-a] . [home])
+      ([?\C-e] . [end])
+      ([?\M-v] . [prior])
+      ([?\C-v] . [next])
+      ([?\C-d] . [delete])
+      ([?\C-k] . [S-end ?\C-x])
+      ([?\M-<] . C-home)
+      ([?\M->] . C-end)
+      ;; cut/copy/paste
+      ([?\C-w] . [?\C-x])
+      ([?\M-w] . [?\C-c])
+      ([?\C-y] . [?\C-v])
+      ([?\M-d] . [C-S-right ?\C-x])
+      ([?\M-\d] . [C-S-left ?\C-x])
+      ;; window
+      ([?\s-w] . [?\C-w])
+      ([?\s-q] . [?\C-q])
+      ;; misc
+      ([?\C-s] . [?\C-f])
+      ([?\s-s] . [?\C-s])
+      ([?\C-g] . [escape]))))
+
+(use-feature exwm-manage
+  :demand
+  :after exwm
+  :hook
+  (exwm-manage-finish . (lambda ()
+                          (when exwm-class-name
+                            (cond
+                             ((string= exwm-class-name "Abrowser")
+                              (exwm-input-set-local-simulation-keys
+                               `(,@exwm-input-simulation-keys
+                                 ([?\C-\S-d] . [?\C-d]))))
+                             ((string= exwm-class-name "URxvt")
+                              (exwm-input-set-local-simulation-keys
+                               '(([?\C-c ?\C-c] . [?\C-c])
+                                 ([?\C-c ?\C-u] . [?\C-u]))))
+                             ((string= exwm-class-name "Zathura")
+                              (exwm-input-set-local-simulation-keys
+                               '(([?\C-p] . [C-up])
+                                 ([?\C-n] . [C-down])))))))))
+
+(use-feature exwm-randr
+  :demand
+  :after exwm
+  :config

   (exwm-randr-enable)
   (exwm-randr-enable)

+  :custom
+  (exwm-randr-workspace-monitor-plist '(1 "VGA-1"))
+  :hook
+  (exwm-randr-screen-change . (lambda ()
+                                (let ((xrandr
+                                       (string-join
+                                        '("xrandr"
+                                          "--output VGA-1"
+                                          "--same-as LVDS-1"
+                                          "--auto")
+                                        " ")))
+                                  (start-process-shell-command
+                                   "xrandr" nil xrandr)))))
+
+(use-feature exwm-systemtray
+  :demand
+  :after exwm
+  :config
+  (exwm-systemtray-enable))

 
 

-  ;; (exwm-input-set-key
-  ;;  (kbd "s-<return>")
-  ;;  (lambda ()
-  ;;    (interactive)
-  ;;    (start-process "urxvt" nil "urxvt")))
-
-  ;; (exwm-input-set-key
-  ;;  (kbd "s-SPC")  ;; rofi doesn't properly launch programs when started from emacs
-  ;;  (lambda ()
-  ;;    (interactive)
-  ;;    (start-process-shell-command "rofi-run" nil "rofi -show run -display-run '> ' -display-window ' 🗔 '")))
-
-  ;; (exwm-input-set-key
-  ;;  (kbd "s-/")
-  ;;  (lambda ()
-  ;;    (interactive)
-  ;;    (start-process-shell-command "rofi-win" nil "rofi -show window  -display-run '> ' -display-window ' 🗔 '")))
-
-  ;; (exwm-input-set-key
-  ;;  (kbd "M-SPC")
-  ;;  (lambda ()
-  ;;    (interactive)
-  ;;    (start-process "rofi-pass" nil "rofi-pass")))
-
-  ;; (exwm-input-set-key
-  ;;  (kbd "<XF86AudioMute>")
-  ;;  (lambda ()
-  ;;    (interactive)
-  ;;    (start-process-shell-command "pamixer" nil "pamixer --toggle-mute")))
-
-  ;; (exwm-input-set-key
-  ;;  (kbd "<XF86AudioLowerVolume>")
-  ;;  (lambda ()
-  ;;    (interactive)
-  ;;    (start-process-shell-command "pamixer" nil "pamixer --allow-boost --decrease 5")))
-
-  ;; (exwm-input-set-key
-  ;;  (kbd "<XF86AudioRaiseVolume>")
-  ;;  (lambda ()
-  ;;    (interactive)
-  ;;    (start-process-shell-command "pamixer" nil "pamixer --allow-boost --increase 5")))
-
-  ;; (exwm-input-set-key
-  ;;  (kbd "<XF86AudioPlay>")
-  ;;  (lambda ()
-  ;;    (interactive)
-  ;;    (start-process-shell-command "mpc" nil "mpc toggle")))
-
-  ;; (exwm-input-set-key
-  ;;  (kbd "<XF86AudioPrev>")
-  ;;  (lambda ()
-  ;;    (interactive)
-  ;;    (start-process-shell-command "mpc" nil "mpc prev")))
-
-  ;; (exwm-input-set-key
-  ;;  (kbd "<XF86AudioNext>")
-  ;;  (lambda ()
-  ;;    (interactive)
-  ;;    (start-process-shell-command "mpc" nil "mpv next")))
-
-  (defun b/exwm-pasystray ()
-    "A command used to start pasystray."
-    (interactive)
-    (if (executable-find "pasystray")
-    (progn
-          (message "EXWM: starting pasystray ...")
-          (start-process-shell-command "pasystray" nil "pasystray --notify=all"))
-      (message "EXWM: pasystray is not installed, abort!")))
-
-  (add-hook 'exwm-init-hook #'b/exwm-pasystray)
-
-  (exwm-input-set-key
-   (kbd "s-t")
-   (lambda ()
-     (interactive)
-     (exwm-floating-toggle-floating)))
-
-  (exwm-input-set-key
-   (kbd "s-f")
-   (lambda ()
-     (interactive)
-     (exwm-layout-toggle-fullscreen)))
-
-  (exwm-input-set-key
-   (kbd "s-w")
-   (lambda ()
-     (interactive)
-     (kill-buffer (current-buffer))))
-
-  (exwm-input-set-key
-   (kbd "s-q")
-   (lambda ()
-     (interactive)
-     (exwm-manage--kill-client))))
+(use-feature exwm-workspace)
+
+(use-package exwm-edit
+  :demand
+  :after exwm)

 
 ;; use the org-plus-contrib package to get the whole deal
 (use-package org-plus-contrib)
 
 ;; use the org-plus-contrib package to get the whole deal
 (use-package org-plus-contrib)


@@ -849,7 +905,9 @@ For disabling the behaviour for certain buffers and/or modes."
   (nconc magit-section-initial-visibility-alist
          '(([unpulled status] . show)
            ([unpushed status] . show)))
   (nconc magit-section-initial-visibility-alist
          '(([unpulled status] . show)
            ([unpushed status] . show)))

-  :custom (magit-display-buffer-function #'magit-display-buffer-fullframe-status-v1)
+  :custom
+  (magit-diff-refine-hunk t)
+  (magit-display-buffer-function #'magit-display-buffer-fullframe-status-v1)

   :custom-face (magit-diff-file-heading ((t (:weight normal)))))
 
 ;; recently opened files
   :custom-face (magit-diff-file-heading ((t (:weight normal)))))
 
 ;; recently opened files


@@ -865,7 +923,6 @@ For disabling the behaviour for certain buffers and/or modes."
 
 (use-package ivy
   :defer 0.3
 
 (use-package ivy
   :defer 0.3

-  :delight ;; " 🙒"

   :bind
   (:map ivy-minibuffer-map
    ([escape] . keyboard-escape-quit)
   :bind
   (:map ivy-minibuffer-map
    ([escape] . keyboard-escape-quit)


@@ -906,7 +963,6 @@ This function is intended for use with `ivy-ignore-buffers'."
 
 (use-package counsel
   :after ivy
 
 (use-package counsel
   :after ivy

-  :delight

   :bind (([remap execute-extended-command] . counsel-M-x)
          ([remap find-file]                . counsel-find-file)
          ("C-c b b"                        . ivy-switch-buffer)
   :bind (([remap execute-extended-command] . counsel-M-x)
          ([remap find-file]                . counsel-find-file)
          ("C-c b b"                        . ivy-switch-buffer)


@@ -1029,10 +1085,11 @@ This function is intended for use with `ivy-ignore-buffers'."
        (or
         (name . "^\\*scratch\\*$")
         (name . "^\\*Messages\\*$")))
        (or
         (name . "^\\*scratch\\*$")
         (name . "^\\*Messages\\*$")))

+      ("exwm" (mode . exwm-mode))

       ("erc" (mode . erc-mode)))))
   (ibuffer-formats
    '((mark modified read-only locked " "
       ("erc" (mode . erc-mode)))))
   (ibuffer-formats
    '((mark modified read-only locked " "

-           (name 18 18 :left :elide)
+           (name 72 72 :left :elide)

            " "
            (size-h 9 -1 :right)
            " "
            " "
            (size-h 9 -1 :right)
            " "


@@ -1046,7 +1103,6 @@ This function is intended for use with `ivy-ignore-buffers'."
 (use-feature outline
   :disabled
   :hook (prog-mode . outline-minor-mode)
 (use-feature outline
   :disabled
   :hook (prog-mode . outline-minor-mode)

-  :delight (outline-minor-mode " outl")

   :bind
   (:map
    outline-minor-mode-map
   :bind
   (:map
    outline-minor-mode-map


@@ -1147,7 +1203,6 @@ This function is intended for use with `ivy-ignore-buffers'."
 ;; display Lisp objects at point in the echo area
 (use-feature eldoc
   :when (version< "25" emacs-version)
 ;; display Lisp objects at point in the echo area
 (use-feature eldoc
   :when (version< "25" emacs-version)

-  :delight " eldoc"

   :config (global-eldoc-mode))
 
 ;; highlight matching parens
   :config (global-eldoc-mode))
 
 ;; highlight matching parens


@@ -1160,7 +1215,6 @@ This function is intended for use with `ivy-ignore-buffers'."
   :config (electric-pair-mode))
 
 (use-feature simple
   :config (electric-pair-mode))
 
 (use-feature simple

-  :delight (auto-fill-function " fill")

   :config (column-number-mode)
   :custom
   ;; Save what I copy into clipboard from other applications into Emacs'
   :config (column-number-mode)
   :custom
   ;; Save what I copy into clipboard from other applications into Emacs'


@@ -1198,7 +1252,6 @@ This function is intended for use with `ivy-ignore-buffers'."
 
 (use-package company
   :defer 0.6
 
 (use-package company
   :defer 0.6

-  :delight " comp"

   :bind
   (:map company-active-map
         ([tab]    . company-complete-common-or-cycle)
   :bind
   (:map company-active-map
         ([tab]    . company-complete-common-or-cycle)


@@ -1227,8 +1280,7 @@ This function is intended for use with `ivy-ignore-buffers'."
   (setq flycheck-check-syntax-automatically '(mode-enabled save))
   :custom (flycheck-mode-line-prefix "flyc"))
 
   (setq flycheck-check-syntax-automatically '(mode-enabled save))
   :custom (flycheck-mode-line-prefix "flyc"))
 

-(use-feature flyspell
-  :delight " flysp")
+(use-feature flyspell)

 
 ;; http://endlessparentheses.com/ispell-and-apostrophes.html
 (use-feature ispell
 
 ;; http://endlessparentheses.com/ispell-and-apostrophes.html
 (use-feature ispell


@@ -1258,7 +1310,6 @@ This function is intended for use with `ivy-ignore-buffers'."
               #'endless/replace-quote))
 
 (use-feature abbrev
               #'endless/replace-quote))
 
 (use-feature abbrev

-  :delight " abbr"

   :hook (text-mode . abbrev-mode))
 
 \f
   :hook (text-mode . abbrev-mode))
 
 \f


@@ -1271,12 +1322,9 @@ This function is intended for use with `ivy-ignore-buffers'."
   (add-hook 'lisp-interaction-mode-hook #'indent-spaces-mode))
 
 (use-feature reveal
   (add-hook 'lisp-interaction-mode-hook #'indent-spaces-mode))
 
 (use-feature reveal

-  :delight (reveal-mode " reveal")

   :hook (emacs-lisp-mode . reveal-mode))
 
   :hook (emacs-lisp-mode . reveal-mode))
 

-(use-feature elisp-mode
-  :delight (emacs-lisp-mode "Elisp" :major))
-
+(use-feature elisp-mode)

 
 (use-package alloy-mode
   :straight (:host github :repo "dwwmmn/alloy-mode")
 
 (use-package alloy-mode
   :straight (:host github :repo "dwwmmn/alloy-mode")


@@ -1285,8 +1333,6 @@ This function is intended for use with `ivy-ignore-buffers'."
 
 (eval-when-compile (defvar lean-mode-map))
 (use-package lean-mode
 
 (eval-when-compile (defvar lean-mode-map))
 (use-package lean-mode

-  :straight (:host github :repo "leanprover/lean-mode"
-                   :fork (:repo "notbandali/lean-mode" :branch "remove-cl"))

   :defer 0.4
   :bind (:map lean-mode-map
               ("S-SPC" . company-complete))
   :defer 0.4
   :bind (:map lean-mode-map
               ("S-SPC" . company-complete))


@@ -1451,6 +1497,10 @@ This function is intended for use with `ivy-ignore-buffers'."
   :hook ((tex-mode . auto-fill-mode)
          (tex-mode . flyspell-mode)))
 
   :hook ((tex-mode . auto-fill-mode)
          (tex-mode . flyspell-mode)))
 

+(use-package george-mode
+  :straight (:host nil :repo "https://git.shemshak.org/amin/george-mode")
+  :mode "\\.grg\\'")
+

 \f
 ;;; Theme
 
 \f
 ;;; Theme
 


@@ -1460,6 +1510,7 @@ This function is intended for use with `ivy-ignore-buffers'."
 (load-theme 'tangomod t)
 
 (use-package smart-mode-line
 (load-theme 'tangomod t)
 
 (use-package smart-mode-line

+  :disabled

   :commands (sml/apply-theme)
   :demand
   :config
   :commands (sml/apply-theme)
   :demand
   :config


@@ -1475,18 +1526,38 @@ This function is intended for use with `ivy-ignore-buffers'."
 
 (use-package doom-themes)
 
 
 (use-package doom-themes)
 

+(use-package solarized-theme
+  :disabled
+  :config
+  (load-theme 'solarized-light t))
+
+(use-package moody
+  :demand
+  :config
+  (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 "#e1e1e1")) ; d3d7cf
+  (moody-replace-mode-line-buffer-identification)
+  (moody-replace-vc-mode))
+

 (defvar b/org-mode-font-lock-keywords
   '(("[ \t]*\\(#\\+\\(BEGIN\\|END\\|begin\\|end\\)_\\(\\S-+\\)\\)[ \t]*\\([^\n:]*\\)"
       (1 '(:foreground "#5a5b5a" :background "#292b2b") t) ; directive
       (3 '(:foreground "#81a2be" :background "#292b2b") t) ; kind
 (defvar b/org-mode-font-lock-keywords
   '(("[ \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 'tangomod t)
 
 (defun b/lights-on ()
   "Enable my favourite light theme."
   (interactive)
   (mapc #'disable-theme custom-enabled-themes)
   (load-theme 'tangomod t)

-  (sml/apply-theme 'automatic)
+  ;; (sml/apply-theme 'automatic)

   (font-lock-remove-keywords
    'org-mode b/org-mode-font-lock-keywords))
 
   (font-lock-remove-keywords
    'org-mode b/org-mode-font-lock-keywords))
 


@@ -1494,8 +1565,8 @@ This function is intended for use with `ivy-ignore-buffers'."
   "Go dark."
   (interactive)
   (mapc #'disable-theme custom-enabled-themes)
   "Go dark."
   (interactive)
   (mapc #'disable-theme custom-enabled-themes)

-  (load-theme 'doom-tomorrow-night t)
-  (sml/apply-theme 'automatic)
+  (load-theme 'doom-one t)
+  ;; (sml/apply-theme 'automatic)

   (font-lock-add-keywords
    'org-mode b/org-mode-font-lock-keywords t))
 
   (font-lock-add-keywords
    'org-mode b/org-mode-font-lock-keywords t))
 


@@ -1511,7 +1582,6 @@ This function is intended for use with `ivy-ignore-buffers'."
 
 (use-package which-key
   :defer 0.4
 
 (use-package which-key
   :defer 0.4

-  :delight

   :config
   (which-key-add-key-based-replacements
     ;; prefixes for global prefixes and minor modes
   :config
   (which-key-add-key-based-replacements
     ;; prefixes for global prefixes and minor modes


@@ -1665,11 +1735,10 @@ This function is intended for use with `ivy-ignore-buffers'."
 ;; easily type pretty quotes & other typography, like ‘’“”-–—«»‹›
 (use-package typo
   :defer 0.5
 ;; easily type pretty quotes & other typography, like ‘’“”-–—«»‹›
 (use-package typo
   :defer 0.5

-  :delight " typo"

   :config
   (typo-global-mode 1)
   :config
   (typo-global-mode 1)

-  :hook (((text-mode erc-mode) . typo-mode)
-         (tex-mode             . (lambda ()(typo-mode -1)))))
+  :hook (((text-mode erc-mode web-mode) . typo-mode)
+         (tex-mode                      . (lambda ()(typo-mode -1)))))

 
 ;; highlight TODOs in buffers
 (use-package hl-todo
 
 ;; highlight TODOs in buffers
 (use-package hl-todo


@@ -1752,7 +1821,6 @@ This function is intended for use with `ivy-ignore-buffers'."
 
 (use-package page-break-lines
   :defer 0.5
 
 (use-package page-break-lines
   :defer 0.5

-  :delight " pgln"

   :custom
   (page-break-lines-max-width fill-column)
   :config
   :custom
   (page-break-lines-max-width fill-column)
   :config


@@ -1771,11 +1839,9 @@ This function is intended for use with `ivy-ignore-buffers'."
                ("p" . mc/mark-previous-like-this)
                ("a" . mc/mark-all-like-this))))
 
                ("p" . mc/mark-previous-like-this)
                ("a" . mc/mark-all-like-this))))
 

-(comment
-  ;; TODO
-  (use-package forge
-    :after magit
-    :demand))
+(use-package forge
+  :demand
+  :after magit)

 
 (use-package yasnippet
   :defer 0.6
 
 (use-package yasnippet
   :defer 0.6


@@ -1819,6 +1885,7 @@ This function is intended for use with `ivy-ignore-buffers'."
 ;; (use-package fill-column-indicator)
 
 (use-package emojify
 ;; (use-package fill-column-indicator)
 
 (use-package emojify

+  :disabled

   :hook (erc-mode . emojify-mode))
 
 (use-feature window
   :hook (erc-mode . emojify-mode))
 
 (use-feature window


@@ -1861,6 +1928,14 @@ This function is intended for use with `ivy-ignore-buffers'."
   :config (pdf-tools-install nil t)
   :custom (pdf-view-resize-factor 1.05))
 
   :config (pdf-tools-install nil t)
   :custom (pdf-view-resize-factor 1.05))
 

+(use-package org-pdftools
+  :straight (:host github :repo "fuxialexander/org-pdftools")
+  :demand
+  :after org
+  :config
+  (with-eval-after-load 'org
+    (require 'org-pdftools)))
+

 (use-package biblio)
 
 (use-feature reftex
 (use-package biblio)
 
 (use-feature reftex


@@ -1880,6 +1955,25 @@ This function is intended for use with `ivy-ignore-buffers'."
           (goto-char (cdr macro)))
         (reftex-this-word)))))
 
           (goto-char (cdr macro)))
         (reftex-this-word)))))
 

+(use-package minions
+  :demand
+  :config (minions-mode))
+
+(use-package dmenu
+  :custom
+  (dmenu-prompt-string "run: ")
+  (dmenu-save-file (b/var "dmenu-items")))
+
+(use-package eosd
+  ;; TODO: fix build by properly building the eosd-pixbuf.c module
+  ;; e.g. see https://github.com/raxod502/straight.el/issues/386
+  :disabled
+  :straight (:host github :repo "clarete/eosd")
+  :demand
+  :after exwm
+  :config
+  (eosd-start))
+

 \f
 ;;; Email (with Gnus)
 
 \f
 ;;; Email (with Gnus)
 


@@ -1920,9 +2014,9 @@ This function is intended for use with `ivy-ignore-buffers'."
                                  ;; (: gnus-group-split-fancy "INBOX" t "INBOX")
                                  ;; gnu
                                  (list ".*<\\(.*\\)\\.\\(non\\)?gnu\\.org>.*" "l.\\1")
                                  ;; (: gnus-group-split-fancy "INBOX" t "INBOX")
                                  ;; gnu
                                  (list ".*<\\(.*\\)\\.\\(non\\)?gnu\\.org>.*" "l.\\1")

-                                 ;; *@lists.sr.ht, omitting one dot if present
-                                 ;;    add more \\.?\\([^.@]*\\) if needed
-                                 (list ".*<~\\(.*\\)/\\([^.@]*\\)\\.?\\([^.@]*\\)@lists.sr.ht>.*" "l.~\\1.\\2\\3")
+                                 ;; *.lists.sr.ht, omitting one dot if present
+                                 ;;    add more \\.?\\([^.]*\\) if needed
+                                 (list ".*<~\\(.*\\)/\\([^.]*\\)\\.?\\([^.]*\\)\\.lists.sr.ht>.*" "l.~\\1.\\2\\3")

                                  ;; webmasters
                                  (from "webmasters\\(-comment\\)?@gnu\\.org" "webmasters")
                                  ;; other
                                  ;; webmasters
                                  (from "webmasters\\(-comment\\)?@gnu\\.org" "webmasters")
                                  ;; other


@@ -1958,7 +2052,7 @@ This function is intended for use with `ivy-ignore-buffers'."
              (nnimap-server-port 143)
              (nnimap-authenticator plain)
              (nnimap-user "abandali@csc.uw.local")))
              (nnimap-server-port 143)
              (nnimap-authenticator plain)
              (nnimap-user "abandali@csc.uw.local")))

-   gnus-message-archive-group "nnimap+shemshak:Sent"
+   gnus-message-archive-group "nnimap+gnu:INBOX"

    gnus-parameters
    '(("l\\.atreus"
       (to-address . "atreus@freelists.org")
    gnus-parameters
    '(("l\\.atreus"
       (to-address . "atreus@freelists.org")


@@ -2103,10 +2197,6 @@ This function is intended for use with `ivy-ignore-buffers'."
    gnus-interactive-exit nil
    gnus-gcc-mark-as-read t)
   :config
    gnus-interactive-exit nil
    gnus-gcc-mark-as-read t)
   :config

-  (require 'ebdb)
-  (require 'ebdb-mua)
-  (require 'ebdb-gnus)
-

   (when (version< emacs-version "27")
     (add-to-list
      'nnmail-split-abbrev-alist
   (when (version< emacs-version "27")
     (add-to-list
      'nnmail-split-abbrev-alist


@@ -2183,25 +2273,26 @@ Computer Science Club, University of Waterloo
 https://csclub.uwaterloo.ca/~abandali")
   (setq gnus-posting-styles
         '((".*"
 https://csclub.uwaterloo.ca/~abandali")
   (setq gnus-posting-styles
         '((".*"

+           (address "bandali@gnu.org")
+           (signature b/gnu-signature)
+           (eval (set (make-local-variable 'message-user-fqdn) "fencepost.gnu.org")))
+          ("nnimap\\+shemshak:.*"

            (address "amin@shemshak.org")
            (body "\nBest,\n")
            (signature b/signature)
            (address "amin@shemshak.org")
            (body "\nBest,\n")
            (signature b/signature)

+           (gcc "nnimap+shemshak:Sent")

            (eval (setq b/message-cite-say-hi t)))
            (eval (setq b/message-cite-say-hi t)))

-          ("nnimap\\+gnu:.*"
-           (address "bandali@gnu.org")
-           (signature b/gnu-signature)
-           (eval (set (make-local-variable 'message-user-fqdn) "fencepost.gnu.org")))

           ((header "subject" "ThankCRM")
            (to "webmasters-comment@gnu.org")
            (body "")
            (eval (setq b/message-cite-say-hi nil)))
           ("nnimap\\+uw:.*"
           ((header "subject" "ThankCRM")
            (to "webmasters-comment@gnu.org")
            (body "")
            (eval (setq b/message-cite-say-hi nil)))
           ("nnimap\\+uw:.*"

-           (address "abandali@uwaterloo.ca")
+           (address "bandali@uwaterloo.ca")

            (signature b/uw-signature))
           ("nnimap\\+uw:INBOX"
            (gcc "\"nnimap+uw:Sent Items\""))
           ("nnimap\\+csc:.*"
            (signature b/uw-signature))
           ("nnimap\\+uw:INBOX"
            (gcc "\"nnimap+uw:Sent Items\""))
           ("nnimap\\+csc:.*"

-           (address "abandali@csclub.uwaterloo.ca")
+           (address "bandali@csclub.uwaterloo.ca")

            (signature b/csc-signature)
            (gcc "nnimap+csc:Sent")))))
 
            (signature b/csc-signature)
            (gcc "nnimap+csc:Sent")))))
 


@@ -2279,7 +2370,7 @@ https://csclub.uwaterloo.ca/~abandali")
         message-subscribed-address-functions
         '(gnus-find-subscribed-addresses)
         message-dont-reply-to-names
         message-subscribed-address-functions
         '(gnus-find-subscribed-addresses)
         message-dont-reply-to-names

-        "\\(\\(\\(amin\\|mab\\)@shemshak\\.org\\)\\|\\(amin@bndl\\.org\\)\\|\\(.*@aminb\\.org\\)\\|\\(\\(bandali\\|mab\\|aminb?\\)@gnu\\.org\\)\\|\\(a\\(min\\.\\)?bandali@uwaterloo\\.ca\\)\\|\\(abandali@csclub\\.uwaterloo\\.ca\\)\\)")
+        "\\(\\(\\(amin\\|mab\\)@shemshak\\.org\\)\\|\\(.*@aminb\\.org\\)\\|\\(\\(bandali\\|mab\\|aminb?\\)@gnu\\.org\\)\\|\\(a?bandali@\\(csclub\\.\\)?uwaterloo\\.ca\\)\\)")

   (require 'company-ebdb)
   :hook (;; (message-setup . mml-secure-message-sign-pgpmime)
          (message-mode . flyspell-mode)
   (require 'company-ebdb)
   :hook (;; (message-setup . mml-secure-message-sign-pgpmime)
          (message-mode . flyspell-mode)


@@ -2295,8 +2386,7 @@ https://csclub.uwaterloo.ca/~abandali")
   :custom
   (message-elide-ellipsis "[...]\n"))
 
   :custom
   (message-elide-ellipsis "[...]\n"))
 

-(use-feature mml
-  :delight " mml")
+(use-feature mml)

 
 (use-feature mml-sec
   :custom
 
 (use-feature mml-sec
   :custom


@@ -2322,6 +2412,7 @@ https://csclub.uwaterloo.ca/~abandali")
         ("s" . footnote-set-style)))
 
 (use-package ebdb
         ("s" . footnote-set-style)))
 
 (use-package ebdb

+  :demand

   :after gnus
   :bind (:map gnus-group-mode-map ("e" . ebdb))
   :config
   :after gnus
   :bind (:map gnus-group-mode-map ("e" . ebdb))
   :config


@@ -2342,14 +2433,15 @@ https://csclub.uwaterloo.ca/~abandali")
   (defun company-ebdb--post-complete (_) nil))
 
 (use-feature ebdb-gnus
   (defun company-ebdb--post-complete (_) nil))
 
 (use-feature ebdb-gnus

+  :demand

   :after ebdb
   :custom
   (ebdb-gnus-window-size 0.3))
 
 (use-feature ebdb-mua
   :after ebdb
   :custom
   (ebdb-gnus-window-size 0.3))
 
 (use-feature ebdb-mua

+  :demand

   :after ebdb
   :after ebdb

-  ;; :custom (ebdb-mua-pop-up nil)
-  )
+  :custom (ebdb-mua-pop-up t))

 
 ;; (use-package ebdb-message
 ;;   :after ebdb)
 
 ;; (use-package ebdb-message
 ;;   :after ebdb)


@@ -2419,80 +2511,7 @@ https://csclub.uwaterloo.ca/~abandali")
   (add-to-list 'erc-modules 'notifications)
   (add-to-list 'erc-modules 'spelling)
   (add-to-list 'erc-modules 'scrolltoplace)
   (add-to-list 'erc-modules 'notifications)
   (add-to-list 'erc-modules 'spelling)
   (add-to-list 'erc-modules 'scrolltoplace)

-  (erc-update-modules)
-
-  (when (and (version<= "24.4" emacs-version)
-             (version<         emacs-version "27"))
-    ;; fix erc-lurker bug
-    ;; patch submitted: https://bugs.gnu.org/36843#10
-    ;; TODO: remove when patch is merged and emacs 27 is released
-    (defvar erc-message-parsed)
-    (defun erc-display-message (parsed type buffer msg &rest args)
-      "Display MSG in BUFFER.
-
-ARGS, PARSED, and TYPE are used to format MSG sensibly.
-
-See also `erc-format-message' and `erc-display-line'."
-      (let ((string (if (symbolp msg)
-                        (apply #'erc-format-message msg args)
-                      msg))
-            (erc-message-parsed parsed))
-        (setq string
-              (cond
-               ((null type)
-                string)
-               ((listp type)
-                (mapc (lambda (type)
-                        (setq string
-                              (erc-display-message-highlight type string)))
-                      type)
-                string)
-               ((symbolp type)
-                (erc-display-message-highlight type string))))
-
-        (if (not (erc-response-p parsed))
-            (erc-display-line string buffer)
-          (unless (erc-hide-current-message-p parsed)
-            (erc-put-text-property 0 (length string) 'erc-parsed parsed string)
-            (erc-put-text-property 0 (length string) 'rear-sticky t string)
-            (when (erc-response.tags parsed)
-              (erc-put-text-property 0 (length string) 'tags (erc-response.tags parsed)
-                                     string))
-            (erc-display-line string buffer)))))
-
-    (defun erc-lurker-update-status (_message)
-      "Update `erc-lurker-state' if necessary.
-
-This function is called from `erc-insert-pre-hook'.  If the
-current message is a PRIVMSG, update `erc-lurker-state' to
-reflect the fact that its sender has issued a PRIVMSG at the
-current time.  Otherwise, take no action.
-
-This function depends on the fact that `erc-display-message'
-lexically binds `erc-message-parsed', which is used to check if
-the current message is a PRIVMSG and to determine its sender.
-See also `erc-lurker-trim-nicks' and `erc-lurker-ignore-chars'.
-
-In order to limit memory consumption, this function also calls
-`erc-lurker-cleanup' once every `erc-lurker-cleanup-interval'
-updates of `erc-lurker-state'."
-      (when (and (boundp 'erc-message-parsed)
-                 (erc-response-p erc-message-parsed))
-        (let* ((command (erc-response.command erc-message-parsed))
-               (sender
-                (erc-lurker-maybe-trim
-                 (car (erc-parse-user (erc-response.sender erc-message-parsed)))))
-               (server
-                (erc-canonicalize-server-name erc-server-announced-name)))
-          (when (equal command "PRIVMSG")
-            (when (>= (cl-incf erc-lurker-cleanup-count)
-                      erc-lurker-cleanup-interval)
-              (setq erc-lurker-cleanup-count 0)
-              (erc-lurker-cleanup))
-            (unless (gethash server erc-lurker-state)
-              (puthash server (make-hash-table :test 'equal) erc-lurker-state))
-            (puthash sender (current-time)
-                     (gethash server erc-lurker-state))))))))
+  (erc-update-modules))

 
 (use-feature erc-fill
   :after erc
 
 (use-feature erc-fill
   :after erc


@@ -2514,6 +2533,7 @@ updates of `erc-lurker-state'."
   (erc-track-enable-keybindings nil)
   (erc-track-exclude-types '("JOIN" "MODE" "NICK" "PART" "QUIT"
                              "324" "329" "332" "333" "353" "477"))
   (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))
 
   (erc-track-priority-faces-only 'all)
   (erc-track-shorten-function nil))