session: dotfiles sync and GPG/Emacs auth debugging

Synced various dotfile configs (calibre, audacious, profile.d, xinitrc).
Diagnosed and fixed Emacs/GPG auth issue by disabling systemd emacs.service
which lacked DISPLAY environment for pinentry-dmenu.

1 files changed, 105 insertions, 49 deletions

diff --git a/dotfiles/system/.Xresources b/dotfiles/system/.Xresources
index 25e9f5d..4134af7 100644
--- a/dotfiles/system/.Xresources
+++ b/dotfiles/system/.Xresources
@@ -2,7 +2,7 @@
 
 ! Xft.dpi: 192
 !! below is the framework laptop dpi
-! Xft.dpi: 144
+Xft.dpi: 144
 
 !! cursor settings
 Xcursor.size: 32
@@ -21,59 +21,115 @@ Emacs*toolBar: 0
 !! Transparency (0-1):
 !! *.alpha: 0.8
 
-! Gruvbox colors
+!! ============================================================================
+!! COLOR SCHEMES - Choose one by commenting/uncommenting the #define statements
+!! ============================================================================
+
+!! --- 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_red          #d47c59
+#define dupre_green        #a4ac64
+#define dupre_yellow       #d7af5f
+#define dupre_blue         #67809c
+#define dupre_magenta      #b2c3cc
+#define dupre_cyan         #8a9496
+#define dupre_white        #f0fef0
+#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_cyan      #acb0b3
+#define dupre_br_white     #f0fef0
+
+!! --- Gruvbox Theme ---
+! Uncomment these to use Gruvbox instead of Dupre
 ! #define gruvbox_bg         #282828
-! I prefer black as the background color
-#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
+! #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
+#define theme_fg           dupre_fg
+#define theme_bg           dupre_bg
+#define theme_black        dupre_black
+#define theme_red          dupre_red
+#define theme_green        dupre_green
+#define theme_yellow       dupre_yellow
+#define theme_blue         dupre_blue
+#define theme_magenta      dupre_magenta
+#define theme_cyan         dupre_cyan
+#define theme_white        dupre_white
+#define theme_br_black     dupre_br_black
+#define theme_br_red       dupre_br_red
+#define theme_br_green     dupre_br_green
+#define theme_br_yellow    dupre_br_yellow
+#define theme_br_blue      dupre_br_blue
+#define theme_br_magenta   dupre_br_magenta
+#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.background:  gruvbox_bg
-st.foreground:  gruvbox_fg
-st.color0:      gruvbox_bg
-st.color1:      gruvbox_red
-st.color2:      gruvbox_green
-st.color3:      gruvbox_yellow
-st.color4:      gruvbox_blue
-st.color5:      gruvbox_purple
-st.color6:      gruvbox_aqua
-st.color7:      gruvbox_fg
-st.color8:      gruvbox_gray
-st.color9:      gruvbox_red
-st.color10:     gruvbox_green
-st.color11:     gruvbox_yellow
-st.color12:     gruvbox_blue
-st.color13:     gruvbox_purple
-st.color14:     gruvbox_aqua
-st.color15:     gruvbox_fg
+st.background:  theme_bg
+st.foreground:  theme_fg
+st.color0:      theme_black
+st.color1:      theme_red
+st.color2:      theme_green
+st.color3:      theme_yellow
+st.color4:      theme_blue
+st.color5:      theme_magenta
+st.color6:      theme_cyan
+st.color7:      theme_white
+st.color8:      theme_br_black
+st.color9:      theme_br_red
+st.color10:     theme_br_green
+st.color11:     theme_br_yellow
+st.color12:     theme_br_blue
+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*selectToClipboard: true
-XTerm*background:  gruvbox_bg
-XTerm*foreground:  gruvbox_fg
-XTerm*color0:      gruvbox_bg
-XTerm*color1:      gruvbox_red
-XTerm*color2:      gruvbox_green
-XTerm*color3:      gruvbox_yellow
-XTerm*color4:      gruvbox_blue
-XTerm*color5:      gruvbox_purple
-XTerm*color6:      gruvbox_aqua
-XTerm*color7:      gruvbox_fg
-XTerm*color8:      gruvbox_gray
-XTerm*color9:      gruvbox_red
-XTerm*color10:     gruvbox_green
-XTerm*color11:     gruvbox_yellow
-XTerm*color12:     gruvbox_blue
-XTerm*color13:     gruvbox_purple
-XTerm*color14:     gruvbox_aqua
-XTerm*color15:     gruvbox_fg
+XTerm*background:  theme_bg
+XTerm*foreground:  theme_fg
+XTerm*color0:      theme_black
+XTerm*color1:      theme_red
+XTerm*color2:      theme_green
+XTerm*color3:      theme_yellow
+XTerm*color4:      theme_blue
+XTerm*color5:      theme_magenta
+XTerm*color6:      theme_cyan
+XTerm*color7:      theme_white
+XTerm*color8:      theme_br_black
+XTerm*color9:      theme_br_red
+XTerm*color10:     theme_br_green
+XTerm*color11:     theme_br_yellow
+XTerm*color12:     theme_br_blue
+XTerm*color13:     theme_br_magenta
+XTerm*color14:     theme_br_cyan
+XTerm*color15:     theme_br_white