Configuration file updates and additions.

23 files changed, 425 insertions, 170 deletions

diff --git a/.config/calcurse/caldav/config b/.config/calcurse/caldav/config
new file mode 100644
index 0000000..75dfada
--- /dev/null
+++ b/.config/calcurse/caldav/config
@@ -0,0 +1,13 @@
+[General]
+Binary = calcurse
+Hostname = radicale.chudnick.com:443
+Path = /sam/d1b7aa05-a00b-cb40-bdef-b6ed70a23944/
+AuthMethod = basic
+InsecureSSL = No
+HTTPS = Yes
+DryRun = No
+Verbose = Yes
+SyncFilter = cal
+
+[Auth]
+Username = sam
diff --git a/.config/calcurse/conf b/.config/calcurse/conf
index b46b0a7..ecf4bba 100644
--- a/.config/calcurse/conf
+++ b/.config/calcurse/conf
@@ -1,13 +1,13 @@
 appearance.calendarview=monthly
 appearance.compactpanels=no
-appearance.defaultpanel=calendar
+appearance.defaultpanel=todo
 appearance.layout=5
 appearance.notifybar=yes
-appearance.sidebarwidth=2
-appearance.theme=blue on default
+appearance.sidebarwidth=22
+appearance.theme=cyan on default
 appearance.todoview=hide-completed
 appearance.headingpos=right-justified
-daemon.enable=no
+daemon.enable=yes
 daemon.log=no
 format.inputdate=1
 format.notifydate=%a %F
@@ -19,10 +19,10 @@ general.autosave=yes
 general.confirmdelete=yes
 general.confirmquit=no
 general.firstdayofweek=monday
-general.periodicsave=0
-general.systemdialogs=yes
-notification.command=printf '\a'
-notification.notifyall=flagged-only
+general.periodicsave=10
+general.systemdialogs=no
+notification.command=notify-send "Upcoming Appointment"
+notification.notifyall=all
 notification.warning=300
 appearance.headerline=yes
 appearance.eventseparator=yes
diff --git a/.config/calcurse/hooks/post-save b/.config/calcurse/hooks/post-save
new file mode 100755
index 0000000..8836316
--- /dev/null
+++ b/.config/calcurse/hooks/post-save
@@ -0,0 +1,47 @@
+#!/bin/sh
+#
+# This is an example hook. It does two things whenever you save the data files:
+#
+# 1. Make a commit if the calcurse directories contain a Git repository.
+# 2. Synchronize with a CalDAV server if calcurse-caldav is configured.
+#
+# In order to install this hook, copy this file to
+# $XDG_CONFIG_HOME/calcurse/hooks/ (~/.config/calcurse/hooks/) or
+# ~/.calcurse/hooks/ if using ~/.calcurse.
+
+data_dir="$HOME/.calcurse"
+config_dir="$HOME/.calcurse"
+
+if [ ! -d "$data_dir" ]; then
+        data_dir="${XDG_DATA_HOME:-$HOME/.local/share}/calcurse"
+        config_dir="${XDG_CONFIG_HOME:-$HOME/.config}/calcurse"
+fi
+
+# Do not do anything when synchronizing with a CalDAV server.
+[ -f "$data_dir/caldav/lock" ] && exit
+
+# If the directory is under version control, create a Git commit.
+commit_dir() {
+        cd "$1" >/dev/null 2>&1 || return
+        shift
+        if [ -d .git ] && command -v git >/dev/null; then
+                git add "$@"
+                if ! git diff-index --quiet --cached HEAD; then
+                        git commit -m "Automatic commit by the post-save hook"
+                fi
+        fi
+}
+
+commit_dir "$data_dir" apts todo
+commit_dir "$config_dir" conf keys
+
+# Optionally run the CalDAV synchronization script in the background.
+cd "$data_dir" || exit
+if [ -d caldav ] && command -v calcurse-caldav >/dev/null; then
+        (
+                date="$(date +'%b %d %H:%M:%S')"
+                echo "$date Running calcurse-caldav from the post-save hook..."
+                CALCURSE_CALDAV_PASSWORD=$(pass show web/radicale.chudnick.com | head -1) calcurse-caldav
+                echo
+        ) >>caldav/log 2>&1 &
+fi
diff --git a/.config/calcurse/hooks/pre-load b/.config/calcurse/hooks/pre-load
new file mode 100755
index 0000000..dc25771
--- /dev/null
+++ b/.config/calcurse/hooks/pre-load
@@ -0,0 +1,17 @@
+#!/bin/sh
+[ -d "$HOME/.calcurse" ] && data_dir="$HOME/.calcurse" || data_dir="${XDG_DATA_HOME:-$HOME/.local/share}/calcurse"
+
+cd "$data_dir" || exit
+
+# Do not do anything when synchronizing with a CalDAV server.
+[ -f caldav/lock ] && exit
+
+# Run the CalDAV synchronization script in the background.
+if [ -d caldav ] && command -v calcurse-caldav >/dev/null; then
+        (
+                date="$(date +'%b %d %H:%M:%S')"
+                echo "$date Running calcurse-caldav from the pre-load hook..."
+                CALCURSE_CALDAV_PASSWORD=$(pass web/radicale.chudnick.com | head -1) calcurse-caldav
+                echo
+        ) >>caldav/log 2>&1 &
+fi
diff --git a/.config/calcurse/keys b/.config/calcurse/keys
index 301d367..0f5ee8d 100644
--- a/.config/calcurse/keys
+++ b/.config/calcurse/keys
@@ -27,7 +27,7 @@ generic-add-todo  ^T
 generic-prev-day  T ^H 
 generic-next-day  t ^L 
 generic-prev-week  W ^K 
