Switch modus-themes to using use-package

[config.org.git] / config.org

diff --git a/config.org b/config.org
index bf1da2888d7ef707a921294e8b4cf74bc0288f2f..43e7c29798be8cb222aa6931e5a1a4cf191126f6 100644 (file)
--- a/config.org
+++ b/config.org
@@ -13,21 +13,13 @@ I chose to create a powerful, yet not overly heavy Emacs configuration. Things l
 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.
 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

-** Emacs 28 fix
-This is temporary until some stuff gets fixed upstream
-#+begin_src emacs-lisp
-  (setq straight-repository-branch "develop")
-  (setq straight-disable-native-compile t)
-#+end_src

 ** 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
 ** 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))
   (defvar bootstrap-version)
   (let ((bootstrap-file
          (expand-file-name "straight/repos/straight.el/bootstrap.el" user-emacs-directory))


@@ -50,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


@@ -125,13 +119,6 @@ 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
   (setq display-fill-column-indicator-column 80)
   (global-display-fill-column-indicator-mode)
 #+end_src

-** Keybinding hints
-When starting a key chord, show possible future steps after 0.3 seconds.
-#+begin_src emacs-lisp
-  (use-package which-key
-    :config (which-key-mode)
-    :custom (which-key-idle-delay 0.3))
-#+end_src

 ** Highlight todo items in comments
 #+begin_src emacs-lisp
   (use-package hl-todo
 ** Highlight todo items in comments
 #+begin_src emacs-lisp
   (use-package hl-todo


@@ -143,16 +130,29 @@ When starting a key chord, show possible future steps after 0.3 seconds.
   (blink-cursor-mode)
 #+end_src
 ** Visual line mode
   (blink-cursor-mode)
 #+end_src
 ** Visual line mode

-Soft wrap words and do operations by visual lines except in programming modes.
+Soft wrap words and do operations by visual lines in some modes.
+#+begin_src emacs-lisp
+  (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
 #+begin_src emacs-lisp

-  (visual-line-mode 1)
-  (add-hook 'prog-mode-hook 'visual-line-mode 0)
+  (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
 #+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
 #+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


@@ -240,7 +240,10 @@ Add back C-a/C-x bindings.
     (org-startup-indented t)
     (org-hide-emphasis-markers t)
     (org-fontify-whole-block-delimiter-line nil)
     (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.
 #+end_src
 ** Tempo
 Define templates for lots of common structure elements. Mostly just used within this file.


@@ -249,31 +252,31 @@ 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

-    ;; 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 '("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"))
-    (add-to-list 'org-structure-template-alist '("tm" . "src conf :tangle ~/.tmux.conf"))
-    (add-to-list 'org-structure-template-alist '("gp" . "src conf :tangle ~/.gnupg/gpg.conf"))
-    (add-to-list 'org-structure-template-alist '("ag" . "src conf :tangle ~/.gnupg/gpg-agent.conf")))
+    (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")
+                        ("xm" . "src conf :tangle ~/.config/xmodmap")))
+      (add-to-list 'org-structure-template-alist addition)))

 #+end_src
 * Autocompletion
 ** Ivy
 A well balanced completion framework.
 #+begin_src emacs-lisp
   (use-package ivy
 #+end_src
 * Autocompletion
 ** Ivy
 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
            ("M-d" . ivy-switch-buffer-kill))
     :config (ivy-mode))
 #+end_src


@@ -287,49 +290,34 @@ 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)
-           :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
     :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
     :config
     (prescient-persist-mode)
     (ivy-prescient-mode))
 #+end_src

-** Swiper
-Better search utility.
-#+begin_src emacs-lisp
-  (use-package swiper)
-#+end_src

 * Emacs OS
 ** RSS
 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))
 * Emacs OS
 ** RSS
 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)))
     :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.
 #+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.
 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))
 #+begin_src emacs-lisp
   (use-package smtpmail
     :straight (:type built-in))


@@ -350,7 +338,7 @@ Contexts are a not very well known feature of mu4e that makes it super easy to m
           mu4e-confirm-quit nil
           mu4e-view-use-gnus t
           mail-user-agent 'mu4e-user-agent
           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"


