From 137cba9b7f119ad6838f6bf068ee87480d9739a2 Mon Sep 17 00:00:00 2001
From: josiah <me@jowj.net>
Date: Sun, 5 Jun 2022 16:55:43 -0500
Subject: [PATCH 01/25] Set up org-trello for use with L.

---
 .emacs.d/custom.el  | 5 ++++-
 .emacs.d/init.el    | 1 +
 .emacs.d/jlj-org.el | 6 ++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/.emacs.d/custom.el b/.emacs.d/custom.el
index 5b46448..65a63fa 100644
--- a/.emacs.d/custom.el
+++ b/.emacs.d/custom.el
@@ -13,8 +13,11 @@
  '(global-hl-line-mode t)
  '(org-agenda-files
    '("/home/josiah/dhd/org/big-bend-notes.org" "/home/josiah/dhd/org/documentation.org" "/home/josiah/dhd/org/finances.org" "/home/josiah/dhd/org/fitness.org" "/home/josiah/dhd/org/housing.org" "/home/josiah/dhd/org/hoyden.org" "/home/josiah/dhd/org/jlj-template.org" "/home/josiah/dhd/org/pagedout.org" "/home/josiah/dhd/org/pagedout2.org" "/home/josiah/dhd/org/personal.org" "/home/josiah/dhd/org/refile-beorg.org" "/home/josiah/dhd/org/someday.org" "/home/josiah/dhd/org/stjohns.org" "/home/josiah/dhd/org/webwiki.org" "/home/josiah/dhd/org/work.org"))
+ '(org-trello-current-prefix-keybinding "C-c o" nil (org-trello))
+ '(org-trello-files '("~/dhd/org/stjohns-trello.org") nil (org-trello))
  '(package-selected-packages