-generic-next-week  w RET 
+generic-next-week  w 
 generic-prev-month  M 
 generic-next-month  m 
 generic-prev-year  Y 
@@ -45,7 +45,7 @@ end-of-week  $
 add-item  a A 
 del-item  d D 
 edit-item  e E 
-view-item  v V 
+view-item  v V RET 
 pipe-item  | 
 flag-item  ! 
 repeat  r 
diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc
index fda72f3..efb0582 100644
--- a/.config/dunst/dunstrc
+++ b/.config/dunst/dunstrc
@@ -5,12 +5,12 @@
     geometry = "0x5-2+25"
     indicate_hidden = yes
     shrink = no
-    transparency = 10
+    #transparency = 10
     notification_height = 0
     separator_height = 2
     padding = 8
     horizontal_padding = 8
-    frame_width = 3
+    #frame_width = 3
     frame_color = "#666666"
     separator_color = frame
     sort = yes
diff --git a/.config/firejail/firefox.profile b/.config/firejail/firefox.profile
index 158cf24..8031c85 100644
--- a/.config/firejail/firefox.profile
+++ b/.config/firejail/firefox.profile
@@ -23,29 +23,65 @@ whitelist /usr/share/gtk-doc/html
 whitelist /usr/share/mozilla
 whitelist /usr/share/webext
 whitelist ${HOME}/repos/website
+whitelist ${HOME}/repos/homelab_iac/docs
 whitelist ${HOME}/documents/local_webpages/
+whitelist ${HOME}/documents/downloads/
+whitelist ${HOME}/documents/isos/
+read-only ${HOME}/documents/isos
 include whitelist-usr-share-common.inc
 
-# firefox requires a shell to launch on Arch.
-#private-bin bash,dbus-launch,dbus-send,env,firefox,sh,which
-# Fedora use shell scripts to launch firefox, at least this is required
-#private-bin basename,bash,cat,dirname,expr,false,firefox,firefox-wayland,getenforce,ln,mkdir,pidof,restorecon,rm,rmdir,sed,sh,tclsh,true,uname
-# private-etc must first be enabled in firefox-common.profile
-#private-etc firefox
+# Access to GPG and (limited-scope) passwords for browserpass
+writable-run-user
+noblacklist ${HOME}/.gnupg
+whitelist ${HOME}/.gnupg
+noblacklist ${RUNUSER}/gnupg
+
+noblacklist ${HOME}/.local/share/password-store
+whitelist ${HOME}/.local/share/password-store/web
+whitelist ${HOME}/.local/share/password-store/homelab/user
+whitelist ${HOME}/.local/share/password-store/homelab/proxmox
+whitelist ${HOME}/.local/share/password-store/homelab/proxmox-backup
 
 dbus-user filter
 dbus-user.own org.mozilla.Firefox.*
 dbus-user.own org.mozilla.firefox.*
 dbus-user.own org.mpris.MediaPlayer2.firefox.*
