9 files changed, 38 insertions, 210 deletions
diff --git a/dotfiles/system/.Xresources b/dotfiles/system/.Xresources
index fb81dfb..d149a72 100644
--- a/dotfiles/system/.Xresources
+++ b/dotfiles/system/.Xresources
@@ -1,16 +1,11 @@
-!! X Font Settings
+!! X Resources - Dupre theme
+!! Warm, earthy colors from dupre-theme.el
+!! For X11 applications (st, xterm, etc.) and Emacs
 
-!! below is the framework desktop's ultrawide monitor dpi
-! Xft.dpi: 192
-!! below is the framework laptop dpi
-! Xft.dpi: 144
-!! ultrawide monitor dpi
+!! X Font Settings
 Xft.dpi: 109
-
-!! cursor settings
 Xcursor.size: 32
 Xcursor.theme: Vimix-white-cursors
-
 Xft.autohint: 0
 Xft.lcdfilter: lcddefault
 Xft.hintstyle: hintfull
@@ -21,53 +16,30 @@ Xft.rgba: rgb
 !! Emacs
 Emacs*toolBar: 0
 
-!! Transparency (0-1):
-!! *.alpha: 0.8
-
 !! ============================================================================
-!! COLOR SCHEMES - Choose one by commenting/uncommenting the #define statements
+!! Dupre Theme Colors
 !! ============================================================================
 
-!! --- Dupre Theme (based on dupre-theme.el) ---
 #define dupre_fg           #f0fef0
-#define dupre_bg           #000000
-#define dupre_bg_alt       #151311
-#define dupre_gray_dark    #58574e
-#define dupre_gray         #969385
-#define dupre_gray_light   #d0cbc0
-#define dupre_black        #000000
+#define dupre_bg           #151311
+#define dupre_black        #252321
 #define dupre_red          #d47c59
 #define dupre_green        #a4ac64
 #define dupre_yellow       #d7af5f
 #define dupre_blue         #67809c
-#define dupre_magenta      #b2c3cc
+#define dupre_magenta      #b294bb
 #define dupre_cyan         #8a9496
-#define dupre_white        #f0fef0
+#define dupre_white        #d0cbc0
 #define dupre_br_black     #474544
 #define dupre_br_red       #edb08f
 #define dupre_br_green     #ccc768
 #define dupre_br_yellow    #ffd75f
 #define dupre_br_blue      #b2c3cc
-#define dupre_br_magenta   #d9e2ff
+#define dupre_br_magenta   #c397d8
 #define dupre_br_cyan      #acb0b3
 #define dupre_br_white     #f0fef0
 
-!! --- Gruvbox Theme ---
-! Uncomment these to use Gruvbox instead of Dupre
-! #define gruvbox_bg         #282828
-! #define gruvbox_bg         #000000
-! #define gruvbox_fg         #ebdbb2
-! #define gruvbox_red        #fb4934
-! #define gruvbox_green      #b8bb26
-! #define gruvbox_yellow     #fabd2f
-! #define gruvbox_blue       #83a598
-! #define gruvbox_purple     #d3869b
-! #define gruvbox_aqua       #8ec07c
-! #define gruvbox_gray       #928374
-! #define gruvbox_orange     #fe8019
-
-!! --- ACTIVE COLOR SCHEME ---
-!! Change these aliases to switch themes quickly
+!! Active theme aliases
 #define theme_fg           dupre_fg
 #define theme_bg           dupre_bg
 #define theme_black        dupre_black
@@ -87,15 +59,10 @@ Emacs*toolBar: 0
 #define theme_br_cyan      dupre_br_cyan
 #define theme_br_white     dupre_br_white
 
-!! To switch to Gruvbox:
-!! 1. Uncomment the Gruvbox color definitions above
-!! 2. Change theme_* aliases to gruvbox_* (e.g., theme_fg to gruvbox_fg)
-!! 3. Run: xrdb ~/.Xresources && pidof st | xargs kill -s USR1
-
 !! ============================================================================
 
-! ST (suckless terminal) settings
-st.font: FiraCode Nerd Font Mono:size=12
+!! ST (suckless terminal) settings
+st.font: BerkeleyMono Nerd Font:size=12
 st.background:  theme_bg
 st.foreground:  theme_fg
 st.color0:      theme_black
@@ -115,8 +82,8 @@ st.color13:     theme_br_magenta
 st.color14:     theme_br_cyan
 st.color15:     theme_br_white
 
-! XTerm settings
-XTerm*faceName: FiraCode Nerd Font Mono:size=12
+!! XTerm settings
+XTerm*faceName: BerkeleyMono Nerd Font:size=12
 XTerm*selectToClipboard: true
 XTerm*background:  theme_bg
 XTerm*foreground:  theme_fg
