updated term to st on fish; fixed i3 startup apps; polybar now uses xresources

.Xresources

@@ -1,74 +1,3 @@
-! catppuccin color scheme
-*.background: #24273A
-*.foreground: #CAD3F5
-*.cursorColor: #F4DBD6
-*.color0: #494D64
-*.color8: #5B6078
-*.color1: #ED8796
-*.color9: #ED8796
-*.color2: #A6DA95
-*.color10: #A6DA95
-*.color3: #EED49F
-*.color11: #EED49F
-*.color4: #8AADF4
-*.color12: #8AADF4
-*.color5: #F5BDE6
-*.color13: #F5BDE6
-*.color6: #8BD5CA
-*.color14: #8BD5CA
-*.color7: #B8C0E0
-*.color15: #A5ADCB
-
-! gruvbox dark color scheme
-! hard contrast:
-! *.background: #1D2021
-! soft contrast:
-! *.background: #32302F
-! deafult contrast:
-! *.background: #282828
-! *.foreground: #EBDBB2
-! *.cursorColor: #EBDBB2
-! *.color0:  #282828
-! *.color8:  #928374
-! *.color1:  #CC241D
-! *.color9:  #FB4934
-! *.color2:  #98971A
-! *.color10: #B8BB26
-! *.color3:  #D79921
-! *.color11: #FABD2F
-! *.color4:  #458588
-! *.color12: #83A598
-! *.color5:  #B16286
-! *.color13: #D3869B
-! *.color6:  #689D6A
-! *.color14: #8EC07C
-! *.color7:  #A89984
-! *.color15: #EBDBB2
-
-
-
-!! gruvbox light color scheme
-!! hard contrast:
-!! *.background: #F9F5D7
-!! soft contrast:
-!! *.background: #F2E5BC
-!! default contrast:
-!*.background: #FBF1C7
-!*.foreground: #3C3836
-!*.cursorColor: #3C3836
-!*.color0: #F9F5D7
-!*.color8: #928374
-!*.color1: #CC241D
-!*.color9: #9D0006
-!*.color2: #98971A
-!*.color10: #79740E
-!*.color3: #D79921
-!*.color11: #B57614
-!*.color4: #458588
-!*.color12: #076678
-!*.color5: #B16286
-!*.color13: #8F3F71
-!*.color6: #689D6A
-!*.color14: #427B58
-!*.color7: #7C6F64
-!*.color15: #3C3836
+#include ".Xresources.d/catppuccin-macchiato"
+!#include ".Xresources.d/gruvbox-dark"
+!#include ".Xresources.d/gruvbox-light"

.Xresources.d/catppuccin-macchiato

@@ -0,0 +1,20 @@
+! catppuccin color scheme
+*.background: #24273A
+*.foreground: #CAD3F5
+*.cursorColor: #F4DBD6
+*.color0: #494D64
+*.color8: #5B6078
+*.color1: #ED8796
+*.color9: #ED8796
+*.color2: #A6DA95
+*.color10: #A6DA95
+*.color3: #EED49F
+*.color11: #EED49F
+*.color4: #8AADF4
+*.color12: #8AADF4
+*.color5: #F5BDE6
+*.color13: #F5BDE6
+*.color6: #8BD5CA
+*.color14: #8BD5CA
+*.color7: #B8C0E0
+*.color15: #A5ADCB

.Xresources.d/gruvbox-dark

@@ -0,0 +1,27 @@
+! gruvbox dark color scheme
+! hard contrast:
+! *.background: #1D2021
+
+! soft contrast:
+! *.background: #32302F
+
+! deafult contrast:
+*.background: #282828
+*.foreground: #EBDBB2
+*.cursorColor: #EBDBB2
+*.color0:  #282828
+*.color8:  #928374
+*.color1:  #CC241D
+*.color9:  #FB4934
+*.color2:  #98971A
+*.color10: #B8BB26
+*.color3:  #D79921
+*.color11: #FABD2F
+*.color4:  #458588
+*.color12: #83A598
+*.color5:  #B16286
+*.color13: #D3869B
+*.color6:  #689D6A
+*.color14: #8EC07C
+*.color7:  #A89984
+*.color15: #EBDBB2

.Xresources.d/gruvbox-light