-# Uncomment or put in your firefox.local to enable native notifications.
-#dbus-user.talk org.freedesktop.Notifications
-# Uncomment or put in your firefox.local to allow to inhibit screensavers
-#dbus-user.talk org.freedesktop.ScreenSaver
-# Uncomment or put in your firefox.local for plasma browser integration
-#dbus-user.own org.mpris.MediaPlayer2.plasma-browser-integration
-#dbus-user.talk org.kde.JobViewServer
-#dbus-user.talk org.kde.kuiserver
 ignore dbus-user none
 
-# Redirect
-include firefox-common.profile
+noblacklist ${HOME}/.pki
+noblacklist ${HOME}/.local/share/pki
+mkdir ${HOME}/.pki
+mkdir ${HOME}/.local/share/pki
+whitelist ${DOWNLOADS}
+whitelist ${HOME}/.pki
+whitelist ${HOME}/.local/share/pki
+include whitelist-common.inc
+include whitelist-var-common.inc
+
+apparmor
+caps.drop all
+#machine-id
+netfilter
+nodvd
+nogroups
+nonewprivs
+noroot
+notv
+?BROWSER_DISABLE_U2F: nou2f
+protocol unix,inet,inet6,netlink
+seccomp !chroot
+shell none
+disable-mnt
+?BROWSER_DISABLE_U2F: private-dev
+private-tmp
+dbus-user none
+dbus-system none
+
+include disable-common.inc
+include disable-devel.inc
+include disable-exec.inc
+include disable-interpreters.inc
+include disable-programs.inc
+
+# Breaks GPG when enabled
+#include whitelist-runuser-common.inc
diff --git a/.config/firejail/jellyfinmediaplayer.profile b/.config/firejail/jellyfinmediaplayer.profile
new file mode 100644
index 0000000..3575ec6
--- /dev/null
+++ b/.config/firejail/jellyfinmediaplayer.profile
@@ -0,0 +1,30 @@
+include globals.local
+
+name jellyfinmediaplayer
+
+dbus-user filter
+ignore dbus-user none
+
+apparmor
+caps.drop all
+netfilter
+nodvd
+nogroups
+nonewprivs
+noroot
+notv
+protocol unix,inet,inet6,netlink
+seccomp !chroot
+shell none
+disable-mnt
+private-tmp
+private-dev
+dbus-user none
+dbus-system none
+
+include disable-common.inc
+include disable-devel.inc
+include disable-exec.inc
+include disable-interpreters.inc
+include disable-programs.inc
+include disable-shell.inc
diff --git a/.config/firejail/neomutt.profile b/.config/firejail/neomutt.profile
index 0a43c6f..0934bd1 100644
--- a/.config/firejail/neomutt.profile
+++ b/.config/firejail/neomutt.profile
@@ -16,6 +16,7 @@ whitelist ${HOME}/.mbsyncrc
 whitelist ${HOME}/.config/mbsync
 whitelist ${HOME}/.config/msmtp
 whitelist ${HOME}/.w3m
+whitelist ${HOME}/attachments
 
 noblacklist ${HOME}/.Mail
 noblacklist ${HOME}/.cache/mutt
@@ -31,22 +32,25 @@ noblacklist ${HOME}/.mbsyncrc
 noblacklist ${HOME}/.config/mbsync
 noblacklist ${HOME}/.config/msmtp
 noblacklist ${HOME}/.w3m
+whitelist ${HOME}/attachments
 
 # Access to GPG for encrypting/decrypting/signing mail and passwords with pass
-whitelist ${HOME}/.gnupg
 noblacklist ${HOME}/.gnupg
-whitelist ${RUNUSER}/gnupg
+whitelist ${HOME}/.gnupg
+noblacklist ${RUNUSER}/gnupg
 
 # This assumes you keep mail account passwords under a separate directory named mail
 # This to avoid exposing all passwords to the sandbox, only necessary ones