diff --git a/dotfiles/system/.config/dunst/dunstrc b/dotfiles/system/.config/dunst/dunstrc
index d804fc8..104df28 100644
--- a/dotfiles/system/.config/dunst/dunstrc
+++ b/dotfiles/system/.config/dunst/dunstrc
@@ -1,132 +1,5 @@
-[global]
-   
-    ### Display ###
-
-    # Display notifications on monitor with mouse focus
-    follow = mouse
-    # Set {width}x{height} and {x_pos}+{y_pos}
-    geometry = "300x30-5+60"
-    # Show number of hidden notifications
-    indicate_hidden = yes
-    # Shrink window if smaller than width
-    shrink = no
-    # Set transparency of notifications
-    transparency = 0
-    # Height of whole notification    
-    notification_height = 0
-    # Height of seperators
-    separator_height = 2
-    # Text and seperator padding
-    padding = 8
-    # Horizontal padding
-    horizontal_padding = 8
-    # Width of frame around window
-    frame_width = 1
-    # Color of frame around window
-    frame_color = "#4287f5"
-    # Sort messages by urgency
-    sort = yes
-    # Idle seconds
-    idle_threshold = 0
-
-    ### Text ###
-    
-    # Set font of notifications
-    font = FiraCode Nerd Font Mono, 10
-    # Spacing between lines 
-    line-height = 0
-    # Markup parsing
-    markup = full
-    # Message format:
-    # %a - appname
-    # %s - summary
-    # %b - body
-    # %i - iconname (with path)
-    # %I - iconname (without path)
-    # %p - progress value (if set)
-    # %n - progress value no extra characters
-    # %% - literal %
-    format = "<b>%a</b>\n<i>%s</i>\n%b"
-    # Align message text horizontally
-    alignment = center
-    # Align message text vertically
-    vertical_alignment = center
-    # Show age of message if message is older than x seconds
-    show_age_threshold = -1
-    # Split notifications into multiple lines
-    word_wrap = yes
-    # If message too long, add ellipsize to...
-    ellipsize = middle
-    # Ignore newlines in notifications
-    ignore_newline = no
-    # Stack duplicate notifications
-    stack_duplicates = true
-    # Hide number of duplicate notifications
-    hide_duplicate_count = true
-    # Show indicatiors  for urls and actions
-    show_indicators = no
-   
-    ### Icons ###
-
-    # icon_position = off
-
-    ### History ###
-    
-    # Length of history
-    history_length = 20
-    
-    ### Misc ###
-    
-    # Dmenu path
-    dmenu = /usr/bin/dmenu -p dunst:
-    # Browser
-    browser = /usr/bin/firefox -new-tab
-    # Always run scripts
-    always_run_script = true
-    # Title of notification
-    title = Message
-    # Notification class
-    class = Dunst
-    # Print notification on startup
-    startup_notification = false
-    # Dunst verbosity
-    verbosity = mesg
-    # Corner radius of dunst
-    corner_radius = 15
-    # Ignore dbus closeNotification message
-    ignore_dbusclose = false
-
-    ### Mouse ###
-
-    # Left click
-    mouse_left_click = close_current
-    # Middle click
-    mouse_middle_click = do_action
-    # Right click
-    mouse_right_click = do_action
-
-[shortcuts]
-
-    # Close one notification
-    close = ctrl+space
-    # Close all notifications
-    close_all = ctrl+shift+space
-
-[urgency_normal]
-
-    # Normal urgency notifications
-    background = "#202632"
-    foreground = "#ffffff"
-    timeout = 5
-
-[urgency_critical]
-
-    # High urgency notifications
-    background = "#ffffff"
-    foreground = "#db0101"
-    timeout = 0
-# For defaults and description of each option, see the link bellow
-# https://github.com/dunst-project/dunst/blob/master/dunstrc
+# Dunst config - Dupre theme
+# Warm, earthy colors from dupre-theme.el
 
 [global]
 # Display
@@ -140,20 +13,21 @@ notification_limit = 5
 gap_size = 12
 padding = 12
 horizontal_padding = 20
-frame_width = 1
+frame_width = 2
 sort = no
+corner_radius = 10
 
 # Progress bar
 progress_bar_frame_width = 0
 progress_bar_corner_radius = 3
 
-# Colors
-foreground = "#cdd1dc"
-frame_color = "#2d303c"
-highlight = "#2274d5, #82aad9"
+# Colors - Dupre theme
+foreground = "#f0fef0"
+frame_color = "#d7af5f"
+highlight = "#d7af5f, #ccc768"
 
 # Text
-font = FiraCode Nerd Font Mono, 10
+font = BerkeleyMono Nerd Font 11
 markup = full
 format = "<small>%a</small>\n<b>%s</b>\n%b"
 alignment = left