@@ -0,0 +1,27 @@
+!! gruvbox light color scheme
+!! hard contrast:
+!! *.background: #F9F5D7
+
+!! soft contrast:
+!! *.background: #F2E5BC
+
+!! default contrast:
+*.background: #FBF1C7
+*.foreground: #3C3836
+*.cursorColor: #3C3836
+*.color0: #F9F5D7
+*.color8: #928374
+*.color1: #CC241D
+*.color9: #9D0006
+*.color2: #98971A
+*.color10: #79740E
+*.color3: #D79921
+*.color11: #B57614
+*.color4: #458588
+*.color12: #076678
+*.color5: #B16286
+*.color13: #8F3F71
+*.color6: #689D6A
+*.color14: #427B58
+*.color7: #7C6F64
+*.color15: #3C3836

.config/fish/config.fish

@@ -3,8 +3,8 @@ if status is-interactive
 end
 
 export EDITOR="nvim"
-export TERMINAL="alacritty"
-export TERMINAL_PROG="alacritty"
+export TERMINAL="st"
+export TERMINAL_PROG="st"
 export BROWSER="firefox"
 export PAGER="bat"
 

.config/i3/config

@@ -230,7 +230,8 @@ assign [class="discord"] 5
 # startup programs
 exec --no-startup-id nextcloud
 exec --no-startup-id nitrogen --restore
-exec --no-startup-id i3-msg 'workspace 2; exec firefox; workspace 1; exec $terminal'
+exec --no-startup-id i3-msg 'workspace 2; exec $browser'
+exec --no-startup-id i3-msg 'workspace 1; exec $terminal'
 exec --no-startup-id openrgb -d 0 -m off -d 1 -m off
 # sets up monitors and picom
 exec_always --no-startup-id ~/.local/share/scripts/monitor.sh

.config/polybar/config.ini

@@ -17,7 +17,7 @@
 ;==========================================================
 
 include-file = modules.ini
-include-file = $HOME/.config/polybar/themes/macchiato.ini
+include-file = $HOME/.config/polybar/themes/xresources.ini
 
 [settings]
 screenchange-reload = true
@@ -43,8 +43,8 @@ modules-left = i3 sep title
 modules-center = date dot time
 modules-right = xkeyboard dot cpu dot amdgpu dot memory dot pulseaudio sep filesystem
 
-background = ${colors.base}
-foreground = ${colors.text}
+background = ${colors.background}
+foreground = ${colors.foreground}
 line-size = 3pt
 padding-right = 1
 
@@ -64,11 +64,11 @@ offset-y = 0.5%
 ;radius = 8
 
 modules-left = i3 sep title
-modules-center = date dot time 
+modules-center = date dot time
 modules-right = xkeyboard dot cpu dot gpu dot memory dot backlight dot pulseaudio sep filesystem sep battery
 
-background = ${colors.base}
-foreground = ${colors.text}
+background = ${colors.background}
+foreground = ${colors.foreground}
 line-size = 3pt
 padding-right = 1
 
@@ -90,8 +90,8 @@ modules-left = i3
 modules-center = date dot time
 modules-right = cpu dot gpu dot memory dot pulseaudio sep filesystem
 
-background = ${colors.base}
-foreground = ${colors.text}
+background = ${colors.background}
+foreground = ${colors.foreground}
 line-size = 3pt
 padding-right = 1
 

.config/polybar/modules.ini

@@ -13,8 +13,8 @@ format = <label-state> <label-mode>
 label-mode = %mode%
 label-mode-padding = 1
 label-focused = %index%
-label-focused-foreground = ${colors.text}
-label-focused-underline = ${colors.lavender}
+label-focused-foreground = ${colors.foreground}
+label-focused-underline = ${colors.lightgrey}
 label-focused-padding = 1
 label-unfocused = %index%
 label-unfocused-padding = 1
@@ -28,8 +28,8 @@ label-urgent-padding = 1
 [module/xworkspaces]
 type = internal/xworkspaces
 label-active = %name%
-label-active-foreground = ${colors.sky}
-label-active-underline= ${colors.lavender}
+label-active-foreground = ${colors.lightblue}
+label-active-underline= ${colors.lightgrey}
 label-active-padding = 1
 label-occupied = %name%
 label-occupied-padding = 1