-   '(python-black rust-mode company lsp-mode nix-mode markdown-mode flycheck s lsp-pyright ido-vertical-mode dash-functional region-bindings-mode jinja2-mode dockerfile-mode sudo-edit modus-themes org-caldav json-mode pdf-tools org-special-block-extras neotree sr-speedbar lsp-python-ms fira-code-mode yasnippet org-pdftools phps-mode projectile webfeeder znc pinboard yaml-mode which-key web-mode virtualenvwrapper use-package twittering-mode try smex racer powershell poetry pipenv ox-reveal outline-magic org-pdfview org-bullets ob-restclient multiple-cursors magit lua-mode lsp-ui iedit helm flycheck-rust exec-path-from-shell eglot edit-indirect company-lsp ansible ace-window)))
+   '(org-trello python-black rust-mode company lsp-mode nix-mode markdown-mode flycheck s lsp-pyright ido-vertical-mode dash-functional region-bindings-mode jinja2-mode dockerfile-mode sudo-edit modus-themes org-caldav json-mode pdf-tools org-special-block-extras neotree sr-speedbar lsp-python-ms fira-code-mode yasnippet org-pdftools phps-mode projectile webfeeder znc pinboard yaml-mode which-key web-mode virtualenvwrapper use-package twittering-mode try smex racer powershell poetry pipenv ox-reveal outline-magic org-pdfview org-bullets ob-restclient multiple-cursors magit lua-mode lsp-ui iedit helm flycheck-rust exec-path-from-shell eglot edit-indirect company-lsp ansible ace-window))
+ '(request-backend 'url-retrieve))
  '(znc-servers
    `(("bouncer.awful.club" 5000 t
       ((freenode "blindidiotgod/freenode" ,znc-password)
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 7efee56..8578b83 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -8,6 +8,7 @@
 (setq package-archives
       
       '(("melpa" . "https://melpa.org/packages/")
+	("melpa-stable" . "http://melpa-stable.milkbox.net/packages/")
         ("gnu" . "http://elpa.gnu.org/packages/")
 	("elpy" . "http://jorgenschaefer.github.io/packages/")))
 
diff --git a/.emacs.d/jlj-org.el b/.emacs.d/jlj-org.el
index 51bcefb..677cc2c 100644
--- a/.emacs.d/jlj-org.el
+++ b/.emacs.d/jlj-org.el
@@ -102,6 +102,12 @@
   :ensure t
   :after org)
 
+(use-package org-trello
+  :ensure t
+  :after org
+  :config
+  (custom-set-variables '(org-trello-files '("~/dhd/org/stjohns-trello.org"))))
+
 ;; configure the org protocol
 (org-load-modules-maybe t)
 (require 'org-protocol)

From 66560519ed932072f89470ac139566e26e2600a1 Mon Sep 17 00:00:00 2001
From: josiah <me@jowj.net>
Date: Wed, 15 Jun 2022 09:37:42 -0500
Subject: [PATCH 02/25] Figure out gpg shit for keychain, update key.

---
 .bashrc                   |  10 ++++++++++
 .emacs.d/jlj-secrets2.gpg | Bin 548 -> 575 bytes
 .gnupg/gpg-agent.conf     |   6 ++++++
 3 files changed, 16 insertions(+)
 create mode 100644 .gnupg/gpg-agent.conf

diff --git a/.bashrc b/.bashrc
index d8f6822..3a858f4 100644
--- a/.bashrc
+++ b/.bashrc
@@ -70,7 +70,17 @@ if [ -x /usr/bin/dircolors ]; then
 fi
 
 # handle key management through `keychain` because its great
+## first set up gpg agent
+[ -f ~/.gpg-agent-info ] && source ~/.gpg-agent-info
+if [ -S "${GPG_AGENT_INFO%%:*}" ]; then
+   export GPG_AGENT_INFO
+else
+   eval $( gpg-agent --daemon --write-env-file ~/.gpg-agent-info )
+fi
+
+## then configure keychain
 eval $(keychain --eval --quiet ~/.ssh/{awful-git,github,digitalocean,home-net})
+eval $(keychain --gpg2 --agents gpg)
 
 # host specific configurations:
 if [ "$HOSTNAME" = "nixon" ]; then
diff --git a/.emacs.d/jlj-secrets2.gpg b/.emacs.d/jlj-secrets2.gpg
index b9e1afe7569bda168313fc0a0ae59a6db9e7b428..842bb4494b3dab537cc0a8748a6f0cfee67c203f 100644
GIT binary patch
literal 575
zcmV-F0>J%+0Sp8A2s!1FcUZLn2mT>^>+<q#?vPh1U>V1J4LY)a1zZ!TRu?X>GqZE|
zn6Yso>$$nPc=L99r$6$JGGo}S0?#Y6*@b^%42k5{qM~bP7Iew6aqsEBD}AXZEM>mN
zL+I!IBkUY~Dx!S4bS5F_QKWamHiYF%OkDNM5OZ{T6$@c!jfy4QOqT>bpM8nY!&wFm
zuC7I_Pq42k28k4(dw?ssoh6bRULMuZ5W|)kPIb>h+9>WfMxEh(G;*(#&N&`d!P&#z
zKm=FxeB5X6;kqz*R8<})5hG}Vkoru>J8i1UFV(z99u24qYH@iAMo^9Tg24f=rn$yV
zmWuZYAZ|j>QJsFzIj;z7;EdA1Z2{E!Ci$7eksW?0O5)nBkY$JH9ZMqvGd9bZXKujX
zk&d=fY4Zuh9%9lm_NNP!IH^Hey$I!pYY`TLw~jC_L4h5+?H0{9U#2ZJn5S}Rab#jS
z!6LG5x2J!b5?wu`Fe)%*;jPQX6Sg6v>QFJp(u*u98pYcru-(b<v=WG~NeQc|6#8`2
zIJ=|5d7=aeFhIKpK0!h5A34ckzAqKO`Yd$qvtiM1MKX?6I=Pj5Vn&O?I@-SMCKSjI
z>u$_CAhs7^NV@Y{qWyGC*Mdr5hP?=S5;mfX-`kQ=uUx2qGHWx-_yrI!#iuG7N#3s!
z`Pss$h#j<SVo@Lz4Rz<9C~>+0y2U%mk8*QI6C_tS&j?+7<gsPANRrNY7<r7^;85(=
N964n3E6W`+xe7A;6E6S&

literal 548
zcmV+<0^9wC0Sp8A2s!1FcUZLn2msf{I`M-QoUFFJEpf0@TL9sge(Ln4aa>=1%J|sg
zT&-_M?HaG>Y+UQ;hFLT|ow_84biUcf;M=4Gjm8(#dUIFl0g%I5ucD>p*;!?9Ryl61
z=oaVDyI8ijBV~|O#p{xfD7$ck;nv90bQKYVr^aB8QhuTV&H>!Kl{266>EEGbnSE&2
zdIAT(ZL24t=|F-K2zurZgNZ#M27+a0K-iPO=^Q5ETjkD?3elq`O{%kNy4(boXN5G5
z7P->AS@=gWDqXo?Dw-Tk1c=8A8~n%RFg}`+{PNZyw8CJ=jE8bN?<#@#Vi4bVih7}S
z3ZCDW9v0-81PnneTHE=Lrl8WmQUS{g(v1aP+_1Nu94{YHbaRxGR1DgImy)>=cdH2m
zhXIG@aCEAG5sGL<DUrLN5;K{E@^cz5idE%K$A^MSd{n2-?}6z61~heROOjSC@sL`w
zX5$GMcP`J2qKR7Gd%r=(@RdN5t&yLM-a53hv%*$6^`(51n+Jz{gFVGGf}!s{sz?-e
zHom=@F_cRG^_U-Xaini`Fs!m9TizL{yF*$=7U3PMS#m@3JV{uPiMYG7=#WVaEfTya
zMwMUYV2XK~S-=T-o185o+DUd1f)O$`X8Zkjks~7@;XNBbTTq<bjo)0Bx;Wff40)r2
mQU+UXCUjWFY^7yAj;qd=E=$T##GHCYCdY3dRUSGSaxJ867Ykqj

diff --git a/.gnupg/gpg-agent.conf b/.gnupg/gpg-agent.conf
new file mode 100644
index 0000000..2b4a488
--- /dev/null
+++ b/.gnupg/gpg-agent.conf
@@ -0,0 +1,6 @@
+default-cache-ttl 31536000
+max-cache-ttl 31536000
+log-file /var/log/gpg-agent
+debug-level basic
+pinentry-program /run/current-system/sw/bin/pinentry
+use-agent

From c0820eabf41727b30c96d974163f97b28ead036e Mon Sep 17 00:00:00 2001
From: josiah <me@jowj.net>
Date: Wed, 15 Jun 2022 12:14:20 -0500
Subject: [PATCH 03/25] Add offlineimap systemd timers.

---
 .config/systemd/user/offlineimap-oneshot.service | 10 ++++++++++
 .config/systemd/user/offlineimap-oneshot.timer   |  9 +++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 .config/systemd/user/offlineimap-oneshot.service
 create mode 100644 .config/systemd/user/offlineimap-oneshot.timer

diff --git a/.config/systemd/user/offlineimap-oneshot.service b/.config/systemd/user/offlineimap-oneshot.service
new file mode 100644
index 0000000..7664ca6
--- /dev/null
+++ b/.config/systemd/user/offlineimap-oneshot.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Run offlineimap with my specifications
+After=network.target
+
+[Service]
+ExecStart=/run/current-system/sw/bin/docker run -v /home/josiah/.config/offlineimap/:/mnt/config -v /home/josiah/qj/fastmail:/mnt/mail -v /home/josiah/qj/mail.log:/mnt/log -e MAILLOG=TRUE maxkratz/offlineimap:latest
+TimeoutStartSec=3600
+
+[Install]
+WantedBy=default.target
diff --git a/.config/systemd/user/offlineimap-oneshot.timer b/.config/systemd/user/offlineimap-oneshot.timer
new file mode 100644
index 0000000..3693f6f
--- /dev/null
+++ b/.config/systemd/user/offlineimap-oneshot.timer
@@ -0,0 +1,9 @@
+[Unit]
+Description=Run offlineimap every 30 minutes
+
+[Timer]
+OnBootSec=30min
+OnUnitActiveSec=1day
+
+[Install]
+WantedBy=timers.target

From df16291325451f990c6225524cc9942f0aae1ad7 Mon Sep 17 00:00:00 2001
From: josiah <me@jowj.net>
Date: Wed, 15 Jun 2022 12:14:45 -0500
Subject: [PATCH 04/25] Figured out mu4e.

---
 .emacs.d/custom.el      |  4 ++--
 .emacs.d/jlj-generic.el | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/.emacs.d/custom.el b/.emacs.d/custom.el
index 65a63fa..1a0d7c0 100644
--- a/.emacs.d/custom.el
+++ b/.emacs.d/custom.el
@@ -12,11 +12,11 @@
  '(epg-gpg-program "/usr/local/bin/gpg")
  '(global-hl-line-mode t)
  '(org-agenda-files
-   '("/home/josiah/dhd/org/big-bend-notes.org" "/home/josiah/dhd/org/documentation.org" "/home/josiah/dhd/org/finances.org" "/home/josiah/dhd/org/fitness.org" "/home/josiah/dhd/org/housing.org" "/home/josiah/dhd/org/hoyden.org" "/home/josiah/dhd/org/jlj-template.org" "/home/josiah/dhd/org/pagedout.org" "/home/josiah/dhd/org/pagedout2.org" "/home/josiah/dhd/org/personal.org" "/home/josiah/dhd/org/refile-beorg.org" "/home/josiah/dhd/org/someday.org" "/home/josiah/dhd/org/stjohns.org" "/home/josiah/dhd/org/webwiki.org" "/home/josiah/dhd/org/work.org"))
+   '("/home/josiah/dhd/org/big-bend-notes.org" "/home/josiah/dhd/org/documentation.org" "/home/josiah/dhd/org/finances.org" "/home/josiah/dhd/org/fitness.org" "/home/josiah/dhd/org/housing.org" "/home/josiah/dhd/org/hoyden.org" "/home/josiah/dhd/org/jlj-template.org" "/home/josiah/dhd/org/pagedout.org" "/home/josiah/dhd/org/pagedout2.org" "/home/josiah/dhd/org/personal.org" "/home/josiah/dhd/org/refile-beorg.org" "/home/josiah/dhd/org/someday.org" "/home/josiah/dhd/org/stjohns-trello.org" "/home/josiah/dhd/org/stjohns.org" "/home/josiah/dhd/org/webwiki.org" "/home/josiah/dhd/org/work.org"))
  '(org-trello-current-prefix-keybinding "C-c o" nil (org-trello))
  '(org-trello-files '("~/dhd/org/stjohns-trello.org") nil (org-trello))
  '(package-selected-packages
-   '(org-trello python-black rust-mode company lsp-mode nix-mode markdown-mode flycheck s lsp-pyright ido-vertical-mode dash-functional region-bindings-mode jinja2-mode dockerfile-mode sudo-edit modus-themes org-caldav json-mode pdf-tools org-special-block-extras neotree sr-speedbar lsp-python-ms fira-code-mode yasnippet org-pdftools phps-mode projectile webfeeder znc pinboard yaml-mode which-key web-mode virtualenvwrapper use-package twittering-mode try smex racer powershell poetry pipenv ox-reveal outline-magic org-pdfview org-bullets ob-restclient multiple-cursors magit lua-mode lsp-ui iedit helm flycheck-rust exec-path-from-shell eglot edit-indirect company-lsp ansible ace-window))
+   '(mu4e org-trello python-black rust-mode company lsp-mode nix-mode markdown-mode flycheck s lsp-pyright ido-vertical-mode dash-functional region-bindings-mode jinja2-mode dockerfile-mode sudo-edit modus-themes org-caldav json-mode pdf-tools org-special-block-extras neotree sr-speedbar lsp-python-ms fira-code-mode yasnippet org-pdftools phps-mode projectile webfeeder znc pinboard yaml-mode which-key web-mode virtualenvwrapper use-package twittering-mode try smex racer powershell poetry pipenv ox-reveal outline-magic org-pdfview org-bullets ob-restclient multiple-cursors magit lua-mode lsp-ui iedit helm flycheck-rust exec-path-from-shell eglot edit-indirect company-lsp ansible ace-window))
  '(request-backend 'url-retrieve))
  '(znc-servers
    `(("bouncer.awful.club" 5000 t
diff --git a/.emacs.d/jlj-generic.el b/.emacs.d/jlj-generic.el
index 5bafd38..84e1556 100644
--- a/.emacs.d/jlj-generic.el
+++ b/.emacs.d/jlj-generic.el
@@ -247,6 +247,20 @@
 (use-package dockerfile-mode
   :ensure t)
 
+;; add weird mu4e path to emacs
+;; THIS IS A HARD CODED NIX DERIV rather than something better. be careful.
+;; I expect this to break a decent amount
+(when (string= (system-name) "hoyden")
+  (add-to-list 'load-path "~/.emacs.d/src/mu4e")
+  (require 'mu4e)
+  (require 'mu4e-view-gnus) ; this is required on nixos for some reason; maybe in other places? if you don't, you can't view messages
+  (setq mail-user-agent 'mu4e-user-agent)
+  ;; use 'fancy' non-ascii characters in various places in mu4e
+  (setq mu4e-use-fancy-chars t)
+  ;; attempt to show images when viewing messages
+  (setq mu4e-view-show-images t))
+
+
 (server-start)
 
 ;;; jlj-generic.el ends here

From 740d20a20ec50a659cbf3fdce9d16ff4a50ccb5a Mon Sep 17 00:00:00 2001
From: josiah <me@jowj.net>
Date: Tue, 21 Jun 2022 19:01:13 -0500
Subject: [PATCH 05/25] Limit notification size so its not hilarious.

---
 .config/awesome/rc.lua | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index 278b3f6..e1a4196 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -27,6 +27,9 @@ local game_widget = require("awesome-wm-widgets.demomode-widget.demomode")
 -- screen RESOLUTION import and customization
 local screen_widget = require("awesome-wm-widgets.gamemode-widget.gamemode")
 
+-- limit notification size so they don't blow up your whole goddamn screen
+naughty.config.defaults['icon_size'] = 100
+
 -- {{{ Error handling
 -- Check if awesome encountered an error during startup and fell back to
 -- another config (This code will only ever execute for the fallback config)

From 31552f84e07b7e7af153ce543455bc7f23dc0c4f Mon Sep 17 00:00:00 2001
From: josiah <me@jowj.net>
Date: Fri, 15 Jul 2022 15:12:04 -0500
Subject: [PATCH 06/25] Add birdtray.service.

---
 .config/systemd/user/birdtray.service | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 .config/systemd/user/birdtray.service

diff --git a/.config/systemd/user/birdtray.service b/.config/systemd/user/birdtray.service
new file mode 100644
index 0000000..b9d06d4
--- /dev/null
+++ b/.config/systemd/user/birdtray.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=Runs the birdtray process.
+After=network.target
+
+[Service]
+ExecStart=/run/current-system/sw/bin/birdtray
+
+Restart=always
+RestartSec=10
+Environment=DISPLAY=:0
+
+StandardOutput=syslog
+StandardError=syslog
+
+[Install]
+WantedBy=default.target

From 0a213461d4053b80b4f5500fc1620687d1cb18f7 Mon Sep 17 00:00:00 2001
From: josiah <me@jowj.net>
Date: Fri, 19 Aug 2022 14:47:35 -0500
Subject: [PATCH 07/25] Add fortune / invisible states to bashrc.

---
 .bashrc | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/.bashrc b/.bashrc
index 3a858f4..4862012 100644
--- a/.bashrc
+++ b/.bashrc
@@ -83,23 +83,14 @@ eval $(keychain --eval --quiet ~/.ssh/{awful-git,github,digitalocean,home-net})
 eval $(keychain --gpg2 --agents gpg)
 
 # host specific configurations:
-if [ "$HOSTNAME" = "nixon" ]; then
-	printf 'on nixon, applying nixOS config'
+if [ "$HOSTNAME" = "hoyden" ]; then
+	printf 'on hoyden, applying nixOS config \n'
 	setxkbmap -option "ctrl:nocaps"
+	fortune invisiblestates/invisiblestates | fold -w 80 -s
 else
 	printf 'regular config\n'
 fi
 
-# use pyenv where appropriate:
-if [ "$HOSTNAME" = "popling" ]; then
-	printf 'on home, applying home config'
-        export PATH="$HOME/.pyenv/bin:$PATH"
-	eval "$(pyenv init -)"
-	eval "$(pyenv virtualenv-init -)"
-else
-	printf 'regular config'
-fi
-
 # this looks like garbage but its just color initation and termination
 export PS1="\t \[\e[34m\]ǰ \[\e[91m\]☭\[\e[0m\] "
 

From ee2e583aa8af746e04fd4e83f4bae8d3bc235c6a Mon Sep 17 00:00:00 2001
From: josiah <me@jowj.net>
Date: Sun, 21 Aug 2022 20:07:41 -0500
Subject: [PATCH 08/25] Add some lain bullshit to my awesome config.

---
 .config/awesome/rc.lua | 147 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 140 insertions(+), 7 deletions(-)

diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index e1a4196..55e6266 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -2,31 +2,164 @@
 -- found (e.g. lgi). If LuaRocks is not installed, do nothing.
 pcall(require, "luarocks.loader")
 
+-- lain stuff
+local lain  = require("lain")
+local dpi   = require("beautiful.xresources").apply_dpi
+
 -- Standard awesome library
 local gears = require("gears")
 local awful = require("awful")
 require("awful.autofocus")
+
 -- Widget and layout library
 local wibox = require("wibox")
+
 -- Theme handling library
 local beautiful = require("beautiful")
+
 -- Notification library
 local naughty = require("naughty")
 local menubar = require("menubar")
 local hotkeys_popup = require("awful.hotkeys_popup")
+
 -- Enable hotkeys help widget for VIM and other apps
 -- when client with a matching name is opened:
 require("awful.hotkeys_popup.keys")
 
--- volume import
-local volume_widget = require("awesome-wm-widgets.volume-widget.volume")
+-- Shit to enable the use of lain themes and templates
+local my_table = awful.util.table or gears.table -- 4.{0,1} compatibility
+
+local theme                                     = {}
+theme.dir                                       = os.getenv("HOME") .. "/.config/awesome/themes/copland"
+theme.wallpaper                                 = theme.dir .. "/wall.png"
+theme.font                                      = "Terminus 10.5"
+theme.fg_normal                                 = "#BBBBBB"
+theme.fg_focus                                  = "#78A4FF"
+theme.bg_normal                                 = "#111111"
+theme.bg_focus                                  = "#111111"
+theme.fg_urgent                                 = "#000000"
+theme.bg_urgent                                 = "#FFFFFF"
+theme.border_width                              = dpi(1)
+theme.border_normal                             = "#141414"
+theme.border_focus                              = "#93B6FF"
+theme.taglist_fg_focus                          = "#FFFFFF"
+theme.taglist_bg_focus                          = "#111111"
+theme.taglist_bg_normal                         = "#111111"
+theme.titlebar_bg_normal                        = "#191919"
+theme.titlebar_bg_focus                         = "#262626"
+theme.menu_height                               = dpi(16)
+theme.menu_width                                = dpi(130)
+theme.tasklist_disable_icon                     = true
+theme.awesome_icon                              = theme.dir .."/icons/awesome.png"
+theme.menu_submenu_icon                         = theme.dir .. "/icons/submenu.png"
+theme.taglist_squares_sel                       = theme.dir .. "/icons/square_unsel.png"
+theme.taglist_squares_unsel                     = theme.dir .. "/icons/square_unsel.png"
+theme.vol                                       = theme.dir .. "/icons/vol.png"
+theme.vol_low                                   = theme.dir .. "/icons/vol_low.png"
+theme.vol_no                                    = theme.dir .. "/icons/vol_no.png"
+theme.vol_mute                                  = theme.dir .. "/icons/vol_mute.png"
+theme.disk                                      = theme.dir .. "/icons/disk.png"
+theme.ac                                        = theme.dir .. "/icons/ac.png"
+theme.bat                                       = theme.dir .. "/icons/bat.png"
+theme.bat_low                                   = theme.dir .. "/icons/bat_low.png"
+theme.bat_no                                    = theme.dir .. "/icons/bat_no.png"
+theme.play                                      = theme.dir .. "/icons/play.png"
+theme.pause                                     = theme.dir .. "/icons/pause.png"
+theme.stop                                      = theme.dir .. "/icons/stop.png"
+theme.layout_tile                               = theme.dir .. "/icons/tile.png"
+theme.layout_tileleft                           = theme.dir .. "/icons/tileleft.png"
+theme.layout_tilebottom                         = theme.dir .. "/icons/tilebottom.png"
+theme.layout_tiletop                            = theme.dir .. "/icons/tiletop.png"
+theme.layout_fairv                              = theme.dir .. "/icons/fairv.png"
+theme.layout_fairh                              = theme.dir .. "/icons/fairh.png"
+theme.layout_spiral                             = theme.dir .. "/icons/spiral.png"
+theme.layout_dwindle                            = theme.dir .. "/icons/dwindle.png"
+theme.layout_max                                = theme.dir .. "/icons/max.png"
+theme.layout_fullscreen                         = theme.dir .. "/icons/fullscreen.png"
+theme.layout_magnifier                          = theme.dir .. "/icons/magnifier.png"
+theme.layout_floating                           = theme.dir .. "/icons/floating.png"
+theme.useless_gap                               = 0
+theme.titlebar_close_button_focus               = theme.dir .. "/icons/titlebar/close_focus.png"
+theme.titlebar_close_button_normal              = theme.dir .. "/icons/titlebar/close_normal.png"
+theme.titlebar_ontop_button_focus_active        = theme.dir .. "/icons/titlebar/ontop_focus_active.png"
+theme.titlebar_ontop_button_normal_active       = theme.dir .. "/icons/titlebar/ontop_normal_active.png"
+theme.titlebar_ontop_button_focus_inactive      = theme.dir .. "/icons/titlebar/ontop_focus_inactive.png"
+theme.titlebar_ontop_button_normal_inactive     = theme.dir .. "/icons/titlebar/ontop_normal_inactive.png"
+theme.titlebar_sticky_button_focus_active       = theme.dir .. "/icons/titlebar/sticky_focus_active.png"
+theme.titlebar_sticky_button_normal_active      = theme.dir .. "/icons/titlebar/sticky_normal_active.png"
+theme.titlebar_sticky_button_focus_inactive     = theme.dir .. "/icons/titlebar/sticky_focus_inactive.png"
+theme.titlebar_sticky_button_normal_inactive    = theme.dir .. "/icons/titlebar/sticky_normal_inactive.png"
+theme.titlebar_floating_button_focus_active     = theme.dir .. "/icons/titlebar/floating_focus_active.png"
+theme.titlebar_floating_button_normal_active    = theme.dir .. "/icons/titlebar/floating_normal_active.png"
+theme.titlebar_floating_button_focus_inactive   = theme.dir .. "/icons/titlebar/floating_focus_inactive.png"
+theme.titlebar_floating_button_normal_inactive  = theme.dir .. "/icons/titlebar/floating_normal_inactive.png"
+theme.titlebar_maximized_button_focus_active    = theme.dir .. "/icons/titlebar/maximized_focus_active.png"
+theme.titlebar_maximized_button_normal_active   = theme.dir .. "/icons/titlebar/maximized_normal_active.png"
+theme.titlebar_maximized_button_focus_inactive  = theme.dir .. "/icons/titlebar/maximized_focus_inactive.png"
+theme.titlebar_maximized_button_normal_inactive = theme.dir .. "/icons/titlebar/maximized_normal_inactive.png"
+
+-- lain related
+theme.layout_centerfair                         = theme.dir .. "/icons/centerfair.png"
+theme.layout_termfair                           = theme.dir .. "/icons/termfair.png"
+theme.layout_centerwork                         = theme.dir .. "/icons/centerwork.png"
+
+local markup = lain.util.markup
+local blue   = theme.fg_focus
+local red    = "#EB8F8F"
+local green  = "#8FEB8F"
+
+
+-- ALSA volume bar
+local volicon = wibox.widget.imagebox(theme.vol)
+theme.volume = lain.widget.alsabar {
+    width = dpi(59), border_width = 0, ticks = true, ticks_size = dpi(6),
+    notification_preset = { font = theme.font },
+    --togglechannel = "IEC958,3",
+    settings = function()
+        if volume_now.status == "off" then
+            volicon:set_image(theme.vol_mute)
+        elseif volume_now.level == 0 then
+            volicon:set_image(theme.vol_no)
+        elseif volume_now.level <= 50 then
+            volicon:set_image(theme.vol_low)
+        else
+            volicon:set_image(theme.vol)
+        end
+    end,
+    colors = {
+        background   = theme.bg_normal,
+        mute         = red,
+        unmute       = theme.fg_normal
+    }
+}
+theme.volume.tooltip.wibox.fg = theme.fg_focus
+theme.volume.bar:buttons(my_table.join (
+          awful.button({}, 1, function()
+            awful.spawn(string.format("%s -e alsamixer", awful.util.terminal))
+          end),
+          awful.button({}, 2, function()
+            os.execute(string.format("%s set %s 100%%", theme.volume.cmd, theme.volume.channel))
+            theme.volume.update()
+          end),
+          awful.button({}, 3, function()
+            os.execute(string.format("%s set %s toggle", theme.volume.cmd, theme.volume.togglechannel or theme.volume.channel))
+            theme.volume.update()
+          end),
+          awful.button({}, 4, function()
+            os.execute(string.format("%s set %s 1%%+", theme.volume.cmd, theme.volume.channel))
+            theme.volume.update()
+          end),
+          awful.button({}, 5, function()
+            os.execute(string.format("%s set %s 1%%-", theme.volume.cmd, theme.volume.channel))
+            theme.volume.update()
+          end)
+))
+local volumebg = wibox.container.background(theme.volume.bar, "#474747", gears.shape.rectangle)
+local volumewidget = wibox.container.margin(volumebg, dpi(2), dpi(7), dpi(4), dpi(4))
 
 -- game mode import and customization
 local game_widget = require("awesome-wm-widgets.demomode-widget.demomode")
 
--- screen RESOLUTION import and customization
-local screen_widget = require("awesome-wm-widgets.gamemode-widget.gamemode")
-
 -- limit notification size so they don't blow up your whole goddamn screen
 naughty.config.defaults['icon_size'] = 100
 
@@ -228,8 +361,8 @@ awful.screen.connect_for_each_screen(function(s)
             mykeyboardlayout,
             wibox.widget.systray(),
             mytextclock,
-	    volume_widget({display_notification = true}),
-	    battery_widget,
+            volicon,
+            volumewidget,	    
             s.mylayoutbox,
         },
     }

From 31067ca49e9505977a00075c325a46c0c0d78d1e Mon Sep 17 00:00:00 2001
From: josiah <me@jowj.net>
Date: Sun, 4 Sep 2022 10:35:11 -0500
Subject: [PATCH 09/25] Update keys, awesome config.

- H-o for other window in tag
- H-u for jump to notif
- comment out the fucking run lua code thing
---
 .config/awesome/rc.lua | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index 55e6266..7705dca 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -1,4 +1,4 @@
--- If LuaRocks is installed, make sure that packages installed through it are
+ -- If LuaRocks is installed, make sure that packages installed through it are
 -- found (e.g. lgi). If LuaRocks is not installed, do nothing.
 pcall(require, "luarocks.loader")
 
@@ -388,7 +388,7 @@ globalkeys = gears.table.join(
     awful.key({ modkey,           }, "Escape", awful.tag.history.restore,
               {description = "go back", group = "tag"}),
 
-    awful.key({ "Mod1",           }, "Tab",
+    awful.key({ "Control","Mod1", "Shift", "Mod4"}, "o",
        function ()
 	  awful.client.focus.byidx( 1)
        end,
@@ -412,7 +412,7 @@ globalkeys = gears.table.join(
        {description = "focus the next screen", group = "screen"}),
     awful.key({ modkey, "Control" }, "k", function () awful.screen.focus_relative(-1) end,
        {description = "focus the previous screen", group = "screen"}),
-    awful.key({ modkey,           }, "u", awful.client.urgent.jumpto,
+    awful.key({ "Control","Mod1", "Shift", "Mod4" }, "u", awful.client.urgent.jumpto,
        {description = "jump to urgent client", group = "client"}),
     awful.key({ modkey,           }, "j",
        function ()
@@ -470,6 +470,7 @@ globalkeys = gears.table.join(
     awful.key({ modkey, "Shift"   }, "space", function () awful.layout.inc(-1)                end,
        {description = "select previous", group = "layout"}),
 
+    -- this will restore a client on the active tag + focus it
     awful.key({ "Control","Mod1", "Shift", "Mod4" }, "n",
        function ()
 	  local c = awful.client.restore()
@@ -486,15 +487,18 @@ globalkeys = gears.table.join(
     awful.key({ modkey },            "r",     function () awful.screen.focused().mypromptbox:run() end,
        {description = "run prompt", group = "launcher"}),
 
-    awful.key({ modkey }, "x",
-       function ()
-	  awful.prompt.run {
-	     prompt       = "Run Lua code: ",
-	     textbox      = awful.screen.focused().mypromptbox.widget,
-	     exe_callback = awful.util.eval,
-	     history_path = awful.util.get_cache_dir() .. "/history_eval"
-	  }
-end))
+
+    -- This is maybe something usefull for folks but honestly always gets in my way. Just commenting out.
+    -- awful.key({ modkey }, "x",
+    --    function ()
+    -- 	  awful.prompt.run {
+    -- 	     prompt       = "Run Lua code: ",
+    -- 	     textbox      = awful.screen.focused().mypromptbox.widget,
+    -- 	     exe_callback = awful.util.eval,
+    -- 	     history_path = awful.util.get_cache_dir() .. "/history_eval"
+    -- 	  }
+    -- end)
+)
        -- {description = "lua execute prompt", group = "awesome"}),
     -- Menubar
     -- awful.key({ modkey }, "p", function() menubar.show() end,

From 2989b18a8c9f1aeef226c55c3db43af83d030d9d Mon Sep 17 00:00:00 2001
From: josiah <me@jowj.net>
Date: Sun, 4 Sep 2022 10:35:58 -0500
Subject: [PATCH 10/25] Misc.

---
 .emacs.d/custom.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.emacs.d/custom.el b/.emacs.d/custom.el
index 1a0d7c0..b6ea90d 100644
--- a/.emacs.d/custom.el
+++ b/.emacs.d/custom.el
@@ -12,7 +12,7 @@
  '(epg-gpg-program "/usr/local/bin/gpg")
  '(global-hl-line-mode t)
  '(org-agenda-files
-   '("/home/josiah/dhd/org/big-bend-notes.org" "/home/josiah/dhd/org/documentation.org" "/home/josiah/dhd/org/finances.org" "/home/josiah/dhd/org/fitness.org" "/home/josiah/dhd/org/housing.org" "/home/josiah/dhd/org/hoyden.org" "/home/josiah/dhd/org/jlj-template.org" "/home/josiah/dhd/org/pagedout.org" "/home/josiah/dhd/org/pagedout2.org" "/home/josiah/dhd/org/personal.org" "/home/josiah/dhd/org/refile-beorg.org" "/home/josiah/dhd/org/someday.org" "/home/josiah/dhd/org/stjohns-trello.org" "/home/josiah/dhd/org/stjohns.org" "/home/josiah/dhd/org/webwiki.org" "/home/josiah/dhd/org/work.org"))
+   '("/home/josiah/dhd/org/big-bend-notes.org" "/home/josiah/dhd/org/documentation.org" "/home/josiah/dhd/org/finances.org" "/home/josiah/dhd/org/fitness.org" "/home/josiah/dhd/org/housing.org" "/home/josiah/dhd/org/hoyden.org" "/home/josiah/dhd/org/interview-notes.org" "/home/josiah/dhd/org/jlj-template.org" "/home/josiah/dhd/org/pagedout.org" "/home/josiah/dhd/org/pagedout2.org" "/home/josiah/dhd/org/personal.org" "/home/josiah/dhd/org/refile-beorg.org" "/home/josiah/dhd/org/someday.org" "/home/josiah/dhd/org/stjohns-trello.org" "/home/josiah/dhd/org/stjohns.org" "/home/josiah/dhd/org/vehicles.org" "/home/josiah/dhd/org/webwiki.org" "/home/josiah/dhd/org/work.org"))
  '(org-trello-current-prefix-keybinding "C-c o" nil (org-trello))
  '(org-trello-files '("~/dhd/org/stjohns-trello.org") nil (org-trello))
  '(package-selected-packages

From fb5e309985e37a62d3d828785af0dd1521c85d54 Mon Sep 17 00:00:00 2001
From: josiah <me@jowj.net>
Date: Thu, 6 Oct 2022 18:15:51 -0500
Subject: [PATCH 11/25] Add xprofile.

---
 .xprofile | 1 +
 1 file changed, 1 insertion(+)
 create mode 100755 .xprofile

diff --git a/.xprofile b/.xprofile
new file mode 100755
index 0000000..459f697
--- /dev/null
+++ b/.xprofile
@@ -0,0 +1 @@
+xrandr --output DP-1 --mode 2560x1440 --pos 0x0 --rotate normal --primary --output DP-2 --mode 1920x1200 --left-of DP-1

From 27a660b9ed12bb1d8b0e2b3bd4f4ad574c715ad5 Mon Sep 17 00:00:00 2001
From: josiah <me@jowj.net>
Date: Sun, 16 Oct 2022 15:41:03 -0500
Subject: [PATCH 12/25] Add docker system prune to scheduled service. God this
 is dumb.

---
 .config/systemd/user/docker-system-prune.service | 10 ++++++++++
 .config/systemd/user/docker-system-prune.timer   |  9 +++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 .config/systemd/user/docker-system-prune.service
 create mode 100644 .config/systemd/user/docker-system-prune.timer

diff --git a/.config/systemd/user/docker-system-prune.service b/.config/systemd/user/docker-system-prune.service
new file mode 100644
index 0000000..e225da2
--- /dev/null
+++ b/.config/systemd/user/docker-system-prune.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Run docker system prune to clear up reserved space. Its super dumb I have to do this.
+After=network.target
+
+[Service]
+ExecStart=docker system prune -a -f
+TimeoutStartSec=3600
+
+[Install]
+WantedBy=default.target
diff --git a/.config/systemd/user/docker-system-prune.timer b/.config/systemd/user/docker-system-prune.timer
new file mode 100644
index 0000000..fd12cc1
--- /dev/null
+++ b/.config/systemd/user/docker-system-prune.timer
@@ -0,0 +1,9 @@
+[Unit]
+Description=Run docker system prune every week.
+
+[Timer]
+OnBootSec=30min
+OnUnitActiveSec=1w
+
+[Install]
+WantedBy=timers.target

From bef6d47dcbfb1844a1b50a3d9952bb64f4c3678d Mon Sep 17 00:00:00 2001
From: josiah <me@jowj.net>
Date: Sun, 13 Nov 2022 10:02:32 -0600
Subject: [PATCH 13/25] Rebind dumb lua default.

---
 .config/awesome/rc.lua | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index 7705dca..735bc04 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -488,16 +488,16 @@ globalkeys = gears.table.join(
        {description = "run prompt", group = "launcher"}),
 
 
-    -- This is maybe something usefull for folks but honestly always gets in my way. Just commenting out.
-    -- awful.key({ modkey }, "x",
-    --    function ()
-    -- 	  awful.prompt.run {
-    -- 	     prompt       = "Run Lua code: ",
-    -- 	     textbox      = awful.screen.focused().mypromptbox.widget,
-    -- 	     exe_callback = awful.util.eval,
-    -- 	     history_path = awful.util.get_cache_dir() .. "/history_eval"
-    -- 	  }
-    -- end)
+    -- This is maybe something usefull for folks but honestly always gets in my way.
+    awful.key({ modkey }, "|",
+       function ()
+	  awful.prompt.run {
+	     prompt       = "Run Lua code: ",
+	     textbox      = awful.screen.focused().mypromptbox.widget,
+	     exe_callback = awful.util.eval,
+	     history_path = awful.util.get_cache_dir() .. "/history_eval"
+	  }
+    end)
 )
        -- {description = "lua execute prompt", group = "awesome"}),
     -- Menubar

From 4ff7a457a5f344cf736c52556d93ab5b8eb3fc0f Mon Sep 17 00:00:00 2001
From: josiah <me@jowj.net>
Date: Sun, 13 Nov 2022 10:02:43 -0600
Subject: [PATCH 14/25] Remove user args; its a user service!

---
 .config/systemd/user/nm-applet.service         | 1 -
 .config/systemd/user/tailscale-systray.service | 1 -
 2 files changed, 2 deletions(-)

diff --git a/.config/systemd/user/nm-applet.service b/.config/systemd/user/nm-applet.service
index 3269f41..8a82b37 100644
--- a/.config/systemd/user/nm-applet.service
+++ b/.config/systemd/user/nm-applet.service
@@ -3,7 +3,6 @@ Description=runs the nm applet for the system tray
 After=network.target
 
 [Service]
-User=josiah
 ExecStart=/run/current-system/sw/bin/nm-applet
 LimitNOFILE=1024
 
diff --git a/.config/systemd/user/tailscale-systray.service b/.config/systemd/user/tailscale-systray.service
index 69359f9..260423d 100644
--- a/.config/systemd/user/tailscale-systray.service
+++ b/.config/systemd/user/tailscale-systray.service
@@ -4,7 +4,6 @@ After=network.target
 Wants=tailscaled.service
 
 [Service]
-User=josiah
 ExecStart=/home/josiah/go/bin/tailscale-systray
 LimitNOFILE=1024
 

From ea65df5fd6f1a417f334b701d35aa589e5e0eccf Mon Sep 17 00:00:00 2001
From: josiah <me@jowj.net>
Date: Sun, 13 Nov 2022 10:03:10 -0600
Subject: [PATCH 15/25] Add rsibreak as a service.

---
 .config/systemd/user/rsibreak.service | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 .config/systemd/user/rsibreak.service

diff --git a/.config/systemd/user/rsibreak.service b/.config/systemd/user/rsibreak.service
new file mode 100644
index 0000000..5fa08ac
--- /dev/null
+++ b/.config/systemd/user/rsibreak.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=runs the nm applet for the system tray
+After=network.target
+
+[Service]
+ExecStart=/run/current-system/sw/bin/rsibreak
+LimitNOFILE=1024
+
+Restart=always
+RestartSec=10
+Environment=DISPLAY=:0
+
+PermissionsStartOnly=true
+
+[Install]
+WantedBy=default.target

From 10268cc02c2e3b3d6a26f330011e6e5932c0f87e Mon Sep 17 00:00:00 2001
From: josiah <me@jowj.net>
Date: Sat, 14 Jan 2023 11:18:51 -0600
Subject: [PATCH 16/25] Update bg.

---
 .config/awesome/jlj-theme.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.config/awesome/jlj-theme.lua b/.config/awesome/jlj-theme.lua
index 7c38d63..8be9889 100644
--- a/.config/awesome/jlj-theme.lua
+++ b/.config/awesome/jlj-theme.lua
@@ -106,7 +106,7 @@ theme.titlebar_maximized_button_normal_active = themes_path.."default/titlebar/m
 theme.titlebar_maximized_button_focus_active  = themes_path.."default/titlebar/maximized_focus_active.png"
 
 -- i edited this thing
-theme.wallpaper = "~/.config/awesome/Hi_Fi_Girl_Remix_by_cycloidbeta.jpg"
+theme.wallpaper = "~/network-share/sainthood/homes/josiah/Photos/backgrounds/convenience store [3840x2160].png"
 theme.awesome_icon = "~/.config/awesome/tiny-purple-bat.png"
 
 -- You can use your own layout icons like this:

From c7b6f3a8e08e4c1ea97b14a818441f460bb712f1 Mon Sep 17 00:00:00 2001
From: josiah <me@jowj.net>
Date: Sat, 14 Jan 2023 11:21:30 -0600
Subject: [PATCH 17/25] Add digikam backup script.

---
 bin/digikam-backup.py | 64 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100755 bin/digikam-backup.py

diff --git a/bin/digikam-backup.py b/bin/digikam-backup.py
new file mode 100755
index 0000000..5e3219d
--- /dev/null
+++ b/bin/digikam-backup.py
@@ -0,0 +1,64 @@
+#!/usr/bin/env python3
+"""Backup digikam files / dbs so I don't lose everything I care about."""
+import argparse
+import sys
+import shutil
+
+FILES = [
+    "/home/josiah/.config/digikam_oauthrc",
+    "/home/josiah/.config/digikamrc",
+    "/home/josiah/.config/digikam_systemrc",
+
+]
+DIRECTORIES = [
+    "/home/josiah/apps/digikam/"
+]
+
+DEST = "/home/josiah/network-share/sainthood/homes/josiah/backups/digikam/"
+
+
+def resolvepath(path):
+    """Resolve and normalize a path
+
+    1.  Handle tilde expansion; turn ~/.ssh into /home/user/.ssh and
+        ~otheruser/bin to /home/otheruser/bin
+    2.  Normalize the path so that it doesn't contain relative segments, turning
+        e.g. /usr/local/../bin to /usr/bin
+    3.  Get the real path of the actual file, resolving symbolic links
+    """
+    return os.path.realpath(os.path.normpath(os.path.expanduser(path)))
+
+
+def idb_excepthook(type, value, tb):
+    """Call an interactive debugger in post-mortem mode
+    If you do "sys.excepthook = idb_excepthook", then an interactive debugger
+    will be spawned at an unhandled exception
+    """
+    if hasattr(sys, 'ps1') or not sys.stderr.isatty():
+        sys.__excepthook__(type, value, tb)
+    else:
+        import pdb, traceback
+        traceback.print_exception(type, value, tb)
+        print
+        pdb.pm()
+
+
+def main(*args, **kwargs):
+    parser = argparse.ArgumentParser(
+        description="")
+    parser.add_argument(
+        "--debug", "-d", action='store_true', help="Include debugging output")
+    
+    parsed = parser.parse_args()
+    if parsed.debug:
+        sys.excepthook = idb_excepthook
+
+    for item in FILES:
+        shutil.copy2(item, DEST)
+
+    for item in DIRECTORIES:
+        shutil.copytree(item, DEST, copy_function=shutil.copy2, dirs_exist_ok=True)         
+            
+
+if __name__ == "__main__":
+    sys.exit(main(*sys.argv))

From bfd8247b3c438cafcd5390dcb1bfb7225076dbad Mon Sep 17 00:00:00 2001
From: josiah <me@jowj.net>
Date: Sat, 14 Jan 2023 11:21:40 -0600
Subject: [PATCH 18/25] Add function to force add existing buffer.

This is mostly useful in the context of my ~/ dir commits. Now I dont
have to shell out myself to do this!
---
 .emacs.d/jlj-generic.el | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.emacs.d/jlj-generic.el b/.emacs.d/jlj-generic.el
index 84e1556..62bca83 100644
--- a/.emacs.d/jlj-generic.el
+++ b/.emacs.d/jlj-generic.el
@@ -261,6 +261,13 @@
   (setq mu4e-view-show-images t))
 
 
+(defun magit-add-current-buffer ()
+  "Adds (with force) the file from the current buffer to the git repo"
+  (interactive)
+  (shell-command (concat "git add -f "
+			 (shell-quote-argument buffer-file-name))))
+
+
 (server-start)
 
 ;;; jlj-generic.el ends here

From ecc9bbc40ac9a4a8c3f0fd4c6857854669490333 Mon Sep 17 00:00:00 2001
From: josiah <me@jowj.net>
Date: Sun, 19 Feb 2023 09:12:12 -0600
Subject: [PATCH 19/25] Minor changes to bashrc file.

---
 .bashrc | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.bashrc b/.bashrc
index 4862012..8057de4 100644
--- a/.bashrc
+++ b/.bashrc
@@ -11,7 +11,7 @@ set completion-ignore-case on # ignore case when tab-completing
 
 source ~/.paths
 export VISUAL=emacsclient
-export editor=emacsclient
+export EDITOR=emacsclient
 
 # blatantly steal micah's ls aliases because they make SO MUCH SENSE omg.
 alias python="python3"
@@ -84,7 +84,7 @@ eval $(keychain --gpg2 --agents gpg)
 
 # host specific configurations:
 if [ "$HOSTNAME" = "hoyden" ]; then
-	printf 'on hoyden, applying nixOS config \n'
+	# printf 'on hoyden, applying nixOS config \n'
 	setxkbmap -option "ctrl:nocaps"
 	fortune invisiblestates/invisiblestates | fold -w 80 -s
 else
@@ -97,11 +97,11 @@ export PS1="\t \[\e[34m\]ǰ \[\e[91m\]☭\[\e[0m\] "
 export CLICOLOR=1
 export LSCOLORS=GxFxCxDxBxegedabagaced
 
-echo ""
-echo "  /'-./\_                |  $HOSTNAME"
-echo " :    ||,>               |"
-echo "  \.-'||                 |  $0"
-echo -e "\e[31m      ||    BURIED\e[0m       |"
-echo -e "\e[31m      ||        HATCHET\e[0m  |  $OSTYPE"
-echo -e "\e[31m      ||\e[0m                 |"
-echo ""
+# echo ""
+# echo "  /'-./\_                |  $HOSTNAME"
+# echo " :    ||,>               |"
+# echo "  \.-'||                 |  $0"
+# echo -e "\e[31m      ||    BURIED\e[0m       |"
+# echo -e "\e[31m      ||        HATCHET\e[0m  |  $OSTYPE"
+# echo -e "\e[31m      ||\e[0m                 |"
+# echo ""

From 7cb3210eccc691245cbbc1400902277b17ba7aff Mon Sep 17 00:00:00 2001
From: josiah <me@jowj.net>
Date: Sun, 19 Feb 2023 09:12:28 -0600
Subject: [PATCH 20/25] Comment out unused GUIX sourcing.

---
 .paths | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.paths b/.paths
index e6dd74f..296e8ae 100644
--- a/.paths
+++ b/.paths
@@ -1,10 +1,11 @@
+
 # find paths inside agares
 export AGARES=${AGARES:-"$HOME/.agares"}
 
 # guix stuff
-export GUIX_LOCPATH=$HOME/.guix-profile/lib/locale
-export GUIX_PROFILE="$HOME/.guix-profile"
-source "$GUIX_PROFILE/etc/profile"
+# export GUIX_LOCPATH=$HOME/.guix-profile/lib/locale
+# export GUIX_PROFILE="$HOME/.guix-profile"
+# source "$GUIX_PROFILE/etc/profile"
 
 # fuck with nix stuff
 export XDG_DATA_DIRS="/home/josiah/.nix-profile/share:$XDG_DATA_DIRS"
@@ -17,5 +18,5 @@ export PATH=/usr/local/share/python:$PATH
 export PATH=/Users/jowj/Library/Python/3.6/bin:$PATH
 export PATH=/home/josiah/.local/bin:$PATH
 export PATH=/home/josiah/.gem/ruby/2.6.0/bin:$PATH
-export PATH=/home/josiah/.config/guix/current/bin/:$PATH
+# export PATH=/home/josiah/.config/guix/current/bin/:$PATH
 export PATH=/home/josiah/go/bin:$PATH

From bc3de3dfc00bfb0014f67579b1bdefa293a5211c Mon Sep 17 00:00:00 2001
From: josiah <me@jowj.net>
Date: Sun, 19 Feb 2023 11:19:48 -0600
Subject: [PATCH 21/25] Remove newline.

---
 .paths | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.paths b/.paths
index 296e8ae..84e9886 100644
--- a/.paths
+++ b/.paths
@@ -1,4 +1,3 @@
-
 # find paths inside agares
 export AGARES=${AGARES:-"$HOME/.agares"}
 

From 706e48d563156f1a793c466d56a73ddfd314742c Mon Sep 17 00:00:00 2001
From: josiah <me@jowj.net>
Date: Sun, 19 Feb 2023 11:19:54 -0600
Subject: [PATCH 22/25] Commment out use-agent post system upgrade.

Seems like this is no longer a needed argument as of gpg-agent 2+?
https://stackoverflow.com/questions/47273922/purpose-of-gpg-agent-in-gpg2

Weird.
---
 .gnupg/gpg-agent.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gnupg/gpg-agent.conf b/.gnupg/gpg-agent.conf
index 2b4a488..2f7b047 100644
--- a/.gnupg/gpg-agent.conf
+++ b/.gnupg/gpg-agent.conf
@@ -3,4 +3,4 @@ max-cache-ttl 31536000
 log-file /var/log/gpg-agent
 debug-level basic
 pinentry-program /run/current-system/sw/bin/pinentry
-use-agent
+#use-agent # commented this out. I did a system upgrade and this argument became inactive.

From f3d46cf8854fd16229e7bf2644c2482576afd4e4 Mon Sep 17 00:00:00 2001
From: josiah <me@jowj.net>
Date: Sun, 19 Feb 2023 11:20:54 -0600
Subject: [PATCH 23/25] Remove --write-env-file arg to gpg-agent.

No longer valid post system upgrade. Not sure I was even using this originally?
---
 .bashrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.bashrc b/.bashrc
index 8057de4..b9a1d23 100644
--- a/.bashrc
+++ b/.bashrc
@@ -75,7 +75,7 @@ fi
 if [ -S "${GPG_AGENT_INFO%%:*}" ]; then
    export GPG_AGENT_INFO
 else
-   eval $( gpg-agent --daemon --write-env-file ~/.gpg-agent-info )
+   eval $( gpg-agent --daemon )
 fi
 
 ## then configure keychain

From 6cfe8ff1caf083ee3a12bb59a5ce662de43952b5 Mon Sep 17 00:00:00 2001
From: josiah <me@jowj.net>
Date: Sun, 19 Feb 2023 11:27:54 -0600
Subject: [PATCH 24/25] Move shell specific stuff to only run under non
 loginshell.

Some prints, some shell prettification, etc.
---
 .bashrc | 40 ++++++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/.bashrc b/.bashrc
index b9a1d23..0c3e2e4 100644
--- a/.bashrc
+++ b/.bashrc
@@ -83,25 +83,33 @@ eval $(keychain --eval --quiet ~/.ssh/{awful-git,github,digitalocean,home-net})
 eval $(keychain --gpg2 --agents gpg)
 
 # host specific configurations:
-if [ "$HOSTNAME" = "hoyden" ]; then
-	# printf 'on hoyden, applying nixOS config \n'
+if [[ $(shopt login_shell | cut -f2) == "on" ]]
+then
+    : # this is a no op cmd in bash, i guess. GOD.
+
+else
+    if [ "$HOSTNAME" = "hoyden" ]; then
+	printf 'on hoyden, applying nixOS config \n'
 	setxkbmap -option "ctrl:nocaps"
 	fortune invisiblestates/invisiblestates | fold -w 80 -s
-else
+    else
 	printf 'regular config\n'
+    fi
+
+    # this looks like garbage but its just color initation and termination
+    export PS1="\t \[\e[34m\]ǰ \[\e[91m\]☭\[\e[0m\] "
+
+    export CLICOLOR=1
+    export LSCOLORS=GxFxCxDxBxegedabagaced
+
+    echo ""
+    echo "  /'-./\_                |  $HOSTNAME"
+    echo " :    ||,>               |"
+    echo "  \.-'||                 |  $0"
+    echo -e "\e[31m      ||    BURIED\e[0m       |"
+    echo -e "\e[31m      ||        HATCHET\e[0m  |  $OSTYPE"
+    echo -e "\e[31m      ||\e[0m                 |"
+    echo ""
 fi
 
-# this looks like garbage but its just color initation and termination
-export PS1="\t \[\e[34m\]ǰ \[\e[91m\]☭\[\e[0m\] "
-
-export CLICOLOR=1
-export LSCOLORS=GxFxCxDxBxegedabagaced
 
-# echo ""
-# echo "  /'-./\_                |  $HOSTNAME"
-# echo " :    ||,>               |"
-# echo "  \.-'||                 |  $0"
-# echo -e "\e[31m      ||    BURIED\e[0m       |"
-# echo -e "\e[31m      ||        HATCHET\e[0m  |  $OSTYPE"
-# echo -e "\e[31m      ||\e[0m                 |"
-# echo ""

From fcde0d69a12ee20591df3d656f6a9ce83047faa5 Mon Sep 17 00:00:00 2001
From: josiah <me@jowj.net>
Date: Sun, 19 Feb 2023 11:37:18 -0600
Subject: [PATCH 25/25] Fix invisible states.

---
 .bashrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.bashrc b/.bashrc
index 0c3e2e4..1f15e91 100644
--- a/.bashrc
+++ b/.bashrc
@@ -91,7 +91,7 @@ else
     if [ "$HOSTNAME" = "hoyden" ]; then
 	printf 'on hoyden, applying nixOS config \n'
 	setxkbmap -option "ctrl:nocaps"
-	fortune invisiblestates/invisiblestates | fold -w 80 -s
+	fortune ~/bin/fortunate/invisiblestates/invisiblestates | fold -w 80 -s
     else
 	printf 'regular config\n'
     fi