+noblacklist ${HOME}/.local/share/password-store
 whitelist ${HOME}/.local/share/password-store/mail
-noblacklist ${HOME}/.local/share/password-store/mail
 
 # abook
 whitelist ${HOME}/.config/abook
 whitelist ${HOME}/.local/share/abook
 
+# Breaks GPG when enabled
 #include whitelist-runuser-common.inc
+
 writable-run-user
 blacklist /tmp/.X11-unix
 blacklist ${RUNUSER}/wayland-*
diff --git a/.config/firejail/newsboat.profile b/.config/firejail/newsboat.profile
index 0de5928..ebdc76e 100644
--- a/.config/firejail/newsboat.profile
+++ b/.config/firejail/newsboat.profile
@@ -24,6 +24,16 @@ include whitelist-common.inc
 include whitelist-runuser-common.inc
 include whitelist-var-common.inc
 
+# Access to GPG for encrypting/decrypting/signing mail and passwords with pass
+noblacklist ${HOME}/.gnupg
+whitelist ${HOME}/.gnupg
+noblacklist ${RUNUSER}/gnupg
+
+# This assumes you keep mail account passwords under a separate directory named mail
+# This to avoid exposing all passwords to the sandbox, only necessary ones
+noblacklist ${HOME}/.local/share/password-store
+whitelist ${HOME}/.local/share/password-store/homelab/freshrss
+
 caps.drop all
 ipc-namespace
 netfilter
diff --git a/.config/fontconfig/fonts.conf b/.config/fontconfig/fonts.conf
index 7512ee5..e331f40 100644
--- a/.config/fontconfig/fonts.conf
+++ b/.config/fontconfig/fonts.conf
@@ -6,7 +6,6 @@
                 <prefer>
                         <family>Liberation Serif</family>
                         <family>DejaVu Serif</family>
-                        <family>Noto Color Emoji</family>
                 </prefer>
         </alias>
         <alias>
@@ -14,7 +13,6 @@
                 <prefer>
                         <family>Liberation Sans</family>
                         <family>DejaVu Sans</family>
-                        <family>Noto Color Emoji</family>
                 </prefer>
         </alias>
         <alias>
@@ -26,3 +24,4 @@
                 </prefer>
         </alias>
 </fontconfig>
+
diff --git a/.config/htop/htoprc b/.config/htop/htoprc
index 4f6016b..0e89964 100644
--- a/.config/htop/htoprc
+++ b/.config/htop/htoprc
@@ -1,10 +1,10 @@
 # Beware! This file is rewritten by htop when settings are changed in the interface.
 # The parser is also very primitive, and not human-friendly.
 fields=0 48 20 46 47 1
-sort_key=47
-sort_direction=1
-tree_sort_key=0
-tree_sort_direction=1
+sort_key=46
+sort_direction=-1
+tree_sort_key=46
+tree_sort_direction=-1
 hide_kernel_threads=1
 hide_userland_threads=1
 shadow_other_users=0
