X-Git-Url: https://git.armaanb.net/?p=config.org.git;a=blobdiff_plain;f=config.org;h=a74169fda3172d15842e4d789f7976343ff750be;hp=6a21b86036e8640eaa0f18444c225b1e0b3bfdc9;hb=6ffeb4a1e0b4c1d6cf3a83b764dd25768e4cf8ad;hpb=d28b9b8e219af010a3c1b6871272ddfb24cc7a38

diff --git a/config.org b/config.org
index 6a21b86..a74169f 100644
--- a/config.org
+++ b/config.org
@@ -6,24 +6,20 @@
 * 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 GCCEmacs 28 from the feature/native-comp branch, so some settings may not be available for older versions of Emacs. This is a purely personal configuration, so while I can garuntee that it works on my setup, I can't for anything else.
+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.
 ** Choices
-I chose to create a powerful, yet not overly heavy Emacs configuration. Things like LSP mode are important to my workflow and help me be productive, so despite its weight, it is kept. Things like a fancy modeline or icons on the other hand, do not increase my productivity, and create visual clutter, and thus have been excluded.
+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 [[*EmacsOS]]). I use Email, IRC, et cetera, all through Emacs which simplifies my workflow.
+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. I think modal keybindings are simple 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 Put configs with passwords in here with some kind of authentication
-- Offlineimap
-- irc.el
+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.
 ** 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 at the snippet.
+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
 ** Bootstrap straight.el
 straight.el is really nice for managing package, and it integrates nicely with use-package. It uses the bootstrapping system defined here for installation.
 #+begin_src emacs-lisp