@@ -388,22 +376,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)
                          :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
            (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")
     (add-to-list 'mm-discouraged-alternatives "text/richtext"))
 #+end_src
 ** Default browser
 #+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 which should open in MPV.
+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)
 #+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
     (start-process "mpv" "*mpv*" "mpv" url))
 
   (setq browse-url-handlers


@@ -412,6 +399,9 @@ Set EWW as default browser except for videos which should open in MPV.
           ("peertube.*" . browse-url-mpv)
           ("vid.*" . browse-url-mpv)
           ("vid.*" . browse-url-mpv)
           ("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
           ("." . eww-browse-url)
           )))
 #+end_src


@@ -483,12 +473,21 @@ Circe is a really nice IRC client that claims to be above RCIRC and below ERC in
                                     :pass (lambda (null) (fetch-password
                                                           :login "emacs"
                                                           :machine "irc.armaanb.net"
                                     :pass (lambda (null) (fetch-password
                                                           :login "emacs"
                                                           :machine "irc.armaanb.net"

-                                                          :port 6696)))
-                                   (circe "libera")
-                                   (circe "oftc")
-                                   (circe "tilde")))
+                                                          :port 6696)))))

     :custom (circe-default-part-message "goodbye!")
     :bind (:map circe-mode-map ("C-c C-r" . circe-reconnect-all)))
     :custom (circe-default-part-message "goodbye!")
     :bind (:map circe-mode-map ("C-c C-r" . circe-reconnect-all)))

+
+  (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 i") 'acheam-irc)

 #+end_src
 ** 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.
 #+end_src
 ** 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.


@@ -496,7 +495,7 @@ Still experimenting with this setup. Not sure if I will keep it, but it works we
   (defun sync-calendar ()
     "Sync calendars with vdirsyncer"
     (interactive)
   (defun sync-calendar ()
     "Sync calendars with vdirsyncer"
     (interactive)

-    (shell-command "vdirsyncer -vcritical sync"))
+    (async-shell-command "vdirsyncer sync"))

 
   (use-package calfw
     :bind (:map cfw:calendar-mode-map ("C-S-u" . sync-calendar)))
 
   (use-package calfw
     :bind (:map cfw:calendar-mode-map ("C-S-u" . sync-calendar)))


@@ -525,6 +524,11 @@ Still experimenting with this setup. Not sure if I will keep it, but it works we
 
   (global-set-key (kbd "C-c c") 'acheam-calendar)
 #+end_src
 
   (global-set-key (kbd "C-c c") 'acheam-calendar)
 #+end_src

+** PDF reader
+#+begin_src emacs-lisp
+  (use-package pdf-tools
+    :hook (pdf-view-mode . pdf-view-midnight-minor-mode))
+#+end_src

 * Emacs IDE
 ** Python formatting
 #+begin_src emacs-lisp
 * Emacs IDE
 ** Python formatting
 #+begin_src emacs-lisp


@@ -588,7 +592,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)


@@ -610,7 +613,9 @@ Automatically indent after every change. I'm not sure how much I like this. It s
 ** 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))))