diff --git a/.config/khard/khard.conf b/.config/khard/khard.conf
new file mode 100644
index 0000000..7360d68
--- /dev/null
+++ b/.config/khard/khard.conf
@@ -0,0 +1,16 @@
+[addressbooks]
+[[contacts]]
+path = ~/.local/share/contacts/8fa0195e-936e-5bb0-7ea2-2410d65cb3da
+
+[general]
+debug = no
+default_action = list
+editor = vim
+merge_editor = vimdiff
+
+[contact table]
+display = first_name
+sort = last_name
+localize_dates = yes
+preferred_phone_number_type = pref, cell, home
+preferred_email_address_type = pref, work, home
diff --git a/.config/mutt/gruvbox b/.config/mutt/gruvbox
new file mode 100644
index 0000000..97a74a7
--- /dev/null
+++ b/.config/mutt/gruvbox
@@ -0,0 +1,87 @@
+# bg     = 235 <
+# bg0    = 234
+# bg1    = 237
+# bg2    = 239
+# bg3    = 241
+# bg4    = 243
+#
+# gray   = 245
+#
+# fg0    = 229
+# fg1    = 223 <
+# fg2    = 250
+# fg3    = 248
+# fg4    = 246
+#
+# red    = 167
+# green  = 142
+# yellow = 214
+# blue   = 109
+# purple = 175
+# aqua   = 108
+# orange = 208
+
+
+# See http://www.mutt.org/doc/manual/#color
+
+color attachment color109 color235
+color bold       color229 color215
+color error      color167 color235
+color hdrdefault color246 color235
+color indicator  color223 color238
+color markers    color243 color235
+color normal     color223 color235
+color quoted     color248 color235
+color quoted1    color108 color235
+color quoted2    color248 color235
+color quoted3    color108 color235
+color quoted4    color248 color235
+color quoted5    color108 color235
+color search     color235 color208
+color signature  color108 color235
+color status     color235 color246
+color tilde      color243 color235
+color tree       color246 color235
+color underline  color223 color239
+
+color sidebar_divider   color246 color235
+color sidebar_new       color142 color235
+color sidebar_unread    color142 color235
+color sidebar_highlight color208 color235
+
+color index_number  color240       color235
+color index_author  color214       color235 '.*'
+color index_subject color142       color235 '.*'
+color index         brightcolor223 color235 '~N'
+color index_flags   brightcolor142 color235 '~N'
+color index_author  brightcolor214 color235 '~N'
+color index_subject brightcolor142 color235 '~N'
+color index         color240       color235 '~D'
+color index_flags   color167       color235 '~D'
+color index_author  color240       color235 '~D'
+color index_subject color240       color235 '~D'
+
+color header color214 color235 "^From:"
+color header color208 color235 "^(To:|Cc:)"
+color header color142 color235 "^Subject:"
+color header color108 color235 "^X-Spam-Status:"
+color header color108 color235 "^Received:"
+
+color compose header           color223 color235
+color compose security_encrypt color175 color235
+color compose security_sign    color109 color235
+color compose security_both    color142 color235
+color compose security_none    color208 color235
+
+# URL
+color body color175 color235 "[a-z]{3,256}://[-a-zA-Z0-9@:%._\\+~#=/?&,]+"
+# email
+color body color208 color235 "[-a-z_0-9.%$]+@[-a-z_0-9.]+\\.[-a-z][-a-z]+"
+# mailto link
+color body color208 color235 "mailto:[-a-z_0-9.]+@[-a-z_0-9.]+"
+# smileys
+color body color235 color214 "[;:]-[)(pPsS\|D]"
+# *bold*
+color body color229 color235 "\\*[-' A-Za-z0-9]+\\*"
+
+# vim: filetype=neomuttrc
diff --git a/.config/mutt/muttrc b/.config/mutt/muttrc
index b70ba64..2bc952a 100644
--- a/.config/mutt/muttrc
+++ b/.config/mutt/muttrc
@@ -123,27 +123,7 @@ unhdr_order *
 hdr_order Authentication-Results: From: To: Subject: Date:
 
 ### Colors
-mono bold bold
-mono underline underline
-mono indicator reverse
-mono error bold
-### Index
-color index white default "~A"
-color index_number blue default
-color index_author blue default "~A"
-color index_subject blue default "~A"
-# New
-color index brightyellow default "~N"
-color index_author underline brightblue default "~N"
-color index_subject underline brightblue default "~N"
-# Tagged
-color index brightwhite blue "~T"
-color index_author brightwhite blue "~T"
-color index_subject brightwhite blue "~T"
-### Header
-color hdrdefault blue default
-color header brightred default "^From:"
-color header brightred default "^Subject:"
+source /home/sam/.config/mutt/gruvbox
 # highlight authentication headers based on pass/fail/none
 color header green default "dkim=pass"
 color header green default "spf=pass"
@@ -154,18 +134,5 @@ color header yellow default "dmarc=none"
 color header brightred default "dkim=fail"
 color header brightred default "spf=fail"
 color header brightred default "dmarc=fail"
-### Body
-color body default default ".*"
-### Sidebar
-
-### Other
-color normal default default
-color tilde default default
-color status default black
-color signature default default
-color attachment default default
-color message default default
-color quoted green default
-color search brightred default
 
 source /home/sam/.config/mutt/accounts/sam