@@ -42,22 +42,22 @@ label-empty-padding = 1
 [module/xkeyboard]
 type = internal/xkeyboard
 
-format = <label-layout> 
+format = <label-layout>
 format-prefix = 󰌌
-format-prefix-foreground = ${colors.mauve}
+format-prefix-foreground = ${colors.magenta}
 format-prefix-padding-right = 1
 format-spacing = 0
 
 label-layout = %layout%
 label-layout-padding = 0
-label-layout-background = ${colors.base}
-label-layout-foreground = ${colors.text}
+label-layout-background = ${colors.background}
+label-layout-foreground = ${colors.foreground}
 
 
 [module/title]
 type = internal/xwindow
 format = <label>
-;format-foreground = ${colors.text}
+;format-foreground = ${colors.foreground}
 format-padding = 2
 
 label = %title%
@@ -78,7 +78,7 @@ interval = 1
 label = %output%
 
 format = <label>
-format-prefix = 󰍛 
+format-prefix = 󰍛
 format-prefix-foreground = ${colors.blue}
 format-prefix-padding-right = 1
 format-suffix = °C
@@ -117,7 +117,7 @@ interval = 1
 label = %used%
 format = <label>
 format-prefix = 󰘚
-format-prefix-foreground = ${colors.peach}
+format-prefix-foreground = ${colors.magenta}
 format-prefix-padding-right = 1
 
 [module/filesystem]
@@ -138,18 +138,18 @@ interval = 5
 format-volume = <ramp-volume><label-volume>
 label-volume = %percentage%%
 ramp-volume-0 = 󰕿
-ramp-volume-0-foreground = ${colors.teal}
+ramp-volume-0-foreground = ${colors.lightgreen}
 ramp-volume-0-padding-right = 1
 ramp-volume-1 = 󰖀
-ramp-volume-1-foreground = ${colors.teal}
+ramp-volume-1-foreground = ${colors.lightgreen}
 ramp-volume-1-padding-right = 1
 ramp-volume-2 = 󰕾
-ramp-volume-2-foreground = ${colors.teal}
+ramp-volume-2-foreground = ${colors.lightgreen}
 ramp-volume-2-padding-right = 1
 label-muted = MUTED
-label-muted-foreground = ${colors.subtext0}
+label-muted-foreground = ${colors.lightgrey}
 format-muted-prefix = 󰝟
-format-muted-prefix-foreground = ${colors.maroon}
+format-muted-prefix-foreground = ${colors.red}
 format-muted-prefix-padding-right = 1
 click-right = pavucontrol || pulseaudio-equalizer-ladspa || pulseeffects || easyeffects
 
@@ -268,7 +268,7 @@ animation-charging-9-foreground = ${colors.green}
 animation-charging-framerate = 750
 animation-low-0 = 󱃍
 animation-low-0-foreground = ${colors.red}
-animation-low-1 = 
+animation-low-1 =
 animation-low-framerate = 200
 
 [module/bluetooth]
@@ -282,11 +282,11 @@ format-prefix-foreground = ${colors.blue}
 [module/date]
 type = internal/date
 interval = 1
-date = %a, %B %d 
+date = %a, %B %d
 label = %date%
 format = <label>
 format-prefix = 󰃭
-format-prefix-foreground = ${colors.rosewater}
+format-prefix-foreground = ${colors.lightyellow}
 format-prefix-padding-right = 1
 
 [module/time]
@@ -296,25 +296,25 @@ time = %H:%M
 label = %time%
 format = <label>
 format-prefix = 󰥔
-format-prefix-foreground = ${colors.pink}
+format-prefix-foreground = ${colors.lightmagenta}
 format-prefix-padding-right = 1
 
 [module/space]
 type = custom/text
 content = _
-content-foreground = ${colors.crust}
+content-foreground = ${colors.background}
 content-padding = 0.5
 
 [module/dot]
 type = custom/text
 content = 󰧞
-content-foreground = ${colors.overlay0}
+content-foreground = ${colors.grey}
 content-padding = 1
 
 [module/sep]
 type = custom/text
 content = |
-content-foreground = ${colors.overlay0}
+content-foreground = ${colors.grey}
 content-padding = 1