@@ -665,6 +670,17 @@ Abbreviate things! I just use this for things like my email address and copyrigh
 
     (global-set-key (kbd "C-x C-r") #'doas-edit)
 #+end_src
 
     (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
 #+begin_src emacs-lisp
 * Keybindings
 ** Switch windows
 #+begin_src emacs-lisp


@@ -728,13 +744,15 @@ 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

+  (midnight-mode)

   (add-to-list 'clean-buffer-list-kill-never-regexps (lambda (buffer-name)
                                                        (with-current-buffer buffer-name
                                                          (derived-mode-p 'lui-mode))))
   (add-to-list 'clean-buffer-list-kill-never-regexps (lambda (buffer-name)
                                                        (with-current-buffer buffer-name
                                                          (derived-mode-p 'lui-mode))))

-  (midnight-mode)

 #+end_src
 * Tangles
 ** Spectrwm
 #+end_src
 * Tangles
 ** Spectrwm


@@ -798,8 +816,8 @@ 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[irc] = emacsclient -ce '(switch-to-buffer "irc.armaanb.net:6698")'
+  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[rss] = emacsclient -ce '(elfeed)'
   program[calendar] = emacsclient -ce '(acheam-calendar)'
   program[calc] = emacsclient -ce '(progn (calc) (windmove-up) (delete-window))'


@@ -827,53 +845,6 @@ Use the vi editing mode. I still haven't found a good way to show visual feedbac
   set -o vi
 #+end_src
 *** Functions
   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}== 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 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() {
 **** Finger
 #+begin_src shell :tangle ~/.config/ash/ashrc
   finger() {


@@ -884,9 +855,26 @@ Use the vi editing mode. I still haven't found a good way to show visual feedbac
 #+end_src
 **** Upload to ftp.armaanb.net
 #+begin_src shell :tangle ~/.config/ash/ashrc
 #+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
   }
 #+end_src
 *** Exports


@@ -913,12 +901,15 @@ Use the vi editing mode. I still haven't found a good way to show visual feedbac
   export LC_CTYPE="en_US.UTF-8"
   export LANGUAGE="en_US.UTF-8"
 
   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 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
 #+end_src
 *** Aliases
 **** SSH


@@ -935,16 +926,16 @@ 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'

-  alias free='free -h'
+  alias free='free -m'

   alias cp='cp -riv'
   alias rm='rm -iv'
   alias mv='mv -iv'
   alias ln='ln -v'
   alias cp='cp -riv'
   alias rm='rm -iv'
   alias mv='mv -iv'
   alias ln='ln -v'

-  alias grep='grep -in --color=auto'
+  alias grep='grep -in'

   alias mkdir='mkdir -pv'
   alias lanex='java -jar ~/.local/share/lxc/lanxchange.jar'
   emacs() { $EDITOR "$@" & }
   alias mkdir='mkdir -pv'
   alias lanex='java -jar ~/.local/share/lxc/lanxchange.jar'
   emacs() { $EDITOR "$@" & }


@@ -964,13 +955,15 @@ 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" && \
-        TT=$(mktemp) && \
-        head -n -2 $T > $TT && \
-        /bin/nvim $TT && \
-        echo "\nLast updated: $(date -R)" >> "$TT" && \
-        fold -sw 72 "$TT" > "$T"| \
-        rsync "$T" root@armaanb.net:/etc/finger/plan.txt'
+          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
 #+end_src
 **** Virtual machines, chroots
 #+begin_src shell :tangle ~/.config/ash/ashrc


@@ -988,48 +981,21 @@ Use the vi editing mode. I still haven't found a good way to show visual feedbac
     -net user,smb=/home/armaa/Public \
     -drive format=qcow2,file=/home/armaa/Virtual/windows.qcow2'
 #+end_src
     -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 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
 **** 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 cad='devour openscad'
-  alias feh='devour feh'
-#+end_src
-**** 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 azf='pacman -Q | fzf'
-  alias favorites='pacman -Qe | cut -d " " -f 1 > ~/Documents/favorites'
-#+end_src

 **** Other
 #+begin_src shell :tangle ~/.config/ash/ashrc
   alias bigrandomfile='dd if=/dev/urandom of=1GB-urandom bs=1M count=1024 \
 **** 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'
+    iflag=fullblock'

   alias bigboringfile='dd if=/dev/zero of=1GB-zero bs=1M count=1024 \
   alias bigboringfile='dd if=/dev/zero of=1GB-zero bs=1M count=1024 \

-    iflag=fullblock status=progress'
+    iflag=fullblock'

   alias ytmusic="youtube-dl -x --add-metadata  --audio-format aac \
     --restrict-filenames -o '%(title)s.%(ext)s'"
   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'
 #+end_src
   alias bc='bc -l'
 #+end_src

-** IPython
-#+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

 ** MPV
 Make MPV play a little bit smoother.
 #+begin_src conf :tangle ~/.config/mpv/mpv.conf
 ** MPV
 Make MPV play a little bit smoother.
 #+begin_src conf :tangle ~/.config/mpv/mpv.conf


@@ -1289,3 +1255,28 @@ I use tmux in order to keep my st build light. Still learning how it works.
   default-cache-ttl 600
   allow-emacs-pinentry
 #+end_src
   default-cache-ttl 600
   allow-emacs-pinentry
 #+end_src

+** Xmodmap
+#+begin_src conf :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