Update mail setup

[config.org.git] / config.org

diff --git a/config.org b/config.org
index d0d5970bb73256c5c2fc333e55b443994a66ca68..be4c70bbbb8ab80fd6a3ae63e623bdd98601b795 100644 (file)
--- a/config.org
+++ b/config.org
@@ -6,16 +6,13 @@
 * Welcome
 Welcome to my system configuration! This file contains my Emacs configuration, but also my config files for many of the other programs on my system!
 ** Compatability
 * Welcome
 Welcome to my system configuration! This file contains my Emacs configuration, but also my config files for many of the other programs on my system!
 ** Compatability

-I am currently using Emacs 28 with native compilation, so some settings and packages may not be available for older versions of Emacs. This is a purely personal configuration, so while I can guarantee that it works on my setup, it might not work for you.
+I am currently using Emacs 27.2 on Linux, so some settings and packages may not be available for older versions of Emacs. This is a purely personal configuration, so while I can guarantee that it works on my setup, it might not work for you.

 ** Choices
 I chose to create a powerful, yet not overly heavy Emacs configuration. Things like a fancy modeline, icons, or LSP mode do not increase my productivity, and create visual clutter, and thus have been excluded.
 
 Another important choice has been to integrate Emacs into a large part of my computing environment (see [[*Emacs OS]]). I use email, IRC, RSS, et cetera, all through Emacs which simplifies my workflow and creates an amazingly integrated environment.
 
 Lastly, I use Evil mode. Modal keybindings are simpler and more ergonomic than standard Emacs style, and Vim keybindings are what I'm comfortable with and are pervasive throughout computing.
 ** Choices
 I chose to create a powerful, yet not overly heavy Emacs configuration. Things like a fancy modeline, icons, or LSP mode do not increase my productivity, and create visual clutter, and thus have been excluded.
 
 Another important choice has been to integrate Emacs into a large part of my computing environment (see [[*Emacs OS]]). I use email, IRC, RSS, et cetera, all through Emacs which simplifies my workflow and creates an amazingly integrated environment.
 
 Lastly, I use Evil mode. Modal keybindings are simpler and more ergonomic than standard Emacs style, and Vim keybindings are what I'm comfortable with and are pervasive throughout computing.

-** TODOs
-*** TODO Turn keybinding and hook declarations into use-package declarations where possible
-*** TODO Include offlineimap config

 ** License
 Released under the [[https://opensource.org/licenses/MIT][MIT license]] by Armaan Bhojwani, 2021. Note that many snippets are taken from online, and other sources, who are credited for their work near their contributions.
 * Package management
 ** License
 Released under the [[https://opensource.org/licenses/MIT][MIT license]] by Armaan Bhojwani, 2021. Note that many snippets are taken from online, and other sources, who are credited for their work near their contributions.
 * Package management


@@ -45,12 +42,14 @@ straight.el is really nice for managing package, and it integrates nicely with u
 ** Theme
 Use the Modus Operandi theme by Protesilaos Stavrou. Its the best theme for Emacs by far, because how clear and readable it is. It is highly customizable, but I just set a few options here.
 #+begin_src emacs-lisp
 ** Theme
 Use the Modus Operandi theme by Protesilaos Stavrou. Its the best theme for Emacs by far, because how clear and readable it is. It is highly customizable, but I just set a few options here.
 #+begin_src emacs-lisp

-  (setq modus-themes-slanted-constructs t
-        modus-themes-bold-constructs t
-        modus-themes-mode-line '3d
-        modus-themes-scale-headings t
-        modus-themes-diffs 'desaturated)
-  (load-theme 'modus-vivendi t)
+  (use-package modus-themes
+    :custom
+    (modus-themes-slanted-constructs t)
+    (modus-themes-bold-constructs t)
+    (modus-themes-mode-line '3d)
+    (modus-themes-scale-headings t)
+    (modus-themes-diffs 'desaturated)
+    :config (load-theme 'modus-vivendi t))

 #+end_src
 ** Typography
 *** Font
 #+end_src
 ** Typography
 *** Font


@@ -77,7 +76,8 @@ JetBrains Mono is a great programming font with ligatures. The "NF" means that i
        "[||]" "[<" "[|" "{|" "?." "?=" "?:" "##" "###" "####" "#["
        "#{" "#=" "#!" "#:" "#_(" "#_" "#?" "#(" ";;" "_|_" "__" "~~"
        "~~>" "~>" "~-" "~@" "$>" "^=" "]#"))
        "[||]" "[<" "[|" "{|" "?." "?=" "?:" "##" "###" "####" "#["
        "#{" "#=" "#!" "#:" "#_(" "#_" "#?" "#(" ";;" "_|_" "__" "~~"
        "~~>" "~>" "~-" "~@" "$>" "^=" "]#"))

-    (global-ligature-mode t))
+    ;; (global-ligature-mode t))
+    )

 #+end_src
 ** Line numbers
 Display relative line numbers except in certain modes.
 #+end_src
 ** Line numbers
 Display relative line numbers except in certain modes.


@@ -114,14 +114,16 @@ Show current column and file size.
   (use-package minions
     :config (minions-mode))
 #+end_src
   (use-package minions
     :config (minions-mode))
 #+end_src

-** Ruler
-Show a ruler at a certain number of chars depending on mode.
+** Whitespace mode
+Highlight whitespace and other bad text practices.

 #+begin_src emacs-lisp
 #+begin_src emacs-lisp

-  (setq display-fill-column-indicator-column 80)
-  (global-display-fill-column-indicator-mode)
+  (use-package whitespace
+    :custom (whitespace-style '(face lines-tail)))
+  (dolist (hook '(prog-mode-hook))
+    (add-hook hook (lambda () (whitespace-mode 1))))

 #+end_src
 ** Highlight todo items in comments
 #+end_src
 ** Highlight todo items in comments

-#+begin_src emacs-lisp
++begin_src emacs-lisp

   (use-package hl-todo
     :straight (hl-todo :type git :host github :repo "tarsius/hl-todo")
     :config (global-hl-todo-mode 1))
   (use-package hl-todo
     :straight (hl-todo :type git :host github :repo "tarsius/hl-todo")
     :config (global-hl-todo-mode 1))


@@ -137,7 +139,13 @@ Soft wrap words and do operations by visual lines in some modes.
                   org-mode-hook
                   markdown-mode-hook
                   mu4e-view-mode-hook))
                   org-mode-hook
                   markdown-mode-hook
                   mu4e-view-mode-hook))

-    (add-hook hook (lambda () (visual-line-mode -1))))
+    (add-hook hook (lambda () (visual-line-mode 1))))
+#+end_src
+** Auto fill mode
+#+begin_src emacs-lisp
+  (dolist (hook '(scdoc-mode-hook
+                  mu4e-compose-mode-hook))
+    (add-hook hook (lambda () (auto-fill-mode 1))))

 #+end_src
 ** Display number of matches in search
 #+begin_src emacs-lisp
 #+end_src
 ** Display number of matches in search
 #+begin_src emacs-lisp