+  (defvar native-comp-deferred-compilation-deny-list ())
   (defvar bootstrap-version)
   (let ((bootstrap-file
          (expand-file-name "straight/repos/straight.el/bootstrap.el" user-emacs-directory))
@@ -37,16 +33,14 @@ straight.el is really nice for managing package, and it integrates nicely with u
         (eval-print-last-sexp)))
     (load bootstrap-file nil 'nomessage))
 #+end_src
-** Replace use-package with straight
+** Replace package.el with straight
 #+begin_src emacs-lisp
   (straight-use-package 'use-package)
   (setq straight-use-package-by-default t)
 #+end_src
 * Visual options
 ** Theme
-Very nice high contrast theme.
-
-Its fine to set this here because I run Emacs in daemon mode, but if I were not, then putting it in early-init.el would be a better choice to eliminate the window being white before the theme is loaded.
+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
@@ -57,7 +51,7 @@ Its fine to set this here because I run Emacs in daemon mode, but if I were not,
 #+end_src
 ** Typography
 *** Font
-Great programming font with ligatures.
+JetBrains Mono is a great programming font with ligatures. The "NF" means that it has been patched with the [[https://www.nerdfonts.com/][Nerd Fonts]].
 #+begin_src emacs-lisp
   (add-to-list 'default-frame-alist '(font . "JetBrainsMonoNF-12"))
 #+end_src
@@ -83,7 +77,7 @@ Great programming font with ligatures.
     (global-ligature-mode t))
 #+end_src
 ** Line numbers
-Display relative line numbers except in some modes
+Display relative line numbers except in certain modes.
 #+begin_src emacs-lisp
   (global-display-line-numbers-mode)
   (setq display-line-numbers-type 'relative)
@@ -91,6 +85,7 @@ Display relative line numbers except in some modes
                          pdf-view-mode-hook
                          shell-mode-hook
                          org-mode-hook
+                         circe-mode-hook
                          eshell-mode-hook))
     (add-hook no-line-num (lambda () (display-line-numbers-mode 0))))
 #+end_src
@@ -122,35 +117,42 @@ Show a ruler at a certain number of chars depending on mode.
   (setq display-fill-column-indicator-column 80)
   (global-display-fill-column-indicator-mode)
 #+end_src
-** Keybinding hints
-Whenever starting a key chord, show possible future steps.
-#+begin_src emacs-lisp
-  (use-package which-key
-    :config (which-key-mode)
-    :custom (which-key-idle-delay 0.3))
-#+end_src
-** Highlight TODOs in comments
+** Highlight todo items in comments
 #+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))
 #+end_src
-** Don't lose cursor
+** Blink cursor
 #+begin_src emacs-lisp
   (blink-cursor-mode)
 #+end_src
 ** Visual line mode
-Soft wrap words and do operations by visual lines.
+Soft wrap words and do operations by visual lines in some modes.
 #+begin_src emacs-lisp
-  (add-hook 'text-mode-hook 'visual-line-mode 1)
+  (dolist (hook '(text-mode-hook
+                  org-mode-hook
+                  markdown-mode-hook
+                  mu4e-view-mode-hook))
+    (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
   (use-package anzu
-    :config (global-anzu-mode))
+    :config (global-anzu-mode)
+    :bind
+    ([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
-Inverts modeline instead of audible bell or the standard visual bell.
+Invert modeline color instead of audible bell or the standard visual bell.
 #+begin_src emacs-lisp
   (setq visible-bell nil
         ring-bell-function
@@ -171,6 +173,7 @@ Inverts modeline instead of audible bell or the standard visual bell.
     (global-set-key (kbd "<escape>") 'keyboard-escape-quit))
 #+end_src
 ** Evil collection
+Evil bindings for tons of packages.
 #+begin_src emacs-lisp
   (use-package evil-collection
     :after evil
@@ -183,17 +186,9 @@ tpope prevails!
   (use-package evil-surround
     :config (global-evil-surround-mode))
 #+end_src
-** Leader key
-#+begin_src emacs-lisp
-  (use-package evil-leader
-    :straight (evil-leader :type git :host github :repo "cofi/evil-leader")
-    :config
-    (evil-leader/set-leader "<SPC>")
-    (global-evil-leader-mode))
-#+end_src
 ** Nerd commenter
+Makes commenting super easy
 #+begin_src emacs-lisp
-  ;; Nerd commenter
   (use-package evil-nerd-commenter
     :bind (:map evil-normal-state-map
                 ("gc" . evilnc-comment-or-uncomment-lines))
@@ -205,7 +200,7 @@ Fix the oopsies!
   (evil-set-undo-system 'undo-redo)
 #+end_src
 ** Number incrementing
-Add back C-a/C-x
+Add back C-a/C-x bindings.
 #+begin_src emacs-lisp
   (use-package evil-numbers
     :straight (evil-numbers :type git :host github :repo "juliapath/evil-numbers")
@@ -214,25 +209,18 @@ Add back C-a/C-x
                 ("C-M-x" . evil-numbers/dec-at-pt)))
 #+end_src
 ** Evil org
-*** Init
 #+begin_src emacs-lisp
   (use-package evil-org
     :after org
     :hook (org-mode . evil-org-mode)
     :config
     (evil-org-set-key-theme '(textobjects insert navigation shift todo)))
+
   (use-package evil-org-agenda
     :straight (:type built-in)
     :after evil-org
     :config (evil-org-agenda-set-keys))
 #+end_src
-*** Leader maps
-#+begin_src emacs-lisp
-  (evil-leader/set-key-for-mode 'org-mode
-    "T" 'org-show-todo-tree
-    "a" 'org-agenda
-    "c" 'org-archive-subtree)
-#+end_src
 * Org mode
 ** General
 #+begin_src emacs-lisp
@@ -250,37 +238,42 @@ Add back C-a/C-x
     (org-startup-indented t)
     (org-hide-emphasis-markers t)
     (org-fontify-whole-block-delimiter-line nil)
-    :bind ("C-c a" . org-agenda))
+    (org-archive-default-command 'org-archive-to-archive-sibling)
+    :bind
+    ("C-c a" . org-agenda)
+    (:map evil-normal-state-map ("ga" . org-archive-subtree-default)))
 #+end_src
 ** Tempo
+Define templates for lots of common structure elements. Mostly just used within this file.
 #+begin_src emacs-lisp
   (use-package org-tempo
     :after org
     :straight (:type built-in)
     :config
-    ;; TODO: There's gotta be a more efficient way to write this
-    (add-to-list 'org-structure-template-alist '("el" . "src emacs-lisp"))
-    (add-to-list 'org-structure-template-alist '("sp" . "src conf :tangle ~/.spectrwm.conf"))
-    (add-to-list 'org-structure-template-alist '("ash" . "src shell :tangle ~/.config/ash/ashrc"))
-    (add-to-list 'org-structure-template-alist '("al" . "src yml :tangle ~/.config/alacritty/alacritty.yml"))
-    (add-to-list 'org-structure-template-alist '("ipy" . "src python :tangle ~/.ipython/"))
-    (add-to-list 'org-structure-template-alist '("pi" . "src conf :tangle ~/.config/picom/picom.conf"))
-    (add-to-list 'org-structure-template-alist '("git" . "src conf :tangle ~/.gitconfig"))
-    (add-to-list 'org-structure-template-alist '("du" . "src conf :tangle ~/.config/dunst/dunstrc"))
-    (add-to-list 'org-structure-template-alist '("za" . "src conf :tangle ~/.config/zathura/zathurarc"))
-    (add-to-list 'org-structure-template-alist '("ff1" . "src css :tangle ~/.mozilla/firefox/armaan-release/chrome/userChrome.css"))
-    (add-to-list 'org-structure-template-alist '("ff2" . "src css :tangle ~/.mozilla/firefox/armaan-release/chrome/userContent.css"))
-    (add-to-list 'org-structure-template-alist '("xr" . "src conf :tangle ~/.Xresources")))
+    (dolist (addition '(("el" . "src emacs-lisp")
+                        ("el" . "src emacs-lisp")
+                        ("sp" . "src conf :tangle ~/.spectrwm.conf")
+                        ("ash" . "src shell :tangle ~/.config/ash/ashrc")
+                        ("pi" . "src conf :tangle ~/.config/picom/picom.conf")
+                        ("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")
+                        ("ag" . "src conf :tangle ~/.gnupg/gpg-agent.conf")))
+      (add-to-list 'org-structure-template-alist addition)))
 #+end_src
 * Autocompletion
 ** Ivy
-Simple, but not too simple autocompletion.
+A well balanced completion framework.
 #+begin_src emacs-lisp
   (use-package ivy
-    :bind (("C-s" . swiper)
-           :map ivy-minibuffer-map
-           ("TAB" . ivy-alt-done)
-           :map ivy-switch-buffer-map
+    :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
@@ -294,50 +287,34 @@ Simple, but not too simple autocompletion.
 Ivy everywhere.
 #+begin_src emacs-lisp
   (use-package counsel
-    :bind (("C-M-j" . 'counsel-switch-buffer)
-           :map minibuffer-local-map
-           ("C-r" . 'counsel-minibuffer-history))
-    :custom (counsel-linux-app-format-function #'counsel-linux-app-format-function-name-only)
+    :bind ("C-M-j" . 'counsel-switch-buffer)
     :config (counsel-mode))
 #+end_src
 ** Remember frequent commands
 #+begin_src emacs-lisp
   (use-package ivy-prescient
     :after counsel
-    :custom
-    (ivy-prescient-enable-filtering nil)
     :config
     (prescient-persist-mode)
     (ivy-prescient-mode))
 #+end_src
-** Swiper
-Better search utility.
-#+begin_src emacs-lisp
-  (use-package swiper)
-#+end_src
-* EmacsOS
+* Emacs OS
 ** RSS
-Use elfeed for RSS. I have another file with all the feeds in it.
+Use elfeed for reading RSS. I have another file with all the feeds in it that I'd rather keep private.
 #+begin_src emacs-lisp
   (use-package elfeed
     :bind (("C-c e" . elfeed))
-    :config
-    (load "~/.emacs.d/feeds.el")
-    (add-hook 'elfeed-new-entry-hook
-              (elfeed-make-tagger :feed-url "youtube\\.com"
-                                  :add '(youtube)))
+    :config (load "~/.emacs.d/feeds.el")
     :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
 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.
-
 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.
+*** TODO Switch to mbsync
+=offlineimap= really crappy (slow and requires python2), and I need to replace it with =mbsync=.
+*** TODO Include mbsync/offlineimap config
+*** TODO Split up and document this config a bit
+*** Setup
 #+begin_src emacs-lisp
   (use-package smtpmail
     :straight (:type built-in))
@@ -356,7 +333,9 @@ Contexts are a not very well known feature of mu4e that makes it super easy to m
           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
+          mu4e-context-policy 'pick-first
           mu4e-contexts
           `( ,(make-mu4e-context
                :name "school"
@@ -394,14 +373,21 @@ Contexts are a not very well known feature of mu4e that makes it super easy to m
                          :query "maildir:\"/personal/INBOX\" or maildir:\"/school/INBOX\""
                          :key ?b))
     :hook ((mu4e-compose-mode . flyspell-mode)
-           (mu4e-compose-mode . auto-fill-mode)
-           (mu4e-view-mode-hook . turn-on-visual-line-mode)))
+           (message-send-hook . (lambda () (unless (yes-or-no-p "Ya sure 'bout that?")
+                                             (signal 'quit nil))))))
+#+end_src
+*** Discourage Gnus from displaying HTML emails
+#+begin_src emacs-lisp
+  (with-eval-after-load "mm-decode"
+    (add-to-list 'mm-discouraged-alternatives "text/html")
+    (add-to-list 'mm-discouraged-alternatives "text/richtext"))
 #+end_src
 ** Default browser
-Set EWW as default browser except for videos.
+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))
 
   (setq browse-url-handlers
@@ -410,6 +396,9 @@ Set EWW as default browser except for videos.
           ("peertube.*" . browse-url-mpv)
           ("vid.*" . browse-url-mpv)
           ("vid.*" . browse-url-mpv)
+          ("*.mp4" . browse-url-mpv)
+          ("*.mp3" . browse-url-mpv)
+          ("*.ogg" . browse-url-mpv)
           ("." . eww-browse-url)
           )))
 #+end_src
@@ -431,64 +420,133 @@ Some EWW enhancements.
     :bind (("C-c w" . eww))
     :hook (eww-after-render-hook prot-eww--rename-buffer))
 #+end_src
-*** Better entrypoint
+*** Keybinding
 #+begin_src emacs-lisp
-  ;; From https://protesilaos.com/dotemacs/
-  (defun prot-eww-browse-dwim (url &optional arg)
-    "Visit a URL, maybe from `eww-prompt-history', with completion.
-
-  With optional prefix ARG (\\[universal-argument]) open URL in a
-  new eww buffer.
+  (global-set-key (kbd "C-c w") 'eww)
+#+end_src
+** IRC
+Circe is a really nice IRC client that claims to be above RCIRC and below ERC in terms of features. ERC felt a bit messy and finicky to me, and Circe has all the features that I need. This setup gets the password for my bouncer (Pounce) instances via my =~/.authinfo.gpg= file.
+#+begin_src emacs-lisp
+  (defun fetch-password (&rest params)
+    (require 'auth-source)
+    (let ((match (car (apply 'auth-source-search params))))
+      (if match
+          (let ((secret (plist-get match :secret)))
+            (if (functionp secret)
+                (funcall secret)
+              secret))
+        (error "Password not found for %S" params))))
 
-  If URL does not look like a valid link, run a web query using
-  `eww-search-prefix'.
+  (use-package circe
+    :config
+    (enable-lui-track)
+    (enable-circe-color-nicks)
+    (setq circe-network-defaults '(("libera"
+                                    :host "irc.armaanb.net"
+                                    :nick "emacs"
+                                    :user "emacs"
+                                    :use-tls t
+                                    :port 6698
+                                    :pass (lambda (null) (fetch-password
+                                                          :login "emacs"
+                                                          :machine "irc.armaanb.net"
+                                                          :port 6698)))
+                                   ("oftc"
+                                    :host "irc.armaanb.net"
+                                    :nick "emacs"
+                                    :user "emacs"
+                                    :use-tls t
+                                    :port 6699
+                                    :pass (lambda (null) (fetch-password
+                                                          :login "emacs"
+                                                          :machine "irc.armaanb.net"
+                                                          :port 6699)))
+                                   ("tilde"
+                                    :host "irc.armaanb.net"
+                                    :nick "emacs"
+                                    :user "emacs"
+                                    :use-tls t
+                                    :port 6696
+                                    :pass (lambda (null) (fetch-password
+                                                          :login "emacs"
+                                                          :machine "irc.armaanb.net"
+                                                          :port 6696)))))
+    :custom (circe-default-part-message "goodbye!")
+    :bind (:map circe-mode-map ("C-c C-r" . circe-reconnect-all)))
 
-  When called from an eww buffer, provide the current link as
-  initial input."
-    (interactive
-     (list
-      (completing-read "Query:" eww-prompt-history
-                       nil nil (plist-get eww-data :url) 'eww-prompt-history)
-      current-prefix-arg))
-    (eww url (if arg 4 nil)))
+  (defun acheam-irc ()
+    "Open circe"
+    (interactive)
+    (if (get-buffer "irc.armaanb.net:6696")
+        (switch-to-buffer "irc.armaanb.net:6696")
+      (progn (switch-to-buffer "*scratch*")
+             (circe "libera")
+             (circe "oftc")
+             (circe "tilde"))))
 
-  (global-set-key (kbd "C-c w") 'prot-eww-browse-dwim)
+  (global-set-key (kbd "C-c i") 'acheam-irc)
 #+end_src
-** IRC
+** Calendar
+Still experimenting with this setup. Not sure if I will keep it, but it works well for seeing my calendar events. I use =vdirsyncer= to sync my calendar events which I'm really not happy with.
 #+begin_src emacs-lisp
-  (use-package erc
-    :straight (:type built-in)
-    :config
-    (load "~/.emacs.d/irc.el")
-    (acheam-irc)
-    (erc-notifications-enable)
-    (erc-smiley-disable))
+  (defun sync-calendar ()
+    "Sync calendars with vdirsyncer"
+    (interactive)
+    (async-shell-command "vdirsyncer sync"))
+
+  (use-package calfw
+    :bind (:map cfw:calendar-mode-map ("C-S-u" . sync-calendar)))
+  (use-package calfw-ical)
+  (use-package calfw-org)
 
-  (use-package erc-hl-nicks
-    :config (erc-hl-nicks-mode 1))
+  (defun acheam-calendar ()
+    "Open calendars"
+    (interactive)
+    (cfw:open-calendar-buffer
+     :contents-sources (list
+                        (cfw:org-create-source "Green")
+                        (cfw:ical-create-source
+                         "Personal"
+                         "~/.local/share/vdirsyncer/mailbox/Y2FsOi8vMC8zMQ.ics"
+                         "Gray")
+                        (cfw:ical-create-source
+                         "Personal"
+                         "~/.local/share/vdirsyncer/mailbox/Y2FsOi8vMC8zMQ.ics"
+                         "Red")
+                        (cfw:ical-create-source
+                         "School"
+                         "~/.local/share/vdirsyncer/school/abhojwani22@nobles.edu.ics"
+                         "Cyan"))
+     :view 'week))
+
+  (global-set-key (kbd "C-c c") 'acheam-calendar)
 #+end_src
-** Emacs Anywhere
-Use Emacs globally. Use the Emacs daemon and bind a key in your wm to =emacsclient --eval "(emacs-everywhere)"=.
+** PDF reader
 #+begin_src emacs-lisp
-  (use-package emacs-everywhere)
+  (use-package pdf-tools
+    :hook (pdf-view-mode . pdf-view-midnight-minor-mode))
 #+end_src
 * Emacs IDE
-** Code cleanup
+** Python formatting
 #+begin_src emacs-lisp
   (use-package blacken
     :hook (python-mode . blacken-mode)
-    :config (setq blacken-line-length 79))
+    :custom (blacken-line-length 79))
 
-  ;; Purge whitespace
+#+end_src
+** Strip trailing whitespace
+#+begin_src emacs-lisp
   (use-package ws-butler
     :config (ws-butler-global-mode))
 #+end_src
 ** Flycheck
+Automatic linting. I need to look into configuring this more.
 #+begin_src emacs-lisp
   (use-package flycheck
     :config (global-flycheck-mode))
 #+end_src
 ** Project management
+I never use this, but apparently its very powerful. Another item on my todo list.
 #+begin_src emacs-lisp
   (use-package projectile
     :config (projectile-mode)
@@ -505,6 +563,7 @@ Use Emacs globally. Use the Emacs daemon and bind a key in your wm to =emacsclie
     :config (counsel-projectile-mode))
 #+end_src
 ** Dired
+The best file manager!
 #+begin_src emacs-lisp
   (use-package dired
     :straight (:type built-in)
@@ -530,18 +589,10 @@ Use Emacs globally. Use the Emacs daemon and bind a key in your wm to =emacsclie
 #+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)
 #+end_src
-*** Colored diff in line number area
-#+begin_src emacs-lisp
-  (use-package diff-hl
-    :straight (diff-hl :type git :host github :repo "dgutov/diff-hl")
-    :hook ((magit-pre-refresh-hook . diff-hl-magit-pre-refresh)
-           (magit-post-refresh-hook . diff-hl-magit-post-refresh))
-    :config (global-diff-hl-mode))
-#+end_src
 *** Email
 #+begin_src emacs-lisp
   (use-package piem)
@@ -551,7 +602,7 @@ Use Emacs globally. Use the Emacs daemon and bind a key in your wm to =emacsclie
 #+end_src
 * General text editing
 ** Indentation
-Indent after every change.
+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))
@@ -559,24 +610,19 @@ Indent after every change.
 ** 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 'prog-mode (lambda () (flyspell-prog mode)))
+  (setq ispell-silently-savep t)
 #+end_src
-** Expand tabs to spaces
+** Sane tab width
 #+begin_src emacs-lisp
   (setq-default tab-width 2)
 #+end_src
-** Copy kill ring to clipboard
-#+begin_src emacs-lisp
-  (setq x-select-enable-clipboard t)
-  (defun copy-kill-ring-to-xorg ()
-    "Copy the current kill ring to the xorg clipboard."
-    (interactive)
-    (x-select-text (current-kill 0)))
-#+end_src
 ** Save place
 Opens file where you left it.
 #+begin_src emacs-lisp
@@ -586,11 +632,10 @@ Opens file where you left it.
 Distraction free writing a la junegunn/goyo.
 #+begin_src emacs-lisp
   (use-package olivetti
-    :config
-    (evil-leader/set-key "o" 'olivetti-mode))
+    :bind ("C-c o" . olivetti-mode))
 #+end_src
 ** Abbreviations
-Abbreviate things!
+Abbreviate things! I just use this for things like my email address and copyright notice.
 #+begin_src emacs-lisp
   (setq abbrev-file-name "~/.emacs.d/abbrevs.el")
   (setq save-abbrevs 'silent)
@@ -600,13 +645,38 @@ Abbreviate things!
 #+begin_src emacs-lisp
   (setq tramp-default-method "ssh")
 #+end_src
-** Don't ask about following symlinks in vc
+** Follow version controlled symlinks
 #+begin_src emacs-lisp
   (setq vc-follow-symlinks t)
 #+end_src
-** Don't ask to save custom dictionary
+** Open file as root
 #+begin_src emacs-lisp
-  (setq ispell-silently-savep t)
+  (defun doas-edit (&optional arg)
+    "Edit currently visited file as root.
+
+    With a prefix ARG prompt for a file to visit.
+    Will also prompt for a file to visit if current
+    buffer is not visiting a file.
+
+    Modified from Emacs Redux."
+    (interactive "P")
+    (if (or arg (not buffer-file-name))
+        (find-file (concat "/doas:root@localhost:"
+                           (ido-read-file-name "Find file(as root): ")))
+      (find-alternate-file (concat "/doas:root@localhost:" buffer-file-name))))
+
+    (global-set-key (kbd "C-x C-r") #'doas-edit)
+#+end_src
+** Markdown mode
+#+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 "~/Code/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
@@ -620,14 +690,15 @@ Makes "C-x k" binding faster.
   (substitute-key-definition 'kill-buffer 'kill-buffer-and-window global-map)
 #+end_src
 * Other settings
-** OpenSCAD
+** OpenSCAD syntax
 #+begin_src emacs-lisp
   (use-package scad-mode)
 #+end_src
-** Control backup files
+** Control backup and lock files
 Stop backup files from spewing everywhere.
 #+begin_src emacs-lisp
-  (setq backup-directory-alist `(("." . "~/.emacs.d/backups")))
+  (setq backup-directory-alist `(("." . "~/.emacs.d/backups"))
+        create-lockfiles nil)
 #+end_src
 ** Make yes/no easier
 #+begin_src emacs-lisp
@@ -668,16 +739,21 @@ No more clogging up init.el.
 #+begin_src emacs-lisp
   (use-package 0x0
     :straight (0x0 :type git :repo "https://git.sr.ht/~zge/nullpointer-emacs")
-    :custom (0x0-default-service 'envs)
-    :config (evil-leader/set-key
-              "00" '0x0-upload
-              "0f" '0x0-upload-file
-              "0s" '0x0-upload-string
-              "0c" '0x0-upload-kill-ring
-              "0p" '0x0-upload-popup))
+    :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
+  (midnight-mode)
+  (add-to-list 'clean-buffer-list-kill-never-regexps (lambda (buffer-name)
+                                                       (with-current-buffer buffer-name
+                                                         (derived-mode-p 'lui-mode))))
 #+end_src
 * Tangles
 ** Spectrwm
+Spectrwm is a really awesome window manager! Would highly recommend.
 *** General settings
 #+begin_src conf :tangle ~/.spectrwm.conf
   workspace_limit = 5
@@ -686,14 +762,16 @@ No more clogging up init.el.
   autorun = ws[1]:/home/armaa/Code/scripts/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.
 #+begin_src conf :tangle ~/.spectrwm.conf
   bar_enabled = 0
-  bar_font = xos4 Fira Code:pixelsize=14:antialias=true # any installed font
+  bar_font = xos4 JetBrains Mono:pixelsize=14:antialias=true # any installed font
 #+end_src
 *** Keybindings
+I'm not a huge fan of how spectrwm handles keybindings, probably my biggest gripe with it.
 **** WM actions
 #+begin_src conf :tangle ~/.spectrwm.conf
-  program[term] = alacritty
+  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
@@ -735,97 +813,65 @@ No more clogging up init.el.
 #+end_src
 **** Programs
 #+begin_src conf :tangle ~/.spectrwm.conf
-  program[email] = emacsclient -c --eval "(mu4e)"
-  program[irc] = emacsclient -c --eval '(switch-to-buffer "irc.armaanb.net:6697")'
-  program[emacs] = emacsclient -c
+  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[firefox] = firefox
-  program[calc] = alacritty -e because -l
-  program[emacs-anywhere] = emacsclient --eval "(emacs-everywhere)"
+  program[emacs] = emacsclient -c
 
   bind[email] = MOD+Control+1
   bind[irc] = MOD+Control+2
-  bind[firefox] = MOD+Control+3
-  bind[emacs-anywhere] = MOD+Control+4
+  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
 #+end_src
-**** Quirks
+*** Quirks
+Float some specific programs by default.
 #+begin_src conf :tangle ~/.spectrwm.conf
   quirk[Castle Menu] = FLOAT
   quirk[momen] = FLOAT
 #+end_src
 ** Ash
 *** Options
+Use the vi editing mode. I still haven't found a good way to show visual feedback of the current mode. Ideally the cursor would change to a beam when in insert mode, and a box when in normal mode.
 #+begin_src conf :tangle ~/.config/ash/ashrc
   set -o vi
 #+end_src
 *** Functions
-**** Update all packages
-#+begin_src shell :tangle ~/.config/ash/ashrc
-  color=$(tput setaf 5)
-  reset=$(tput sgr0)
-
-  apu() {
-      doas echo "${color}== upgrading with yay ==${reset}"
-      yay
-      echo ""
-      echo "${color}== checking for pacnew files ==${reset}"
-      doas pacdiff
-      echo
-      echo "${color}== upgrading flatpaks ==${reset}"
-      flatpak update
-      echo ""
-      echo "${color}== upgrading zsh plugins ==${reset}"
-      zpe-pull
-      echo ""
-      echo "${color}== updating nvim plugins ==${reset}"
-      nvim +PlugUpdate +PlugUpgrade +qall
-      echo "Updated nvim plugins"
-      echo ""
-      echo "${color}You are entirely up to date!${reset}"
-  }
-#+end_src
-**** Clean all packages
-#+begin_src shell :tangle ~/.config/ash/ashrc
-  apap() {
-      doas echo "${color}== cleaning pacman orphans ==${reset}"
-      (pacman -Qtdq | doas pacman -Rns - 2> /dev/null) || echo "No orphans"
-      echo ""
-      echo "${color}== cleaning flatpaks ==${reset}"
-      flatpak remove --unused
-      echo ""
-      echo "${color}== cleaning zsh plugins ==${reset}"
-      zpe-clean
-      echo ""
-      echo "${color}== cleaning nvim plugins ==${reset}"
-      nvim +PlugClean +qall
-      echo "Cleaned nvim plugins"
-      echo ""
-      echo "${color}All orphans cleaned!${reset}"
-  }
-#+end_src
-**** Interact with 0x0
-#+begin_src shell :tangle ~/.config/ash/ashrc
-  zxz="https://envs.sh"
-  ufile() { curl -F"file=@$1" "$zxz" ; }
-  upb() { curl -F"file=@-;" "$zxz" ; }
-  uurl() { curl -F"url=$1" "$zxz" ; }
-  ushort() { curl -F"shorten=$1" "$zxz" ; }
-  uclip() { xclip -out | curl -F"file=@-;" "$zxz" ; }
-#+end_src
 **** Finger
 #+begin_src shell :tangle ~/.config/ash/ashrc
   finger() {
       user=$(echo "$1" | cut -f 1 -d '@')
       host=$(echo "$1" | cut -f 2 -d '@')
-      echo $user | nc "$host" 79 -N
+      echo $user | nc "$host" 79
   }
 #+end_src
 **** Upload to ftp.armaanb.net
 #+begin_src shell :tangle ~/.config/ash/ashrc
-  pubup() {
-      rsync "$1" "root@armaanb.net:/var/ftp/pub/${2}"
-      echo "https://ftp.armaanb.net/pub/"$(basename "$1") | tee /dev/tty | xclip -sel c
+  _uprint() {
+      echo "https://l.armaanb.net/$(basename "$1")" | tee /dev/tty | xclip -sel c
+  }
+
+  _uup() {
+      rsync "$1" "root@armaanb.net:/var/ftp/pub/$2" --chmod 644
+  }
+
+  ufile() {
+      _uup "$1" "$2"
+      _uprint "$1"
+  }
+
+  uclip() {
+      tmp=$(mktemp)
+      xclip -o -sel c >> "$tmp"
+      basetmp=$(echo "$tmp" | tail -c +5)
+      _uup "$tmp" "$basetmp"
+      _uprint "$basetmp"
+      rm -f "$tmp"
   }
 #+end_src
 *** Exports
@@ -852,12 +898,15 @@ No more clogging up init.el.
   export LC_CTYPE="en_US.UTF-8"
   export LANGUAGE="en_US.UTF-8"
 
+  export CDPATH=:~
+
   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 PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig"
 #+end_src
 *** Aliases
 **** SSH
@@ -874,32 +923,25 @@ No more clogging up init.el.
 #+end_src
 **** File management
 #+begin_src shell :tangle ~/.config/ash/ashrc
-  alias ls='exa -lh --icons --git --group-directories-first'
-  alias la='exa -lha --icons --git --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 free='free -h'
+  alias free='free -m'
   alias cp='cp -riv'
   alias rm='rm -iv'
   alias mv='mv -iv'
-  alias ln='ln -iv'
-  alias grep='grep -in --exclude-dir=.git --color=auto'
-  alias fname='find -name'
+  alias ln='ln -v'
+  alias grep='grep -in'
   alias mkdir='mkdir -pv'
-  alias unar='atool -x'
-  alias wget='wget -e robots=off'
-  alias lanex='~/.local/share/lxc/lxc'
-  alias vim=$EDITOR
-  alias emacs=$EDITOR
+  alias lanex='java -jar ~/.local/share/lxc/lanxchange.jar'
+  emacs() { $EDITOR "$@" & }
+  alias vim="emacs"
 #+end_src
 **** System management
 #+begin_src shell :tangle ~/.config/ash/ashrc
-  alias jctl='journalctl -p 3 -xb'
-  alias pkill='pkill -i'
-  alias cx='chmod +x'
-  alias redoas='doas $(fc -ln -1)'
   alias crontab='crontab-argh'
-  alias sudo='doas ' # allows aliases to be run with doas
+  alias sudo='doas'
   alias pasu='git -C ~/.password-store push'
   alias yadu='yadm add -u && yadm commit -m "Updated `date -Iseconds`" && \
     yadm push'
@@ -907,36 +949,18 @@ No more clogging up init.el.
 **** Networking
 #+begin_src shell :tangle ~/.config/ash/ashrc
   alias ping='ping -c 10'
-  alias speed='speedtest-cli'
-  alias ip='ip --color=auto'
-  alias cip='curl https://armaanb.net/ip'
   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" && \
-        TT=$(mktemp) && \
-        head -n -2 $T > $TT && \
-        vim $TT && \
-        echo "\nLast updated: $(date -R)" >> "$TT" && \
-        fold -sw 72 "$TT" > "$T"| \
-        rsync "$T" root@armaanb.net:/etc/finger/plan.txt'
-  alias wttr='curl -s "wttr.in/02445?n" | head -n -3'
-#+end_src
-**** Other
-#+begin_src shell :tangle ~/.config/ash/ashrc
-  alias bigrandomfile='dd if=/dev/urandom of=1GB-urandom bs=1M count=1024 \
-    iflag=fullblock status=progress'
-  alias bigboringfile='dd if=/dev/zero of=1GB-zero bs=1M count=1024 \
-    iflag=fullblock status=progress'
-  alias ts='gen-shell -c task'
-  alias ts='gen-shell -c task'
-  alias tetris='autoload -Uz tetriscurses && tetriscurses'
-  alias news='newsboat'
-  alias tilderadio="\mpv https://radio.tildeverse.org/radio/8000/radio.ogg"
-  alias ytmusic="youtube-dl -x --add-metadata  --audio-format aac \
-    --restrict-filenames -o '%(title)s.%(ext)s'"
-  alias cal="cal -3 --color=auto"
-  alias bc='bc -l'
+          rsync root@armaanb.net:/etc/finger/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"| \
+          rsync "$T" root@armaanb.net:/etc/finger/plan.txt && \
+          rm -f "$T"'
 #+end_src
 **** Virtual machines, chroots
 #+begin_src shell :tangle ~/.config/ash/ashrc
@@ -954,143 +978,20 @@ No more clogging up init.el.
     -net user,smb=/home/armaa/Public \
     -drive format=qcow2,file=/home/armaa/Virtual/windows.qcow2'
 #+end_src
-**** Python
-#+begin_src shell :tangle ~/.config/ash/ashrc
-  alias ipy="ipython"
-  alias zpy="zconda && ipython"
-  alias math="ipython --profile=math"
-  alias pypi="python setup.py sdist && twine upload dist/*"
-  alias pip="python -m pip"
-  alias black="black -l 79"
-#+end_src
 **** Latin
 #+begin_src shell :tangle ~/.config/ash/ashrc
   alias words='gen-shell -c "words"'
   alias words-e='gen-shell -c "words ~E"'
 #+end_src
-**** Devour
-#+begin_src shell :tangle ~/.config/ash/ashrc
-  alias zathura='devour zathura'
-  alias mpv='devour mpv'
-  alias sql='devour sqlitebrowser'
-  alias cad='devour openscad'
-  alias feh='devour feh'
-#+end_src
-**** Package management (Pacman)
-#+begin_src shell :tangle ~/.config/ash/ashrc
-  alias aps='yay -Ss'
-  alias api='yay -Syu'
-  alias apii='doas pacman -S'
-  alias app='yay -Rns'
-  alias apc='yay -Sc'
-  alias apo='yay -Qttd'
-  alias azf='pacman -Q | fzf'
-  alias favorites='pacman -Qe | cut -d " " -f 1 > ~/Documents/favorites'
-  alias ufetch='ufetch-arch'
-  alias reflect='reflector --verbose --sort rate --save \
-     ~/.local/etc/pacman.d/mirrorlist --download-timeout 60' # Takes ~45m to run
-#+end_src
-**** Package management (KISS)
+**** Other
 #+begin_src shell :tangle ~/.config/ash/ashrc
-  alias kzf="kiss s \* | xargs -l basename | \
-    fzf --preview 'kiss search {} | xargs -l dirname'"
-#+end_src
-** Alacritty
-*** Appearance
-#+begin_src yml :tangle ~/.config/alacritty/alacritty.yml
-font:
-  normal:
-    family: JetBrains Mono Nerd Font
-    style: Medium
-  italic:
-    style: Italic
-  Bold:
-    style: Bold
-  size: 7
-  ligatures: true # Requires ligature patch
-
-window:
-  padding:
-    x: 5
-    y: 5
-
-background_opacity: 1
-#+end_src
-*** Color scheme
-Modus vivendi. Source: https://github.com/ishan9299/Nixos/blob/d4bbb7536be95b59466bb9cca4d671be46e04e81/user/alacritty/alacritty.yml#L30-L118
-#+begin_src yml :tangle ~/.config/alacritty/alacritty.yml
-colors:
-  # Default colors
-  primary:
-    background: '#000000'
-    foreground: '#ffffff'
-
-  cursor:
-    text: '#000000'
-    background: '#ffffff'
-
-  # Normal colors (except green it is from intense colors)
-  normal:
-    black:   '#000000'
-    red:     '#ff8059'
-    green:   '#00fc50'
-    yellow:  '#eecc00'
-    blue:    '#29aeff'
-    magenta: '#feacd0'
-    cyan:    '#00d3d0'
-    white:   '#eeeeee'
-
-  # Bright colors [all the faint colors in the modus theme]
-  bright:
-    black:   '#555555'
-    red:     '#ffa0a0'
-    green:   '#88cf88'
-    yellow:  '#d2b580'
-    blue:    '#92baff'
-    magenta: '#e0b2d6'
-    cyan:    '#a0bfdf'
-    white:   '#ffffff'
-
-  # dim [all the intense colors in modus theme]
-  dim:
-    black:   '#222222'
-    red:     '#fb6859'
-    green:   '#00fc50'
-    yellow:  '#ffdd00'
-    blue:    '#00a2ff'
-    magenta: '#ff8bd4'
-    cyan:    '#30ffc0'
-    white:   '#dddddd'
-#+end_src
-** IPython
-*** General
-Symlink profile_default/ipython_config.py to profile_math/ipython_config.py
-#+begin_src python :tangle ~/.ipython/profile_default/ipython_config.py
-  c.TerminalInteractiveShell.editing_mode = 'vi'
-  c.InteractiveShell.colors = 'linux'
-  c.TerminalInteractiveShell.confirm_exit = False
-#+end_src
-*** Math
-#+begin_src python :tangle ~/.ipython/profile_math/startup.py
-  from math import *
-
-  def deg(x):
-      return x * (180 /  pi)
-
-  def rad(x):
-      return x * (pi / 180)
-
-  def rad(x, unit):
-      return (x * (pi / 180)) / unit
-
-  def csc(x):
-      return 1 / sin(x)
-
-  def sec(x):
-      return 1 / cos(x)
-
-  def cot(x):
-      return 1 / tan(x)
+  alias bigrandomfile='dd if=/dev/urandom of=1GB-urandom bs=1M count=1024 \
+    iflag=fullblock'
+  alias bigboringfile='dd if=/dev/zero of=1GB-zero bs=1M count=1024 \
+    iflag=fullblock'
+  alias ytmusic="youtube-dl -x --add-metadata  --audio-format aac \
+    --restrict-filenames -o '%(title)s.%(ext)s'"
+  alias bc='bc -l'
 #+end_src
 ** MPV
 Make MPV play a little bit smoother.
@@ -1099,7 +1000,7 @@ Make MPV play a little bit smoother.
   hwdec=auto-copy
 #+end_src
 ** Inputrc
-For any GNU Readline programs
+This file is used for any GNU Readline programs. I use Emacs editing mode mostly because of one annoyance which is that to clear the screen using ^L, you have to be in normal mode which is a pain. If there is a way to rebind this, I'd love to know!.
 #+begin_src conf :tangle ~/.inputrc
   set editing-mode emacs
 #+end_src
@@ -1130,7 +1031,7 @@ For any GNU Readline programs
   smtpserverport = 465
   confirm = auto
 #+end_src
-*** Submodules
+*** Submodule
 #+begin_src conf :tangle ~/.gitconfig
   [submodule]
   recurse = true
@@ -1150,14 +1051,14 @@ For any GNU Readline programs
   loc = diff --stat 4b825dc642cb6eb9a060e54bf8d69288fbee4904 # Empty hash
   pushnc = push -o skip-ci
 #+end_src
-*** Commits
+*** Commit
 #+begin_src conf :tangle ~/.gitconfig
   [commit]
   gpgsign = true
   verbose = true
 #+end_src
 ** Dunst
-Lightweight notification daemon.
+Lightweight notification daemon. Eventually I'd like to replace this with something dbus-less.
 *** General
 #+begin_src conf :tangle ~/.config/dunst/dunstrc
   [global]
@@ -1214,6 +1115,7 @@ Lightweight notification daemon.
   timeout = 0
 #+end_src
 ** Zathura
+The best document reader!
 *** Options
 #+begin_src conf :tangle ~/.config/zathura/zathurarc
   map <C-i> recolor
@@ -1237,6 +1139,7 @@ Lightweight notification daemon.
   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 {
@@ -1261,7 +1164,8 @@ Lightweight notification daemon.
       transition: 0.1s margin-top ease-out;
   }
 #+end_src
-** Black screen by default
+*** Black screen by default
+userChrome.css:
 #+begin_src css :tangle ~/.mozilla/firefox/armaan-release/chrome/userChrome.css
   #main-window,
   #browser,
@@ -1276,6 +1180,8 @@ Lightweight notification daemon.
       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 {
@@ -1284,8 +1190,7 @@ Lightweight notification daemon.
   }
 #+end_src
 ** Xresources
-*** Color scheme
-Modus operandi.
+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
   ! special
   ,*.foreground:   #ffffff
@@ -1324,20 +1229,26 @@ Modus operandi.
   ,*.color7:       #eeeeee
   ,*.color15:      #dddddd
 #+end_src
-*** Copy paste
-#+begin_src conf :tangle ~/.Xresources
-  xterm*VT100.Translations: #override \
-  Shift <KeyPress> Insert: insert-selection(CLIPBOARD) \n\
-  Ctrl Shift <Key>V:    insert-selection(CLIPBOARD) \n\
-  Ctrl Shift <Key>C:    copy-selection(CLIPBOARD) \n\
-  Ctrl <Btn1Up>: exec-formatted("xdg-open '%t'", PRIMARY)
+** Tmux
+I use tmux in order to keep my st build light. Still learning how it works.
+#+begin_src conf :tangle ~/.tmux.conf
+  set -g status off
+  set -g mouse on
+  set-option -g history-limit 50000
+  set-window-option -g mode-keys vi
+  bind-key -T copy-mode-vi 'v' send -X begin-selection
+  bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel 'xclip -in -selection clipboard'
 #+end_src
-*** Blink cursor
-#+begin_src conf :tangle ~/.Xresources
-  xterm*cursorBlink: true
-#+end_src
-*** Alt keys
-#+begin_src conf :tangle ~/.Xresources
-  XTerm*eightBitInput:   false
-  XTerm*eightBitOutput:  true
+** GPG
+*** Config
+#+begin_src conf :tangle ~/.gnupg/gpg.conf
+  default-key 3C9ED82FFE788E4A
+  use-agent
+#+end_src
+*** Agent
+#+begin_src conf :tangle ~/.gnupg/gpg-agent.conf
+  pinentry-program /sbin/pinentry-gnome3
+  max-cache-ttl 600
+  default-cache-ttl 600
+  allow-emacs-pinentry
 #+end_src