diff --git a/.config/newsboat/config b/.config/newsboat/config
new file mode 100644
index 0000000..174db0b
--- /dev/null
+++ b/.config/newsboat/config
@@ -0,0 +1,35 @@
+freshrss-login "sam"
+freshrss-passwordeval "pass homelab/freshrss_api"
+freshrss-url "https://rss.chudnick.com/api/greader.php"
+urls-source "freshrss"
+
+refresh-on-startup yes
+
+bind-key h quit
+bind-key j down
+bind-key k up
+bind-key l open
+bind-key j next articlelist
+bind-key k prev articlelist
+bind-key G end
+bind-key g home
+bind-key d pagedown
+bind-key u pageup
+
+bind-key n next-unread
+bind-key N prev-unread
+
+highlight all "---.*---" yellow
+highlight feedlist ".*(0/0))" black
+highlight article "(^Feed:.*|^Title:.*|^Author:.*)" cyan default bold
+highlight article "(^Link:.*|^Date:.*)" default default
+highlight article "https?://[^ ]+" green default
+highlight article "^(Title):.*$" blue default
+highlight article "\\[[0-9][0-9]*\\]" magenta default bold
+highlight article "\\[image\\ [0-9]+\\]" green default bold
+highlight article "\\[embedded flash: [0-9][0-9]*\\]" green default bold
+highlight article ":.*\\(link\\)$" cyan default
+highlight article ":.*\\(image\\)$" blue default
+highlight article ":.*\\(embedded flash\\)$" magenta default
+
+
diff --git a/.config/picom/picom.conf b/.config/picom/picom.conf
index 4723dcd..e74baf2 100644
--- a/.config/picom/picom.conf
+++ b/.config/picom/picom.conf
@@ -1,5 +1,30 @@
-opacity-rule = [ 
-        "90:class_g = 'URxvt'",
-        "90:class_g = 'Steam'",
-        "95:class_g = 'KeePassXC'"
-];
+shadow = true;
+
+vsync = true;
+
+shadow-radius = 15;
+#shadow-offset-x = -10;
+#shadow-offset-y = -10;
+shadow-opacity = 0.7;
+shadow-ignore-shaped = false;
+shadow-exclude = [ "class_g = 'dwm'",
+                                   "class_g = 'Firefox-esr'",
+                                   "class_g = 'dmenu'"];
+
+inactive-opacity = 0.9;
+active-opacity = 1.0;
+frame-opacity = 1.0;
+inactive-opacity-override = false;
+inactive-dim = 0.1;
+opacity-rule = ["100:class_g = 'dwm'",
+                                "100:class_g = 'Firefox-esr'",
+                                "100:class_g = 'dmenu'"];
+
+fading = true;
+fade-delta = 5;
+fade-in-step = 0.3;
+fade-out-step = 0.3;
+
+corner-radius = 10;
+rounded-corners-exclude = ["class_g = 'dwm'",
+                                                   "class_g = 'dmenu'"]
diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc
index eb39dd0..a073b76 100644
--- a/.config/shell/aliasrc
+++ b/.config/shell/aliasrc
@@ -1,5 +1,4 @@
 #!/bin/sh
-
 # Add color to commands 
 alias \
         diff="diff --color=auto" \
@@ -14,7 +13,7 @@ alias \
 alias \
         g='git' \
         ga='git add' \
-        gc='git commit -e -m' \
+        gc='git commit -m' \
         gd='git diff' \
         gl='git log' \
         gp='git push' \
@@ -29,6 +28,8 @@ alias \
 
 # Shorten other commands
 alias \
+        ap="ansible-playbook -i inventory.yml -b --ask-vault-pass" \
+        calsync='CALCURSE_CALDAV_PASSWORD=$(pass show web/radicale.chudnick.com | head -1) calcurse-caldav' \
     ports="ss -tuanp" \
     py="python3" \
     rb="/usr/sbin/reboot" \
@@ -36,19 +37,17 @@ alias \
     sx="startx" \
     svm="sudo systemctl start libvirtd" \
     v="vim" \