@@ -147,6 +155,7 @@ Soft wrap words and do operations by visual lines in some modes.
     ([remap query-replace] . anzu-query-replace)
     ([remap query-replace-regexp] . anzu-query-replace-regexp))
 #+end_src
     ([remap query-replace] . anzu-query-replace)
     ([remap query-replace-regexp] . anzu-query-replace-regexp))
 #+end_src

+*** TODO This config doesn't work right

 ** Visual bell
 Invert modeline color instead of audible bell or the standard visual bell.
 #+begin_src emacs-lisp
 ** Visual bell
 Invert modeline color instead of audible bell or the standard visual bell.
 #+begin_src emacs-lisp


@@ -193,7 +202,11 @@ Makes commenting super easy
 ** Undo redo
 Fix the oopsies!
 #+begin_src emacs-lisp
 ** Undo redo
 Fix the oopsies!
 #+begin_src emacs-lisp

-  (evil-set-undo-system 'undo-redo)
+  (use-package undo-fu
+    :config (evil-set-undo-system 'undo-fu))
+
+  (use-package undo-fu-session
+    :config (global-undo-fu-session-mode))

 #+end_src
 ** Number incrementing
 Add back C-a/C-x bindings.
 #+end_src
 ** Number incrementing
 Add back C-a/C-x bindings.


@@ -226,7 +239,7 @@ Add back C-a/C-x bindings.
     :custom
     (org-ellipsis " ▾")
     (org-agenda-start-with-log-mode t)
     :custom
     (org-ellipsis " ▾")
     (org-agenda-start-with-log-mode t)

-    (org-agenda-files (quote ("~/Org/tasks.org" "~/Org/break.org")))
+    (org-agenda-files (quote ("~/org/tasks.org")))

     (org-log-done 'time)
     (org-log-into-drawer t)
     (org-src-tab-acts-natively t)
     (org-log-done 'time)
     (org-log-into-drawer t)
     (org-src-tab-acts-natively t)


@@ -246,20 +259,20 @@ Define templates for lots of common structure elements. Mostly just used within
     :after org
     :straight (:type built-in)
     :config
     :after org
     :straight (:type built-in)
     :config

-    (dolist (addition '(("el" . "src emacs-lisp")
-                        ("el" . "src emacs-lisp")
-                        ("sp" . "src conf :tangle ~/.spectrwm.conf")
+    (dolist (addition '(
+                        ("ag" . "src conf :tangle ~/.gnupg/gpg-agent.conf")

                         ("ash" . "src shell :tangle ~/.config/ash/ashrc")
                         ("ash" . "src shell :tangle ~/.config/ash/ashrc")

-                        ("pi" . "src conf :tangle ~/.config/picom/picom.conf")
+                        ("el" . "src emacs-lisp")

                         ("git" . "src conf :tangle ~/.gitconfig")
                         ("git" . "src conf :tangle ~/.gitconfig")

-                        ("du" . "src conf :tangle ~/.config/dunst/dunstrc")
-                        ("za" . "src conf :tangle ~/.config/zathura/zathurarc")
-                        ("ff1" . "src css :tangle ~/.mozilla/firefox/armaan-release/chrome/userChrome.css")
-                        ("ff2" . "src css :tangle ~/.mozilla/firefox/armaan-release/chrome/userContent.css")
-                        ("xr" . "src conf :tangle ~/.Xresources")
-                        ("tm" . "src conf :tangle ~/.tmux.conf")

                         ("gp" . "src conf :tangle ~/.gnupg/gpg.conf")
                         ("gp" . "src conf :tangle ~/.gnupg/gpg.conf")

-                        ("ag" . "src conf :tangle ~/.gnupg/gpg-agent.conf")))
+                        ("mb" . "src conf :tangle ~/.mbsyncrc")
+                        ("pi" . "src conf :tangle ~/.config/picom/picom.conf")
+                        ("sp" . "src conf :tangle ~/.spectrwm.conf")
+                        ("tm" . "src conf :tangle ~/.tmux.conf")
+                        ("xm" . "src conf :tangle ~/.config/xmodmap")
+                        ("xr" . "src conf :tangle ~/.Xresources")
+                        ("za" . "src conf :tangle ~/.config/zathura/zathurarc")
+                        ))

       (add-to-list 'org-structure-template-alist addition)))
 #+end_src
 * Autocompletion
       (add-to-list 'org-structure-template-alist addition)))
 #+end_src
 * Autocompletion


@@ -267,6 +280,10 @@ Define templates for lots of common structure elements. Mostly just used within
 A well balanced completion framework.
 #+begin_src emacs-lisp
   (use-package ivy
 A well balanced completion framework.
 #+begin_src emacs-lisp
   (use-package ivy

+    :bind (:map ivy-minibuffer-map
+           ("TAB" . ivy-alt-done))
+           (:map ivy-switch-buffer-map
+           ("M-d" . ivy-switch-buffer-kill))

     :config (ivy-mode))
 #+end_src
 ** Ivy-rich
     :config (ivy-mode))
 #+end_src
 ** Ivy-rich


@@ -279,6 +296,7 @@ A well balanced completion framework.
 Ivy everywhere.
 #+begin_src emacs-lisp
   (use-package counsel
 Ivy everywhere.
 #+begin_src emacs-lisp
   (use-package counsel

+    :bind ("C-M-j" . 'counsel-switch-buffer)

     :config (counsel-mode))
 #+end_src
 ** Remember frequent commands
     :config (counsel-mode))
 #+end_src
 ** Remember frequent commands


@@ -295,20 +313,63 @@ Use elfeed for reading RSS. I have another file with all the feeds in it that I'
 #+begin_src emacs-lisp
   (use-package elfeed
     :bind (("C-c e" . elfeed))
 #+begin_src emacs-lisp
   (use-package elfeed
     :bind (("C-c e" . elfeed))

-    :config
-    (load "~/.emacs.d/feeds.el")
+    :config (load "~/.emacs.d/feeds.el")

     :bind (:map elfeed-search-mode-map ("C-c C-o" . 'elfeed-show-visit)))
     :bind (:map elfeed-search-mode-map ("C-c C-o" . 'elfeed-show-visit)))

-
-  (use-package elfeed-goodies
-    :after elfeed
-    :config (elfeed-goodies/setup))

 #+end_src
 ** Email
 #+end_src
 ** Email

-Use mu4e for reading emails.
-
-I use `offlineimap` to sync my maildirs. It is slower than mbsync, but is fast enough for me, especially when ran with the =-q= option.
+Use mu4e and mbsync for reading emails.

 
 Contexts are a not very well known feature of mu4e that makes it super easy to manage multiple accounts. Much better than some of the hacky methods and external packages that I've seen.
 
 Contexts are a not very well known feature of mu4e that makes it super easy to manage multiple accounts. Much better than some of the hacky methods and external packages that I've seen.

+*** mbsync
+**** General
+#+begin_src conf :tangle ~/.mbsyncrc
+  Create Near
+  Expunge Both
+  SyncState *
+#+end_src
+**** Personal
+#+begin_src conf :tangle ~/.mbsyncrc
+  IMAPStore personal-remote
+  Host imap.mailbox.org
+  User me@armaanb.net
+  PassCmd "pash show login.mailbox.org/me@armaanb.net | head -n 1"
+
+  MaildirStore personal-local
+  Path ~/mail/personal/
+  Inbox ~/mail/personal/Inbox
+  Subfolders Verbatim
+
+  Channel personal-channel
+  Far :personal-remote:
+  Near :personal-local:
+  Patterns "INBOX*" "Drafts" "Archive" "Sent" "Trash"
+
+  Group personal
+  Channel personal-channel
+#+end_src
+**** School
+#+begin_src conf :tangle ~/.mbsyncrc
+  IMAPStore school-remote
+  SSLType IMAPS
+  Host imap.gmail.com
+  User abhojwani22@nobles.edu
+  PassCmd "pash show gmail-otp/abhojwani22@nobles.edu | head -n 1"
+
+  MaildirStore school-local
+  Path ~/mail/school/
+  Inbox ~/mail/school/Inbox
+  Subfolders Verbatim
+
+  Channel school-channel
+  Far :school-remote:
+  Near :school-local:
+  Patterns * ![Gmail]* "[Gmail]/Sent Mail" "[Gmail]/All Mail"
+
+  Group school
+  Channel school-channel
+#+end_src
+*** mu4e
+**** Setup

 #+begin_src emacs-lisp
   (use-package smtpmail
     :straight (:type built-in))
 #+begin_src emacs-lisp
   (use-package smtpmail
     :straight (:type built-in))


@@ -322,14 +383,14 @@ Contexts are a not very well known feature of mu4e that makes it super easy to m
           smtpmail-stream-type 'ssl
           smtpmail-smtp-service '465
           mu4e-change-filenames-when-moving t
           smtpmail-stream-type 'ssl
           smtpmail-smtp-service '465
           mu4e-change-filenames-when-moving t

-          mu4e-get-mail-command "offlineimap -q"
+          mu4e-get-mail-command "mbsync -a"

           message-citation-line-format "On %a %d %b %Y at %R, %f wrote:\n"
           message-citation-line-function 'message-insert-formatted-citation-line
           mu4e-completing-read-function 'ivy-completing-read
           mu4e-confirm-quit nil
           mu4e-view-use-gnus t
           mail-user-agent 'mu4e-user-agent
           message-citation-line-format "On %a %d %b %Y at %R, %f wrote:\n"
           message-citation-line-function 'message-insert-formatted-citation-line
           mu4e-completing-read-function 'ivy-completing-read
           mu4e-confirm-quit nil
           mu4e-view-use-gnus t
           mail-user-agent 'mu4e-user-agent

-          mail-context-policy 'pick-first
+          mu4e-context-policy 'pick-first

           mu4e-contexts
           `( ,(make-mu4e-context
                :name "school"
           mu4e-contexts
           `( ,(make-mu4e-context
                :name "school"


@@ -364,14 +425,13 @@ Contexts are a not very well known feature of mu4e that makes it super easy to m
                        (smtpmail-smtp-server . "smtp.mailbox.org")))))
     (add-to-list 'mu4e-bookmarks
                  '(:name "Unified inbox"
                        (smtpmail-smtp-server . "smtp.mailbox.org")))))
     (add-to-list 'mu4e-bookmarks
                  '(:name "Unified inbox"

-                         :query "maildir:\"/personal/INBOX\" or maildir:\"/school/INBOX\""
+                         :query "maildir:\"/personal/Inbox\" or maildir:\"/school/Inbox\""

                          :key ?b))
     :hook ((mu4e-compose-mode . flyspell-mode)
                          :key ?b))
     :hook ((mu4e-compose-mode . flyspell-mode)

-           (mu4e-compose-mode . auto-fill-mode)

            (message-send-hook . (lambda () (unless (yes-or-no-p "Ya sure 'bout that?")
                                              (signal 'quit nil))))))
 #+end_src
            (message-send-hook . (lambda () (unless (yes-or-no-p "Ya sure 'bout that?")
                                              (signal 'quit nil))))))
 #+end_src

-Discourage Gnus from displaying HTML emails
+**** Discourage Gnus from displaying HTML emails

 #+begin_src emacs-lisp
   (with-eval-after-load "mm-decode"
     (add-to-list 'mm-discouraged-alternatives "text/html")
 #+begin_src emacs-lisp
   (with-eval-after-load "mm-decode"
     (add-to-list 'mm-discouraged-alternatives "text/html")


@@ -381,7 +441,7 @@ Discourage Gnus from displaying HTML emails
 Set EWW as default browser except for multimedia which should open in MPV.
 #+begin_src emacs-lisp
   (defun browse-url-mpv (url &optional new-window)
 Set EWW as default browser except for multimedia which should open in MPV.
 #+begin_src emacs-lisp
   (defun browse-url-mpv (url &optional new-window)

-    "Open URL in MPV."
+    "Ask MPV to load URL."

     (interactive)
     (start-process "mpv" "*mpv*" "mpv" url))
 
     (interactive)
     (start-process "mpv" "*mpv*" "mpv" url))
 


@@ -474,7 +534,8 @@ Circe is a really nice IRC client that claims to be above RCIRC and below ERC in
     (interactive)
     (if (get-buffer "irc.armaanb.net:6696")
         (switch-to-buffer "irc.armaanb.net:6696")
     (interactive)
     (if (get-buffer "irc.armaanb.net:6696")
         (switch-to-buffer "irc.armaanb.net:6696")

-      (progn (circe "libera")
+      (progn (switch-to-buffer "*scratch*")
+             (circe "libera")

              (circe "oftc")
              (circe "tilde"))))
 
              (circe "oftc")
              (circe "tilde"))))
 


@@ -545,12 +606,8 @@ I never use this, but apparently its very powerful. Another item on my todo list
   (use-package projectile
     :config (projectile-mode)
     :custom ((projectile-completion-system 'ivy))
   (use-package projectile
     :config (projectile-mode)
     :custom ((projectile-completion-system 'ivy))

-    :bind-keymap
-    ("C-c p" . projectile-command-map)
-    :init
-    (when (file-directory-p "~/Code")
-      (setq projectile-project-search-path '("~/Code")))
-    (setq projectile-switch-project-action #'projectile-dired))
+    :bind-keymap ("C-c p" . projectile-command-map)
+    :init (setq projectile-switch-project-action #'projectile-dired))

 
   (use-package counsel-projectile
     :after projectile
 
   (use-package counsel-projectile
     :after projectile


@@ -583,7 +640,6 @@ The best file manager!
 #+end_src
 ** Git
 *** Magit
 #+end_src
 ** Git
 *** Magit

-**** TODO Write a command that commits hunk, skipping staging step.

 A very good Git interface.
 #+begin_src emacs-lisp
   (use-package magit)
 A very good Git interface.
 #+begin_src emacs-lisp
   (use-package magit)


@@ -595,17 +651,34 @@ A very good Git interface.
     :straight (git-email :repo "https://git.sr.ht/~yoctocell/git-email")
     :config (git-email-piem-mode))
 #+end_src
     :straight (git-email :repo "https://git.sr.ht/~yoctocell/git-email")
     :config (git-email-piem-mode))
 #+end_src

-* General text editing
-** Indentation
-Automatically indent after every change. I'm not sure how much I like this. It slows down the editor and code sometimes ends up in a half-indented state meaning I have to manually reformat using "==" anyways.
-#+begin_src emacs-lisp
-  (use-package aggressive-indent
-    :config (global-aggressive-indent-mode))
+** C
+Modified from https://eklitzke.org/smarter-emacs-clang-format.
+
+Style is basically ddevault's style guide but with 4 spaces instead of 8 char tabs.
+#+begin_src emacs-lisp
+  (use-package clang-format
+    :custom (clang-format-style "{
+        BasedOnStyle: llvm,
+        AlwaysBreakAfterReturnType: AllDefinitions,
+        IndentWidth: 4,
+        }"))
+
+  (defun clang-format-buffer-smart ()
+    "Reformat buffer if .clang-format exists in the projectile root."
+    (when (file-exists-p (expand-file-name ".clang-format" (projectile-project-root)))
+      (when (if (eq major-mode 'c-mode))
+        (message "Formatting with clang-format...")
+        (clang-format-buffer))))
+
+  (add-hook 'before-save-hook 'clang-format-buffer-smart nil)

 #+end_src
 #+end_src

+* General text editing

 ** Spell checking
 Spell check in text mode, and in prog-mode comments.
 #+begin_src emacs-lisp
 ** Spell checking
 Spell check in text mode, and in prog-mode comments.
 #+begin_src emacs-lisp

-  (dolist (hook '(text-mode-hook))
+  (dolist (hook '(text-mode-hook
+                  markdown-mode-hook
+                  scdoc-mode-hook))

     (add-hook hook (lambda () (flyspell-mode))))
   (dolist (hook '(change-log-mode-hook log-edit-mode-hook))
     (add-hook hook (lambda () (flyspell-mode -1))))
     (add-hook hook (lambda () (flyspell-mode))))
   (dolist (hook '(change-log-mode-hook log-edit-mode-hook))
     (add-hook hook (lambda () (flyspell-mode -1))))


@@ -664,6 +737,13 @@ Abbreviate things! I just use this for things like my email address and copyrigh
 #+begin_src emacs-lisp
   (use-package markdown-mode)
 #+end_src
 #+begin_src emacs-lisp
   (use-package markdown-mode)
 #+end_src

+** scdoc mode
+Get it for yourself at https://git.armaanb.net/scdoc
+#+begin_src emacs-lisp
+  (add-to-list 'load-path "~/src/scdoc-mode")
+  (autoload 'scdoc-mode "scdoc-mode" "Major mode for editing scdoc files" t)
+  (add-to-list 'auto-mode-alist '("\\.scd\\'" . scdoc-mode))
+#+end_src

 * Keybindings
 ** Switch windows
 #+begin_src emacs-lisp
 * Keybindings
 ** Switch windows
 #+begin_src emacs-lisp


@@ -727,6 +807,8 @@ No more clogging up init.el.
     :straight (0x0 :type git :repo "https://git.sr.ht/~zge/nullpointer-emacs")
     :custom (0x0-default-service 'envs))
 #+end_src
     :straight (0x0 :type git :repo "https://git.sr.ht/~zge/nullpointer-emacs")
     :custom (0x0-default-service 'envs))
 #+end_src

+*** TODO Replace this with uploading to my own server
+Similar to the ufile alias in my ashrc

 ** Automatically clean buffers
 Automatically close unused buffers (except those of Circe) at midnight.
 #+begin_src emacs-lisp
 ** Automatically clean buffers
 Automatically close unused buffers (except those of Circe) at midnight.
 #+begin_src emacs-lisp


@@ -743,7 +825,7 @@ Spectrwm is a really awesome window manager! Would highly recommend.
   workspace_limit = 5
   warp_pointer = 1
   modkey = Mod4
   workspace_limit = 5
   warp_pointer = 1
   modkey = Mod4

-  autorun = ws[1]:/home/armaa/Code/scripts/autostart
+  autorun = ws[1]:/home/armaa/src/bin/autostart

 #+end_src
 *** Bar
 Disable the bar by default (it can still be brought back up with MOD+b). The font just needs to be set to something that you have installed, otherwise spectrwm won't launch.
 #+end_src
 *** Bar
 Disable the bar by default (it can still be brought back up with MOD+b). The font just needs to be set to something that you have installed, otherwise spectrwm won't launch.


@@ -756,32 +838,26 @@ I'm not a huge fan of how spectrwm handles keybindings, probably my biggest grip
 **** WM actions
 #+begin_src conf :tangle ~/.spectrwm.conf
   program[term] = st -e tmux
 **** WM actions
 #+begin_src conf :tangle ~/.spectrwm.conf
   program[term] = st -e tmux

-  program[screenshot_all] = flameshot gui
-  program[notif] = /home/armaa/Code/scripts/setter status
-  program[pass] = /home/armaa/Code/scripts/passmenu
+  program[notif] = /home/armaa/src/bin/setter status
+  program[pass] = /home/armaa/src/bin/passmenu
+  program[lock] = slock

 
   bind[notif] = MOD+n
   bind[pass] = MOD+Shift+p
 #+end_src
 **** Media keys
 #+begin_src conf :tangle ~/.spectrwm.conf
 
   bind[notif] = MOD+n
   bind[pass] = MOD+Shift+p
 #+end_src
 **** Media keys
 #+begin_src conf :tangle ~/.spectrwm.conf

-  program[paup] = /home/armaa/Code/scripts/setter audio +5
-  program[padown] = /home/armaa/Code/scripts/setter audio -5
-  program[pamute] = /home/armaa/Code/scripts/setter audio
-  program[brigup] = /home/armaa/Code/scripts/setter brightness +10%
-  program[brigdown] = /home/armaa/Code/scripts/setter brightness 10%-
-  program[next] = playerctl next
-  program[prev] = playerctl previous
-  program[pause] = playerctl play-pause
+  program[paup] = /home/armaa/src/bin/setter audio +5
+  program[padown] = /home/armaa/src/bin/setter audio -5
+  program[pamute] = /home/armaa/src/bin/setter audio
+  program[brigup] = /home/armaa/src/bin/setter brightness +10%
+  program[brigdown] = /home/armaa/src/bin/setter brightness 10%-

 
   bind[padown] = XF86AudioLowerVolume
   bind[paup] = XF86AudioRaiseVolume
   bind[pamute] = XF86AudioMute
   bind[brigdown] = XF86MonBrightnessDown
   bind[brigup] = XF86MonBrightnessUp
 
   bind[padown] = XF86AudioLowerVolume
   bind[paup] = XF86AudioRaiseVolume
   bind[pamute] = XF86AudioMute
   bind[brigdown] = XF86MonBrightnessDown
   bind[brigup] = XF86MonBrightnessUp

-  bind[pause] = XF86AudioPlay
-  bind[next] = XF86AudioNext
-  bind[prev] = XF86AudioPrev

 #+end_src
 **** HJKL
 #+begin_src conf :tangle ~/.spectrwm.conf
 #+end_src
 **** HJKL
 #+begin_src conf :tangle ~/.spectrwm.conf


@@ -797,27 +873,30 @@ I'm not a huge fan of how spectrwm handles keybindings, probably my biggest grip
 #+end_src
 **** Programs
 #+begin_src conf :tangle ~/.spectrwm.conf
 #+end_src
 **** Programs
 #+begin_src conf :tangle ~/.spectrwm.conf

-  program[email] = emacsclient -ce "(mu4e)"
+  program[email] = emacsclient -ce '(progn (switch-to-buffer "*scratch*") (mu4e))'

   program[irc] = emacsclient -ce '(acheam-irc)'
   program[rss] = emacsclient -ce '(elfeed)'
   program[calendar] = emacsclient -ce '(acheam-calendar)'
   program[calc] = emacsclient -ce '(progn (calc) (windmove-up) (delete-window))'
   program[irc] = emacsclient -ce '(acheam-irc)'
   program[rss] = emacsclient -ce '(elfeed)'
   program[calendar] = emacsclient -ce '(acheam-calendar)'
   program[calc] = emacsclient -ce '(progn (calc) (windmove-up) (delete-window))'

-  program[firefox] = firefox

   program[emacs] = emacsclient -c
   program[emacs] = emacsclient -c

+  program[bookmarks] = /home/armaa/src/bin/bookmarks
+  program[browser] = chorizo

 
   bind[email] = MOD+Control+1
   bind[irc] = MOD+Control+2
   bind[rss] = MOD+Control+3
   bind[calendar] = MOD+Control+4
   bind[calc] = MOD+Control+5
 
   bind[email] = MOD+Control+1
   bind[irc] = MOD+Control+2
   bind[rss] = MOD+Control+3
   bind[calendar] = MOD+Control+4
   bind[calc] = MOD+Control+5

-  bind[firefox] = MOD+Control+0

   bind[emacs] = MOD+Control+Return
   bind[emacs] = MOD+Control+Return

+  bind[bookmarks] = MOD+Control+o
+  bind[browser] = MOD+Control+p

 #+end_src
 *** Quirks
 Float some specific programs by default.
 #+begin_src conf :tangle ~/.spectrwm.conf
   quirk[Castle Menu] = FLOAT
   quirk[momen] = FLOAT
 #+end_src
 *** Quirks
 Float some specific programs by default.
 #+begin_src conf :tangle ~/.spectrwm.conf
   quirk[Castle Menu] = FLOAT
   quirk[momen] = FLOAT

+  quirk[pinentry-fltk] = FLOAT

 #+end_src
 ** Ash
 *** Options
 #+end_src
 ** Ash
 *** Options


@@ -841,7 +920,7 @@ Use the vi editing mode. I still haven't found a good way to show visual feedbac
   }
 
   _uup() {
   }
 
   _uup() {

-      rsync "$1" "root@armaanb.net:/var/ftp/pub/$2" --chmod 644
+      rsync "$1" "armaa@armaanb.net:/srv/ftp/pub/$2" --chmod 644 --progress

   }
 
   ufile() {
   }
 
   ufile() {


@@ -867,33 +946,44 @@ Use the vi editing mode. I still haven't found a good way to show visual feedbac
   export GPG_TTY="$(tty)"
   export MANPAGER='nvim +Man!'
   export PAGER='less'
   export GPG_TTY="$(tty)"
   export MANPAGER='nvim +Man!'
   export PAGER='less'

-

   export GTK_USE_PORTAL=1
   export GTK_USE_PORTAL=1

+  export CDPATH=:~

 
   export PATH="/home/armaa/.local/bin:$PATH" # prioritize .local/bin
 
   export PATH="/home/armaa/.local/bin:$PATH" # prioritize .local/bin

-  export PATH="/home/armaa/Code/scripts:$PATH" # prioritize my scripts
-  export PATH="/home/armaa/Code/scripts/bin:$PATH" # prioritize my bins
-  export PATH="$PATH:/home/armaa/.cargo/bin"
-  export PATH="$PATH:/home/armaa/.local/share/gem/ruby/2.7.0/bin"
+  export PATH="/home/armaa/src/bin:$PATH" # prioritize my bin
+  export PATH="//home/armaa/src/bin/bin:$PATH" # prioritize my bins

   export PATH="$PATH:/usr/sbin"
   export PATH="$PATH:/usr/sbin"

-  export PATH="$PATH:/opt/FreeTube/freetube"

 
   export LC_ALL="en_US.UTF-8"
   export LC_CTYPE="en_US.UTF-8"
   export LANGUAGE="en_US.UTF-8"
 
   export LC_ALL="en_US.UTF-8"
   export LC_CTYPE="en_US.UTF-8"
   export LANGUAGE="en_US.UTF-8"

+  export TZ="America/New_York"

 
 

-  export KISS_PATH="/home/armaa/Virtual/kiss/home/armaa/kiss-repo"
-  export KISS_PATH="$KISS_PATH:/home/armaa/Clone/repo-main/core"
-  export KISS_PATH="$KISS_PATH:/home/armaa/Clone/repo-main/extra"
-  export KISS_PATH="$KISS_PATH:/home/armaa/Clone/repo-main/xorg"
-  export KISS_PATH="$KISS_PATH:/home/armaa/Clone/repo-main/testing"
-  export KISS_PATH="$KISS_PATH:/home/armaa/Clone/repo-community/community"
+  export KISS_PATH=""
+  export KISS_PATH="$KISS_PATH:$HOME/repos/personal"
+  export KISS_PATH="$KISS_PATH:$HOME/repos/bin/bin"
+  export KISS_PATH="$KISS_PATH:$HOME/repos/main/core"
+  export KISS_PATH="$KISS_PATH:$HOME/repos/main/extra"
+  export KISS_PATH="$KISS_PATH:$HOME/repos/main/xorg"
+  export KISS_PATH="$KISS_PATH:$HOME/repos/community/community"
+  export KISS_PATH="$KISS_PATH:$HOME/repos/mid/ports"
+
+  export CFLAGS="-O3 -pipe -march=native"
+  export CXXFLAGS="$CFLAGS"
+  export MAKEFLAGS="-j$(nproc)"

   export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig"
   export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig"

+
+  export XDG_DESKTOP_DIR="/dev/null"
+  export XDG_DOCUMENTS_DIR="$HOME/documents"
+  export XDG_DOWNLOAD_DIR="$HOME/downloads"
+  export XDG_MUSIC_DIR="$HOME/music"
+  export XDG_PICTURES_DIR="$HOME/pictures"
+  export XDG_VIDEOS_DIR="$HOME/videos"

 #+end_src
 *** Aliases
 **** SSH
 #+begin_src shell :tangle ~/.config/ash/ashrc
 #+end_src
 *** Aliases
 **** SSH
 #+begin_src shell :tangle ~/.config/ash/ashrc

-  alias bhoji-drop='ssh -p 23 root@armaanb.net'
+  alias poki='ssh armaanb.net'

   alias irc='ssh root@armaanb.net -t abduco -A irc catgirl freenode'
   alias union='ssh 192.168.1.18'
   alias mine='ssh -p 23 root@pickupserver.cc'
   alias irc='ssh root@armaanb.net -t abduco -A irc catgirl freenode'
   alias union='ssh 192.168.1.18'
   alias mine='ssh -p 23 root@pickupserver.cc'


@@ -905,7 +995,7 @@ Use the vi editing mode. I still haven't found a good way to show visual feedbac
 #+end_src
 **** File management
 #+begin_src shell :tangle ~/.config/ash/ashrc
 #+end_src
 **** File management
 #+begin_src shell :tangle ~/.config/ash/ashrc

-  alias ls='ls -lh --group-directories-first'
+  alias ls='LC_COLLATE=C ls -lh --group-directories-first'

   alias la='ls -A'
   alias df='df -h / /boot'
   alias du='du -h'
   alias la='ls -A'
   alias df='df -h / /boot'
   alias du='du -h'


@@ -916,7 +1006,7 @@ Use the vi editing mode. I still haven't found a good way to show visual feedbac
   alias ln='ln -v'
   alias grep='grep -in'
   alias mkdir='mkdir -pv'
   alias ln='ln -v'
   alias grep='grep -in'
   alias mkdir='mkdir -pv'

-  alias lanex='java -jar ~/.local/share/lxc/lanxchange.jar'
+  alias lanex='java -jar ~/.local/share/lxc/lanxchange.jar && rm lxc*'

   emacs() { $EDITOR "$@" & }
   alias vim="emacs"
 #+end_src
   emacs() { $EDITOR "$@" & }
   alias vim="emacs"
 #+end_src


@@ -934,14 +1024,14 @@ Use the vi editing mode. I still haven't found a good way to show visual feedbac
   alias gps='gpg --keyserver keyserver.ubuntu.com --search-keys'
   alias gpp='gpg --keyserver keyserver.ubuntu.com --recv-key'
   alias plan='T=$(mktemp) && \
   alias gps='gpg --keyserver keyserver.ubuntu.com --search-keys'
   alias gpp='gpg --keyserver keyserver.ubuntu.com --recv-key'
   alias plan='T=$(mktemp) && \

-          rsync root@armaanb.net:/etc/finger/plan.txt "$T" && \
+          rsync armaanb.net:/home/armaa/plan.txt "$T" && \

           TT=$(mktemp) && \
           head -n -2 $T > $TT && \
           /bin/nvim $TT && \
           echo >> "$TT" && \
           echo "Last updated: $(date -R)" >> "$TT" && \
           fold -sw 72 "$TT" > "$T"| \
           TT=$(mktemp) && \
           head -n -2 $T > $TT && \
           /bin/nvim $TT && \
           echo >> "$TT" && \
           echo "Last updated: $(date -R)" >> "$TT" && \
           fold -sw 72 "$TT" > "$T"| \

-          rsync "$T" root@armaanb.net:/etc/finger/plan.txt && \
+          rsync "$T" armaanb.net:/home/armaa/plan.txt && \

           rm -f "$T"'
 #+end_src
 **** Virtual machines, chroots
           rm -f "$T"'
 #+end_src
 **** Virtual machines, chroots


@@ -1039,62 +1129,10 @@ This file is used for any GNU Readline programs. I use Emacs editing mode mostly
   gpgsign = true
   verbose = true
 #+end_src
   gpgsign = true
   verbose = true
 #+end_src

-** Dunst
-Lightweight notification daemon. Eventually I'd like to replace this with something dbus-less.
-*** General
-#+begin_src conf :tangle ~/.config/dunst/dunstrc
-  [global]
-  font = "JetBrains Mono Medium Nerd Font 11"
-  allow_markup = yes
-  format = "<b>%s</b>\n%b"
-  sort = no
-  indicate_hidden = yes
-  alignment = center
-  bounce_freq = 0
-  show_age_threshold = 60
-  word_wrap = yes
-  ignore_newline = no
-  geometry = "400x5-10+10"
-  transparency = 0
-  idle_threshold = 120
-  monitor = 0
-  sticky_history = yes
-  line_height = 0
-  separator_height = 1
-  padding = 8
-  horizontal_padding = 8
-  max_icon_size = 32
-  separator_color = "#ffffff"
-  startup_notification = false
-#+end_src
-*** Modes
-#+begin_src conf :tangle ~/.config/dunst/dunstrc
-  [frame]
-  width = 1
-  color = "#ffffff"
-
-  [shortcuts]
-  close = mod4+c
-  close_all = mod4+shift+c
-  history = mod4+ctrl+c
-
-  [urgency_low]
-  background = "#222222"
-  foreground = "#ffffff"
-  highlight = "#ffffff"
-  timeout = 5
-
-  [urgency_normal]
-  background = "#222222"
-  foreground = "#ffffff"
-  highlight = "#ffffff"
-  timeout = 15
-
-  [urgency_critical]
-  background = "#222222"
-  foreground = "#a60000"
-  highlight = "#ffffff"
-  timeout = 0
+*** Tag
+#+begin_src conf :tangle ~/.gitconfig
+  [tag]
+  gpgsign = true

 #+end_src
 ** Zathura
 The best document reader!
 #+end_src
 ** Zathura
 The best document reader!


@@ -1120,57 +1158,6 @@ The best document reader!
   set recolor-darkcolor  "#ffffff" # fg
   set recolor            "true"
 #+end_src
   set recolor-darkcolor  "#ffffff" # fg
   set recolor            "true"
 #+end_src

-** Firefox
-Just some basic Firefox CSS. Will probably have to rewrite for the Proton redesign.
-*** Swap tab and URL bars
-#+begin_src css :tangle ~/.mozilla/firefox/armaan-release/chrome/userChrome.css
-  #nav-bar {
-      -moz-box-ordinal-group: 1 !important;
-  }
-
-  #PersonalToolbar {
-      -moz-box-ordinal-group: 2 !important;
-  }
-
-  #titlebar {
-      -moz-box-ordinal-group: 3 !important;
-  }
-#+end_src
-*** Hide URL bar when not focused.
-#+begin_src css :tangle ~/.mozilla/firefox/armaan-release/chrome/userChrome.css
-  #navigator-toolbox:not(:focus-within):not(:hover) {
-      margin-top: -30px;
-  }
-
-  #navigator-toolbox {
-      transition: 0.1s margin-top ease-out;
-  }
-#+end_src
-*** Black screen by default
-userChrome.css:
-#+begin_src css :tangle ~/.mozilla/firefox/armaan-release/chrome/userChrome.css
-  #main-window,
-  #browser,
-  #browser vbox#appcontent tabbrowser,
-  #content,
-  #tabbrowser-tabpanels,
-  #tabbrowser-tabbox,
-  browser[type="content-primary"],
-  browser[type="content"] > html,
-  .browserContainer {
-      background: black !important;
-      color: #fff !important;
-  }
-#+end_src
-
-userContent.css:
-#+begin_src css :tangle ~/.mozilla/firefox/armaan-release/chrome/userContent.css
-  @-moz-document url("about:home"), url("about:blank"), url("about:newtab") {
-      body {
-          background: black !important;
-      }
-  }
-#+end_src

 ** Xresources
 Modus operandi theme. No program I use checks for anything beyond foreground and background, but hey, it can't hurt to have all the colors in there.
 #+begin_src conf :tangle ~/.Xresources
 ** Xresources
 Modus operandi theme. No program I use checks for anything beyond foreground and background, but hey, it can't hurt to have all the colors in there.
 #+begin_src conf :tangle ~/.Xresources


@@ -1229,8 +1216,27 @@ I use tmux in order to keep my st build light. Still learning how it works.
 #+end_src
 *** Agent
 #+begin_src conf :tangle ~/.gnupg/gpg-agent.conf
 #+end_src
 *** Agent
 #+begin_src conf :tangle ~/.gnupg/gpg-agent.conf

-  pinentry-program /sbin/pinentry-gnome3
+  pinentry-program /sbin/pinentry

   max-cache-ttl 600
   default-cache-ttl 600
   allow-emacs-pinentry
 #+end_src
   max-cache-ttl 600
   default-cache-ttl 600
   allow-emacs-pinentry
 #+end_src

+** Xmodmap
+#+begin_src conf (if (eq system-name "frost.armaanb.net") ":tangle ~/.config/xmodmap")
+  ! Unmap left super
+  clear mod4
+
+  ! Turn right alt into super
+  remove mod1 = Alt_R
+  add mod4 = Alt_R
+
+  ! Swap caps and control
+  remove Lock = Caps_Lock
+  remove Control = Control_L
+  remove Lock = Control_L
+  remove Control = Caps_Lock
+  keysym Control_L = Caps_Lock
+  keysym Caps_Lock = Control_L
+  add Lock = Caps_Lock
+  add Control = Control_L
+#+end_src