@@ -165,12 +39,10 @@ hide_duplicate_count = false
 icon_position = left
 min_icon_size = 54
 max_icon_size = 80
-icon_path = /usr/share/icons/Arc/status/96:/usr/share/icons/Arc/status/symbolic
 icon_corner_radius = 4
 
 # Misc/Advanced
-dmenu = wofi --show drun --prompt 'Open with'
-corner_radius = 10
+dmenu = fuzzel --dmenu --prompt 'Open with'
 
 # Mouse
 mouse_left_click = close_current
@@ -178,24 +50,23 @@ mouse_middle_click = do_action, close_current
 mouse_right_click = close_all
 
 [urgency_low]
-background = "#383c4af0"
+background = "#151311f0"
 timeout = 3
 
 [urgency_normal]
-background = "#383c4af0"
+background = "#151311f0"
 timeout = 8
 
 [urgency_critical]
-background = "#9b4d4bf0"
-frame_color = "#ab6d6b"
-highlight = "#eb4d4b"
-foreground = "#ffffff"
+background = "#7c2a09f0"
+frame_color = "#d47c59"
+highlight = "#ff2a00"
+foreground = "#f0fef0"
 timeout = 0
 
-# Rules
 [fullscreen_delay_everything]
 fullscreen = delay
 
 [fullscreen_show_critical]
 msg_urgency = critical
-fullscreen = show
-\ No newline at end of file
+fullscreen = show
diff --git a/dotfiles/system/.config/feh/keys b/dotfiles/system/.config/feh/keys
new file mode 100644
index 0000000..d2fbf09
--- /dev/null
+++ b/dotfiles/system/.config/feh/keys
@@ -0,0 +1,6 @@
+# feh key bindings
+# Format: action key1 [key2 [key3]]
+
+# Zoom: add +/- to existing Up/Down bindings
+zoom_in  plus Up KP_Add
+zoom_out minus Down KP_Subtract
diff --git a/dotfiles/system/.local/bin/lkg b/dotfiles/system/.local/bin/lkg
deleted file mode 100755
index aa9b3f1..0000000
--- a/dotfiles/system/.local/bin/lkg
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-# Craig Jennings <c@cjennings.net>
-
-sudo zfs destroy -rR zroot@lkg && sudo zfs snapshot -r zroot@lkg && echo "lkg snapshot reset" || echo "lkg snapshot failed!"
diff --git a/dotfiles/system/.local/bin/lkg_rollback b/dotfiles/system/.local/bin/lkg_rollback
deleted file mode 100755
index 3cf4c59..0000000
--- a/dotfiles/system/.local/bin/lkg_rollback
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-sudo zfs rollback -rR zroot/var@lkg
-sudo zfs rollback -rR zroot/var/log@lkg
-sudo zfs rollback -rR zroot/usr@lkg
-sudo zfs rollback -rR zroot/usr/home@lkg
-sudo zfs rollback -rR zroot/ROOT/default@lkg
-sudo zfs rollback -rR zroot/ROOT@lkg
-sudo zfs rollback -rR zroot@lkg
-
-echo ""; echo "rollback complete. rebooting..."
-sudo shutdown -r now
diff --git a/dotfiles/system/.local/share/fonts/BerkeleyMonoNerdFont-Bold.ttf b/dotfiles/system/.local/share/fonts/BerkeleyMonoNerdFont-Bold.ttf
new file mode 100644
index 0000000..2f76c1f
--- /dev/null
+++ b/dotfiles/system/.local/share/fonts/BerkeleyMonoNerdFont-Bold.ttf
diff --git a/dotfiles/system/.local/share/fonts/BerkeleyMonoNerdFont-BoldItalic.ttf b/dotfiles/system/.local/share/fonts/BerkeleyMonoNerdFont-BoldItalic.ttf
new file mode 100644
index 0000000..03cf72f
--- /dev/null
+++ b/dotfiles/system/.local/share/fonts/BerkeleyMonoNerdFont-BoldItalic.ttf
diff --git a/dotfiles/system/.local/share/fonts/BerkeleyMonoNerdFont-Italic.ttf b/dotfiles/system/.local/share/fonts/BerkeleyMonoNerdFont-Italic.ttf
new file mode 100644
index 0000000..be5694d
--- /dev/null
+++ b/dotfiles/system/.local/share/fonts/BerkeleyMonoNerdFont-Italic.ttf
diff --git a/dotfiles/system/.local/share/fonts/BerkeleyMonoNerdFont-Regular.ttf b/dotfiles/system/.local/share/fonts/BerkeleyMonoNerdFont-Regular.ttf
new file mode 100644
index 0000000..a39f1da
--- /dev/null
+++ b/dotfiles/system/.local/share/fonts/BerkeleyMonoNerdFont-Regular.ttf