-    yta="youtube-dl -f bestaudio --download-archive ~/media/youtube/archive" \
-    ytv="youtube-dl -f bestvideo[height\<=1080]+bestaudio/best[height\<=1080] --download-archive ~/media/youtube/archive" \
-        z="zathura"
+    yta="yt-dlp -f bestaudio --remux-video ogg --download-archive ~/.local/share/yt-dlp/archive" \
+    ytv="yt-dlp -f bestvideo\[height\<=1080\]+bestaudio/best\[height\<=1080\] --download-archive ~/.local/share/yt-dlp/archive" \
+        z="zathura" \
+        revert='virsh snapshot-revert web --snapshotname $(virsh snapshot-current web --name)'
 
 # Start commands with specific options always
 alias \
         abook="abook --config ~/.config/abook/abookrc --datafile ~/.local/share/abook/addressbook" \
-        calcurse="calcurse -D ~/.config/calcurse" \
         cp="cp -iv" \
         ffmpeg="ffmpeg -hide_banner" \
     mv="mv -iv" \
         mutt="firejail neomutt"
         neomutt="firejail neomutt" \
-    rm="rm -Iv"
-
-source $XDG_CONFIG_HOME/shell/private-aliasrc
+    rm="rm -Iv" \
diff --git a/.config/sxhkd/sxhkdrc b/.config/sxhkd/sxhkdrc
index fb46187..3e8b165 100644
--- a/.config/sxhkd/sxhkdrc
+++ b/.config/sxhkd/sxhkdrc
@@ -1,6 +1,6 @@
 # Lock screen 
 super + shift + x
-        lock
+        slock
 
 # Take a screenshot
 super + Print  
@@ -14,7 +14,7 @@ super + F1
 
 # Cmus Bindings
 super + m  
-        urxvt -name "cmus" -e cmus; pkill -RTMIN+12 dwmblocks
+        st -name "cmus" -e cmus; pkill -RTMIN+12 dwmblocks
 super + shift + m  
         cmus-remote --raw q; pkill -RTMIN+12 dwmblocks
 super + {comma, greater, less}
@@ -34,27 +34,25 @@ super + backslash
 
 # Program Bindings
 super + q
-        urxvt -e htop
+        st -e htop
 super + w
         wireshark
 super + e
-        urxvt -e firejail neomutt
+        ~/.local/bin/getmail & st -e firejail neomutt
 super + shift + e
         ~/.local/bin/getmail
 super + r
-        urxvt -e firejail newsboat 
+        st -e newsboat 
 super + a
-        urxvt -e calcurse -D ~/.config/calcurse
-super + s
-        firejail steam
-super + shift + s
-        kill-steam
+        st -e calcurse
 super + d
         dmenu_run
 super + f
         firejail firefox
 super + shift + f
         firefox
+super + g
+        moonlight
 super + z
         $HOME/.local/bin/getpass
 super + shift + z
@@ -62,11 +60,9 @@ super + shift + z
 super + x
         keepassxc
 super + c
-        urxvt -e clibrary
-super + v
-        virt-manager
+        firejail jellyfinmediaplayer
 super + Return  
-        urxvt
+        tabbed st -w
 
 # Function Key Bindings
 
diff --git a/.config/x11/xinitrc b/.config/x11/xinitrc
index 49ab403..44c8e32 100644
--- a/.config/x11/xinitrc
+++ b/.config/x11/xinitrc
@@ -2,25 +2,34 @@
 xset s off
 # disable power saving
 xset -dpms
-# set refresh rate
-xrandr -r 144
+# load Xresources
+xrdb ~/.config/x11/xresources
+# initialize primary monitor
+xrandr --output DisplayPort-0 --primary -r 144
+# initialize secondary monitor
+xrandr --output HDMI-A-1 --auto --right-of DisplayPort-0 --mode 3840x2160
 # set background
 bgscript
 # remap keys
 kbremaps
-# load Xresources
-xrdb ~/.config/x11/xresources
+# load rgb profile
+openrgb --profile ~/.config/OpenRGB/Gruvbox.orp &
 # start compositor
 picom --config ~/.config/picom/picom.conf &
 # start notification daemon
 dunst &
+# start calendar
+calcurse --daemon &
 # start unclutter
 unclutter &
 # start keybind daemon
 sxhkd &
-# start status bar 
-dwmblocks &
 # initialize identity management programs
