sx: move autostart into dwm config

[config.org.git] / config.org

diff --git a/config.org b/config.org
index 610d0c7e154de5ebc52d10b4d5e1b34d661da655..96b81d868b5c9be8e3c68295bd707e000b27d084 100644 (file)
--- a/config.org
+++ b/config.org
@@ -6,7 +6,7 @@
 * 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.
 
 ** 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.
 


@@ -55,7 +55,7 @@ Use the Modus Operandi theme by Protesilaos Stavrou. Its the best theme for Emac
 *** Font
 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
 *** Font
 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"))
+  (add-to-list 'default-frame-alist '(font . "JetBrainsMonoNF-11"))

 #+end_src
 *** Ligatures
 #+begin_src emacs-lisp
 #+end_src
 *** Ligatures
 #+begin_src emacs-lisp


@@ -76,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.


@@ -122,7 +123,7 @@ Highlight whitespace and other bad text practices.
     (add-hook hook (lambda () (whitespace-mode 1))))
 #+end_src
 ** Highlight todo items in comments
     (add-hook hook (lambda () (whitespace-mode 1))))
 #+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))


@@ -149,8 +150,12 @@ Soft wrap words and do operations by visual lines in some modes.
 ** Display number of matches in search
 #+begin_src emacs-lisp
   (use-package anzu
 ** Display number of matches in search
 #+begin_src emacs-lisp
   (use-package anzu

+    :after (evil)

     :config (global-anzu-mode)
     :bind
     :config (global-anzu-mode)
     :bind

+    ([remap isearch-forward] . isearch-forward-regexp)
+    ([remap isearch-backward] . isearch-backward-regexp)
+    ([remap query-replace] . anzu-query-replace)

     ([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


@@ -163,18 +168,35 @@ Invert modeline color instead of audible bell or the standard visual bell.
         (lambda () (invert-face 'mode-line)
           (run-with-timer 0.1 nil #'invert-face 'mode-line)))
 #+end_src
         (lambda () (invert-face 'mode-line)
           (run-with-timer 0.1 nil #'invert-face 'mode-line)))
 #+end_src

+** GUI
+#+begin_src emacs-lisp
+  (scroll-bar-mode -1)
+  (tool-bar-mode -1)
+  (menu-bar-mode -1)
+  (setq-default frame-title-format '("%b [%m]"))
+#+end_src
+** auth-source
+#+begin_src emacs-lisp
+  (setq auth-sources '("~/.emacs.d/authinfo.gpg"))
+#+end_src

 * Evil mode
 ** General
 #+begin_src emacs-lisp
   (use-package evil
     :custom (select-enable-clipboard nil)
 * Evil mode
 ** General
 #+begin_src emacs-lisp
   (use-package evil
     :custom (select-enable-clipboard nil)

+    :init (setq evil-want-keybinding nil
+                evil-want-minibuffer t
+                evil-want-C-d-scroll t
+                evil-want-C-u-scroll t)

     :config
     (evil-mode)
     (fset 'evil-visual-update-x-selection 'ignore) ;; Keep clipboard and register seperate
     ;; Use visual line motions even outside of visual-line-mode buffers
     (evil-global-set-key 'motion "j" 'evil-next-visual-line)
     (evil-global-set-key 'motion "k" 'evil-previous-visual-line)
     :config
     (evil-mode)
     (fset 'evil-visual-update-x-selection 'ignore) ;; Keep clipboard and register seperate
     ;; Use visual line motions even outside of visual-line-mode buffers
     (evil-global-set-key 'motion "j" 'evil-next-visual-line)
     (evil-global-set-key 'motion "k" 'evil-previous-visual-line)

-    (global-set-key (kbd "<escape>") 'keyboard-escape-quit))
+    :bind
+    ("<escape>" . keyboard-escape-quit)
+    ("C-M-u" . universal-argument))

 #+end_src
 ** Evil collection
 Evil bindings for tons of packages.
 #+end_src
 ** Evil collection
 Evil bindings for tons of packages.


@@ -201,7 +223,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.


@@ -234,7 +260,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)


@@ -254,18 +280,14 @@ 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 '(

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

-                        ("pi" . "src conf :tangle ~/.config/picom/picom.conf")
-                        ("git" . "src conf :tangle ~/.gitconfig")
+                        ("el" . "src emacs-lisp")
+                        ("git" . "src conf :tangle ~/.config/git/config")
+                        ("mb" . "src conf :tangle ~/.config/mbsync/mbsyncrc")
+                        ("tm" . "src conf :tangle ~/.config/tmux/f")

                         ("za" . "src conf :tangle ~/.config/zathura/zathurarc")
                         ("za" . "src conf :tangle ~/.config/zathura/zathurarc")

-                        ("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
       (add-to-list 'org-structure-template-alist addition)))
 #+end_src
 * Autocompletion


@@ -307,16 +329,63 @@ Use elfeed for reading RSS. I have another file with all the feeds in it that I'
   (use-package elfeed
     :bind (("C-c e" . elfeed))
     :config (load "~/.emacs.d/feeds.el")
   (use-package elfeed
     :bind (("C-c e" . elfeed))
     :config (load "~/.emacs.d/feeds.el")

+    :custom (elfeed-db-directory "~/.emacs.d/elfeed")

     :bind (:map elfeed-search-mode-map ("C-c C-o" . 'elfeed-show-visit)))
 #+end_src
 ** Email
     :bind (:map elfeed-search-mode-map ("C-c C-o" . 'elfeed-show-visit)))
 #+end_src
 ** Email

-Use mu4e for reading emails.
+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.

-*** 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
+*** mbsync
+**** General
+#+begin_src conf :tangle ~/.config/mbsync/mbsyncrc
+  Create Near
+  Expunge Both
+  SyncState *
+#+end_src
+**** Personal
+#+begin_src conf :tangle ~/.config/mbsync/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 ~/.config/mbsync/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]*
+
+  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))


@@ -330,7 +399,7 @@ 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 -c ~/.config/mbsync/mbsyncrc"

           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
           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


@@ -372,13 +441,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)
            (message-send-hook . (lambda () (unless (yes-or-no-p "Ya sure 'bout that?")
                                              (signal 'quit nil))))))
 #+end_src
                          :key ?b))
     :hook ((mu4e-compose-mode . flyspell-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
+**** 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")


@@ -553,12 +622,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 "~/src")
-      (setq projectile-project-search-path '("~/src")))
-    (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


@@ -570,10 +635,12 @@ The best file manager!
   (use-package dired
     :straight (:type built-in)
     :commands (dired dired-jump)
   (use-package dired
     :straight (:type built-in)
     :commands (dired dired-jump)

-    :custom ((dired-listing-switches "-agho --group-directories-first"))
-    :config (evil-collection-define-key 'normal 'dired-mode-map
-              "h" 'dired-single-up-directory
-              "l" 'dired-single-buffer))
+    :custom (dired-listing-switches "-agh --group-directories-first")
+    :bind
+    ([remap dired-find-file] . dired-single-buffer)
+    ([remap dired-mouse-find-file-other-window] . dired-single-buffer-mouse)
+    ([remap dired-up-directory] . dired-single-up-directory)
+    ("C-x C-j" . dired-jump))

 
   (use-package dired-single
     :commands (dired dired-jump))
 
   (use-package dired-single
     :commands (dired dired-jump))


@@ -585,10 +652,14 @@ The best file manager!
 
   (use-package dired-hide-dotfiles
     :hook (dired-mode . dired-hide-dotfiles-mode)
 
   (use-package dired-hide-dotfiles
     :hook (dired-mode . dired-hide-dotfiles-mode)

-    :config
-    (evil-collection-define-key 'normal 'dired-mode-map
+    :config (evil-collection-define-key 'normal 'dired-mode-map

       "H" 'dired-hide-dotfiles-mode))
 #+end_src
       "H" 'dired-hide-dotfiles-mode))
 #+end_src

+** Man
+#+begin_src emacs-lisp
+  (use-package man
+    :bind ("C-c t" . man))
+#+end_src

 ** Git
 *** Magit
 A very good Git interface.
 ** Git
 *** Magit
 A very good Git interface.


@@ -598,17 +669,32 @@ A very good Git interface.
 *** Email
 #+begin_src emacs-lisp
   (use-package piem)
 *** Email
 #+begin_src emacs-lisp
   (use-package piem)

-  (use-package git-email
-    :straight (git-email :repo "https://git.sr.ht/~yoctocell/git-email")
-    :config (git-email-piem-mode))
+  ;; (use-package git-email
+  ;;   :straight (git-email :repo "https://git.sr.ht/~yoctocell/git-email")
+  ;;   :config (git-email-piem-mode))

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


@@ -656,9 +742,8 @@ Abbreviate things! I just use this for things like my email address and copyrigh
   (defun doas-edit (&optional arg)
     "Edit currently visited file as root.
 
   (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.
+    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")
 
     Modified from Emacs Redux."
     (interactive "P")


@@ -749,92 +834,12 @@ Similar to the ufile alias in my ashrc
 Automatically close unused buffers (except those of Circe) at midnight.
 #+begin_src emacs-lisp
   (midnight-mode)
 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))))

 #+end_src
 * Tangles
 #+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
-  warp_pointer = 1
-  modkey = Mod4
-  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.
-#+begin_src conf :tangle ~/.spectrwm.conf
-  bar_enabled = 0
-  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] = st -e tmux
-  program[screenshot_all] = flameshot gui
-  program[notif] = /home/armaa/src/bin/setter status
-  program[pass] = /home/armaa/src/bin/passmenu
-
-  bind[notif] = MOD+n
-  bind[pass] = MOD+Shift+p
-#+end_src
-**** Media keys
-#+begin_src conf :tangle ~/.spectrwm.conf
-  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%-
-  program[next] = playerctl next
-  program[prev] = playerctl previous
-  program[pause] = playerctl play-pause
-
-  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
-  program[h] = xdotool keyup h key --clearmodifiers Left
-  program[j] = xdotool keyup j key --clearmodifiers Down
-  program[k] = xdotool keyup k key --clearmodifiers Up
-  program[l] = xdotool keyup l key --clearmodifiers Right
-
-  bind[h] = MOD + Control + h
-  bind[j] = MOD + Control + j
-  bind[k] = MOD + Control + k
-  bind[l] = MOD + Control + l
-#+end_src
-**** Programs
-#+begin_src conf :tangle ~/.spectrwm.conf
-  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[emacs] = emacsclient -c
-
-  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[emacs] = MOD+Control+Return
-#+end_src
-*** 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.
 ** 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.


@@ -857,7 +862,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() {


@@ -875,43 +880,76 @@ Use the vi editing mode. I still haven't found a good way to show visual feedbac
   }
 #+end_src
 *** Exports
   }
 #+end_src
 *** Exports

+**** Default programs

 #+begin_src shell :tangle ~/.config/ash/ashrc
   export EDITOR="emacsclient -c"
   export VISUAL="$EDITOR"
   export TERM=xterm-256color # for compatability
 #+begin_src shell :tangle ~/.config/ash/ashrc
   export EDITOR="emacsclient -c"
   export VISUAL="$EDITOR"
   export TERM=xterm-256color # for compatability

-
+  #+end_src
+**** General program configs
+#+begin_src shell :tangle ~/.config/ash/ashrc

   export GPG_TTY="$(tty)"
   export GPG_TTY="$(tty)"

+  export GNUPGHOME="~/.local/share/gnupg"
+
+  export GOPATH="~/.local/share/go"
+

   export MANPAGER='nvim +Man!'
   export PAGER='less'
 
   export GTK_USE_PORTAL=1
   export MANPAGER='nvim +Man!'
   export PAGER='less'
 
   export GTK_USE_PORTAL=1

+  export CDPATH=:~
+  export LESSHISTFILE=/dev/null

 
 

-  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="$PATH:/usr/sbin"
-  export PATH="$PATH:/opt/FreeTube/freetube"
-
+  export PASH_KEYID=me@armaanb.net
+  export PASH_LENGTH=20
+#+end_src
+**** PATH
+#+begin_src shell :tangle ~/.config/ash/ashrc
+  export PATH="/home/armaa/src/bin:$PATH"
+  export PATH="/home/armaa/src/bin/bin:$PATH"
+  export PATH="/home/armaa/.local/bin:$PATH"
+  export PATH="/usr/lib/ccache/bin:$PATH"
+#+end_src
+**** Locale
+#+begin_src shell :tangle ~/.config/ash/ashrc

   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"
+#+end_src
+**** KISS
+#+begin_src shell :tangle ~/.config/ash/ashrc
+  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 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_COMPRESS=xz
+#+end_src
+**** Compilation flags
+#+begin_src shell :tangle ~/.config/ash/ashrc
+  export CFLAGS="-O3 -pipe -march=native"
+  export CXXFLAGS="$CFLAGS"
+  export MAKEFLAGS="-j$(nproc)"

   export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig"
 #+end_src
   export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig"
 #+end_src

+**** XDG desktop dirs
+#+begin_src shell :tangle ~/.config/ash/ashrc
+  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
 *** 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'


@@ -934,7 +972,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


@@ -952,21 +990,19 @@ 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
 #+begin_src shell :tangle ~/.config/ash/ashrc
           rm -f "$T"'
 #+end_src
 **** Virtual machines, chroots
 #+begin_src shell :tangle ~/.config/ash/ashrc

-  alias ckiss="doas chrooter ~/Virtual/kiss"
-  alias cdebian="doas chrooter ~/Virtual/debian bash"
-  alias cwindows='devour qemu-system-x86_64 \
+  alias cwindows='qemu-system-x86_64 \

     -smp 3 \
     -cpu host \
     -enable-kvm \
     -smp 3 \
     -cpu host \
     -enable-kvm \


@@ -975,8 +1011,8 @@ Use the vi editing mode. I still haven't found a good way to show visual feedbac
     -device intel-hda \
     -device hda-duplex \
     -net nic \
     -device intel-hda \
     -device hda-duplex \
     -net nic \

-    -net user,smb=/home/armaa/Public \
-    -drive format=qcow2,file=/home/armaa/Virtual/windows.qcow2'
+    -net user,smb=/home/armaa/public \
+    -drive format=qcow2,file=/home/armaa/virtual/windows.qcow2'

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


@@ -999,31 +1035,26 @@ Make MPV play a little bit smoother.
   ytdl-format="bestvideo[height<=?1080]+bestaudio/best"
   hwdec=auto-copy
 #+end_src
   ytdl-format="bestvideo[height<=?1080]+bestaudio/best"
   hwdec=auto-copy
 #+end_src

-** Inputrc
-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

 ** Git
 *** User
 ** Git
 *** User

-#+begin_src conf :tangle ~/.gitconfig
+#+begin_src conf :tangle ~/.config/git/config

   [user]
   name = Armaan Bhojwani
   email = me@armaanb.net
   signingkey = 0FEB9471E19C49C60CFBEB133C9ED82FFE788E4A
 #+end_src
 *** Init
   [user]
   name = Armaan Bhojwani
   email = me@armaanb.net
   signingkey = 0FEB9471E19C49C60CFBEB133C9ED82FFE788E4A
 #+end_src
 *** Init

-#+begin_src conf :tangle ~/.gitconfig
+#+begin_src conf :tangle ~/.config/git/config

   [init]
   defaultBranch = main
 #+end_src
 *** GPG
   [init]
   defaultBranch = main
 #+end_src
 *** GPG

-#+begin_src conf :tangle ~/.gitconfig
+#+begin_src conf :tangle ~/.config/git/config

   [gpg]
   program = gpg
 #+end_src
 *** Sendemail
   [gpg]
   program = gpg
 #+end_src
 *** Sendemail

-#+begin_src conf :tangle ~/.gitconfig
+#+begin_src conf :tangle ~/.config/git/config

   [sendemail]
   smtpserver = smtp.mailbox.org
   smtpuser = me@armaanb.net
   [sendemail]
   smtpserver = smtp.mailbox.org
   smtpuser = me@armaanb.net


@@ -1032,12 +1063,12 @@ This file is used for any GNU Readline programs. I use Emacs editing mode mostly
   confirm = auto
 #+end_src
 *** Submodule
   confirm = auto
 #+end_src
 *** Submodule

-#+begin_src conf :tangle ~/.gitconfig
+#+begin_src conf :tangle ~/.config/git/config

   [submodule]
   recurse = true
 #+end_src
 *** Aliases
   [submodule]
   recurse = true
 #+end_src
 *** Aliases

-#+begin_src conf :tangle ~/.gitconfig
+#+begin_src conf :tangle ~/.config/git/config

   [alias]
   stat = diff --stat
   sclone = clone --depth 1
   [alias]
   stat = diff --stat
   sclone = clone --depth 1


@@ -1052,11 +1083,16 @@ This file is used for any GNU Readline programs. I use Emacs editing mode mostly
   pushnc = push -o skip-ci
 #+end_src
 *** Commit
   pushnc = push -o skip-ci
 #+end_src
 *** Commit

-#+begin_src conf :tangle ~/.gitconfig
+#+begin_src conf :tangle ~/.config/git/config

   [commit]
   gpgsign = true
   verbose = true
 #+end_src
   [commit]
   gpgsign = true
   verbose = true
 #+end_src

+*** Tag
+#+begin_src conf :tangle ~/.config/git/config
+  [tag]
+  gpgsign = true
+#+end_src

 ** Zathura
 The best document reader!
 *** Options
 ** Zathura
 The best document reader!
 *** Options


@@ -1081,85 +1117,45 @@ The best document reader!
   set recolor-darkcolor  "#ffffff" # fg
   set recolor            "true"
 #+end_src
   set recolor-darkcolor  "#ffffff" # fg
   set recolor            "true"
 #+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
-  ! special
-  ,*.foreground:   #ffffff
-  ,*.background:   #000000
-  ,*.cursorColor:  #ffffff
-
-  ! black
-  ,*.color0:       #000000
-  ,*.color8:       #555555
-
-  ! red
-  ,*.color1:       #ff8059
-  ,*.color9:       #ffa0a0
-
-  ! green
-  ,*.color2:       #00fc50
-  ,*.color10:      #88cf88
-
-  ! yellow
-  ,*.color3:       #eecc00
-  ,*.color11:      #d2b580
-
-  ! blue
-  ,*.color4:       #29aeff
-  ,*.color12:      #92baff
-
-  ! magenta
-  ,*.color5:       #feacd0
-  ,*.color13:      #e0b2d6
-
-  ! cyan
-  ,*.color6:       #00d3d0
-  ,*.color14:      #a0bfdf
-
-  ! white
-  ,*.color7:       #eeeeee
-  ,*.color15:      #dddddd
-#+end_src

 ** Tmux
 I use tmux in order to keep my st build light. Still learning how it works.
 ** Tmux
 I use tmux in order to keep my st build light. Still learning how it works.

-#+begin_src conf :tangle ~/.tmux.conf
+#+begin_src conf :tangle ~/.config/tmux/tmux.conf

   set -g status off
   set -g mouse on
   set -g status off
   set -g mouse on

+

   set-option -g history-limit 50000
   set-option -g history-limit 50000

+
+  set -g set-titles on
+  set -g set-titles-string "#W"
+

   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
 ** GPG
 *** Config
   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
 ** GPG
 *** Config

-#+begin_src conf :tangle ~/.gnupg/gpg.conf
+#+begin_src conf :tangle ~/.local/share/gnupg/gpg.conf

   default-key 3C9ED82FFE788E4A
   use-agent
 #+end_src
 *** Agent
   default-key 3C9ED82FFE788E4A
   use-agent
 #+end_src
 *** Agent

-#+begin_src conf :tangle ~/.gnupg/gpg-agent.conf
-  pinentry-program /sbin/pinentry-fltk
-  max-cache-ttl 600
-  default-cache-ttl 600
+#+begin_src conf :tangle ~/.local/share/gnupg/gpg-agent.conf
+  pinentry-program /sbin/pinentry
+
+  max-cache-ttl 6000
+  default-cache-ttl 6000

   allow-emacs-pinentry
 #+end_src
 ** Xmodmap
   allow-emacs-pinentry
 #+end_src
 ** Xmodmap

-#+begin_src conf :tangle ~/.config/xmodmap
-  !
+#+begin_src conf :tangle (progn (if (string= (system-name) "frost.armaanb.net") "~/.config/xmodmap" "no"))

   ! Unmap left super
   ! Unmap left super

-  !

   clear mod4
 
   clear mod4
 

-  !

   ! Turn right alt into super
   ! Turn right alt into super

-  !

   remove mod1 = Alt_R
   add mod4 = Alt_R
 
   remove mod1 = Alt_R
   add mod4 = Alt_R
 

-  !

   ! Swap caps and control
   ! Swap caps and control

-  !

   remove Lock = Caps_Lock
   remove Control = Control_L
   remove Lock = Control_L
   remove Lock = Caps_Lock
   remove Control = Control_L
   remove Lock = Control_L


@@ -1169,3 +1165,7 @@ I use tmux in order to keep my st build light. Still learning how it works.
   add Lock = Caps_Lock
   add Control = Control_L
 #+end_src
   add Lock = Caps_Lock
   add Control = Control_L
 #+end_src

+** sx
+#+begin_src shell :tangle ~/.config/sx/sxrc :tangle-mode (identity #o755)
+  exec dwm
+#+end_src