-urxvt -e id-init & 
+st -e id-init & 
+# run statusbar script
+~/.local/bin/bar &
 # start window manager
-dwm
+while true
+do
+        /usr/local/bin/dwm 2> /tmp/dwm_errors
+done
diff --git a/.config/x11/xresources b/.config/x11/xresources
index 33df06e..f755415 100644
--- a/.config/x11/xresources
+++ b/.config/x11/xresources
@@ -1,63 +1,26 @@
-URxvt.scrollBar:        false
-*.font:         xft:monospace:size=12
-
-! Brogrammer
-*.foreground:  #d6dbe5
-*.background:  #131313
-*.color0:      #1f1f1f
-*.color1:      #f81118
-*.color2:      #2dc55e
-*.color3:      #ecba0f
-*.color4:      #2a84d2
-*.color5:      #4e5ab7
-*.color6:      #1081d6
-*.color7:      #d6dbe5
-*.color8:      #d6dbe5
-*.color9:      #de352e
-*.color10:     #1dd361
-*.color11:     #f3bd09
-*.color12:     #1081d6
-*.color13:     #5350b9
-*.color14:     #0f7ddb
-*.color15:     #ffffff
-*.colorBD:     #d6dbe5
-
-! Dracula
-!*.foreground: #F8F8F2
-!*.background: #282A36
-!*.color0:     #000000
-!*.color8:     #4D4D4D
-!*.color1:     #FF5555
-!*.color9:     #FF6E67
-!*.color2:     #50FA7B
-!*.color10:    #5AF78E
-!*.color3:     #F1FA8C
-!*.color11:    #F4F99D
-!*.color4:     #BD93F9
-!*.color12:    #CAA9FA
-!*.color5:     #FF79C6
-!*.color13:    #FF92D0
-!*.color6:     #8BE9FD
-!*.color14:    #9AEDFE
-!*.color7:     #BFBFBF
-!*.color15:    #E6E6E6
-
 ! Gruvbox
-!*.color0: #1d2021
-!*.color1: #cc241d
-!*.color2: #98971a
-!*.color3: #d79921
-!*.color4: #458588
-!*.color5: #b16286
-!*.color6: #689d6a
-!*.color7: #a89984
-!*.color8: #928374
-!*.color9: #fb4934
-!*.color10: #b8bb26
-!*.color11: #fabd2f
-!*.color12: #83a598
-!*.color13: #d3869b
-!*.color14: #8ec07c
-!*.color15: #ebdbb2
-!*.color256: #1d2021
-!*.color257: #ebdbb2
+*.color0: #1d2021
+*.color1: #cc241d
+*.color2: #98971a
+*.color3: #d79921
+*.color4: #458588
+*.color5: #b16286
+*.color6: #689d6a
+*.color7: #a89984
+*.color8: #928374
+*.color9: #fb4934
+*.color10: #b8bb26
+*.color11: #fabd2f
+*.color12: #83a598
+*.color13: #d3869b
+*.color14: #8ec07c
+*.color15: #ebdbb2
+*.background: #282828
+*.foreground: white
+*.cursorColor: white
+*.alpha: 1.0
+dmenu.background: #282828
+dmenu.foreground: #ebdbb2
+dmenu.selbackground: #ebdbb2
+dmenu.selforeground: #282828
+Xcursor.size: 16
diff --git a/.config/zsh/.zprofile b/.config/zsh/.zprofile
index 3453af6..b3a4ec6 100644
--- a/.config/zsh/.zprofile
+++ b/.config/zsh/.zprofile
@@ -12,7 +12,7 @@ export PATH=$PATH:~/.local/bin:~/.local/bin/cryptusb:~/.local/bin/private:~/.loc
 # Defaults
 export BROWSER="firefox"
 export EDITOR="vim"
-export TERMINAL="urxvt"
+export TERMINAL="st"
 
 # Other vars
 export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index 30e3f64..b18b29c 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -6,6 +6,8 @@ source ~/.config/shell/shortcutsrc
 HISTSIZE=100000000
 SAVEHIST=100000000
 HISTFILE="$HOME/.cache/zsh/history"
+# Show all history
+alias history="history 0"
 
 # Shell options
 bindkey -v