diff --git a/base/.Xresources b/base/.Xresources
index 58eb1a99..99a28082 100644
--- a/base/.Xresources
+++ b/base/.Xresources
@@ -1,37 +1,24 @@
! Base colors
*.foreground: #E1E1E1
-*.background: #1c2023
+*.background: #1C2023
*.cursorColor: #778899
-*.color0: #1c2023
-*.color1: #bf616a
-*.color2: #a3be8c
-*.color3: #ebcb8b
-*.color4: #8fa1b3
-*.color5: #b48ead
-*.color6: #96b5b4
+*.color0: #1C2023
+*.color1: #BF616A
+*.color2: #A3BE8C
+*.color3: #EBCB8B
+*.color4: #8FA1B3
+*.color5: #B48EAD
+*.color6: #96B5B4
*.color7: #E1E1E1
-*.color8: #919ba0
-*.color9: #bf616a
-*.color10: #a3be8c
-*.color11: #ebcb8b
-*.color12: #8fa1b3
-*.color13: #b48ead
-*.color14: #96b5b4
-*.color15: #c0c5ce
-
-! Rofi
-rofi.font: monospace 12
-rofi.padding: 20
-rofi.line-padding: 2
-rofi.color-enabled: true
-rofi.hide-scrollbar: true
-rofi.separator-style: solid
-rofi.color-window: #1c2023, #919ba0, #1c2023
-rofi.color-normal: #1c2023, #919ba0, #1c2023, #a4a4a4, #1c2023
-rofi.color-urgent: argb:00000000, #f43753, argb:00000000, argb:00000000, #e29a49
-rofi.color-active: argb:00000000, #49bbfb, argb:00000000, argb:00000000, #e29a49
-rofi.kb-cancel: Escape,Alt+F1
+*.color8: #919BA0
+*.color9: #BF616A
+*.color10: #A3BE8C
+*.color11: #EBCB8B
+*.color12: #8FA1B3
+*.color13: #B48EAD
+*.color14: #96B5B4
+*.color15: #C0C5CE
! xterm
xterm*termName: xterm-256color
diff --git a/base/.config/jgmenu/jgmenurc b/base/.config/jgmenu/jgmenurc
index 84112e5f..41efc2a3 100644
--- a/base/.config/jgmenu/jgmenurc
+++ b/base/.config/jgmenu/jgmenurc
@@ -38,12 +38,12 @@ item_border = 0
sep_height = 5
-font = monospace 12px
-#font_fallback = xtg
+font = DejaVu Sans Book 12px
+font_fallback = xtg
icon_size = 24
-#icon_text_spacing = 10
-#icon_theme =
-#icon_theme_fallback = xtg
+icon_text_spacing = 10
+icon_theme = ArchLabs
+icon_theme_fallback = xtg
#arrow_string = ▸
#arrow_width = 15
diff --git a/base/.config/nitrogen/bg-saved.cfg b/base/.config/nitrogen/bg-saved.cfg
index f5003ee9..ce09df15 100644
--- a/base/.config/nitrogen/bg-saved.cfg
+++ b/base/.config/nitrogen/bg-saved.cfg
@@ -1,4 +1,4 @@
[xin_-1]
-file=/usr/share/backgrounds/archlabs/archlabs.jpg
+file=/usr/share/backgrounds/archlabs/archlabs.png
mode=0
bgcolor=#000000
diff --git a/base/.config/rofi/config.rasi b/base/.config/rofi/config.rasi
index a16620d0..97351a9e 100644
--- a/base/.config/rofi/config.rasi
+++ b/base/.config/rofi/config.rasi
@@ -2,6 +2,7 @@
configuration {
modi: "drun,run,window,ssh";
+ kb-cancel: "Escape,Control+g,Control+bracketleft,Alt+F1";
/* show-icons: true;*/
/* font: "mono 12";*/
/* icon-theme: ;*/
@@ -100,7 +101,6 @@ configuration {
/* kb-ellipsize: "Alt+period";*/
/* kb-toggle-case-sensitivity: "grave,dead_grave";*/
/* kb-toggle-sort: "Alt+grave";*/
-/* kb-cancel: "Escape,Control+g,Control+bracketleft";*/
/* kb-custom-1: "Alt+1";*/
/* kb-custom-2: "Alt+2";*/
/* kb-custom-3: "Alt+3";*/
diff --git a/dk-home/.config/dk/dkrc b/dk-home/.config/dk/dkrc
index baf8fd57..d9ef72f3 100755
--- a/dk-home/.config/dk/dkrc
+++ b/dk-home/.config/dk/dkrc
@@ -14,10 +14,10 @@ if hash sxhkd >/dev/null 2>&1; then
sxhkd -c "$HOME/.config/dk/sxhkdrc" &
fi
-# (re)load sxhkd for keybinds
+# (re)load lemonbar script
if hash lemonbar bar >/dev/null 2>&1; then
pkill lemonbar
- bar &
+ bar 2>/dev/null &
fi
{ # compound command to redirect all output
diff --git a/dk-home/.local/bin/bar b/dk-home/.local/bin/bar
index af8e6c7d..5bd91fba 100755
--- a/dk-home/.local/bin/bar
+++ b/dk-home/.local/bin/bar
@@ -3,7 +3,7 @@
# simple lightweight lemonbar script for use with dk
-set -o pipefail
+set -eE -o pipefail
bg="#111111"
fg="#666666"
@@ -122,7 +122,7 @@ parsefifo()
# kill the process and cleanup if we exit or get killed
-trap "trap - TERM; kill 0; rm -f '$fifo'" INT TERM QUIT EXIT
+trap "trap - TERM; kill 0; rm -f '$fifo'" INT TERM QUIT EXIT PIPE
# make the fifo
[ -e "$fifo" ] && rm "$fifo"
diff --git a/sway-home/.azotebg b/sway-home/.azotebg
index dd788cfb..7d376893 100755
--- a/sway-home/.azotebg
+++ b/sway-home/.azotebg
@@ -1,4 +1,4 @@
#!/bin/bash
killall swaybg 2>/dev/null
-swaybg -o '*' -i '/usr/share/backgrounds/archlabs/archlabs.jpg'
+swaybg -o '*' -i '/usr/share/backgrounds/archlabs/archlabs.png'
diff --git a/xfce4-home/.config/xfce4/panel/whiskermenu-1.rc b/xfce4-home/.config/xfce4/panel/whiskermenu-1.rc
index 17c489f7..7a72ede5 100644
--- a/xfce4-home/.config/xfce4/panel/whiskermenu-1.rc
+++ b/xfce4-home/.config/xfce4/panel/whiskermenu-1.rc
@@ -2,7 +2,7 @@ favorites=exo-terminal-emulator.desktop,exo-file-manager.desktop,exo-mail-reader
recent=exo-web-browser.desktop,exo-mail-reader.desktop,exo-file-manager.desktop,exo-terminal-emulator.desktop
button-title=
-button-icon=/usr/share/icons/ArchLabs-Dark/64x64/places/distributor-logo-archlabs.png
+button-icon=start-here
button-single-row=false
show-button-title=false
show-button-icon=true
@@ -29,20 +29,20 @@ menu-opacity=100
command-settings=xfce4-settings-manager
show-command-settings=true
-command-lockscreen=
-show-command-lockscreen=false
+command-lockscreen=xfce4-screensaver-command --lock
+show-command-lockscreen=true
command-switchuser=
show-command-switchuser=false
-command-logout=xfce4-session-logout --logout --fast
+command-logout=xfce4-session-logout
show-command-logout=true
-command-restart=xfce4-session-logout --reboot --fast
-show-command-restart=true
+command-restart=
+show-command-restart=false
-command-shutdown=xfce4-session-logout --halt --fast
-show-command-shutdown=true
+command-shutdown=
+show-command-shutdown=false
command-menueditor=
show-command-menueditor=false
diff --git a/xfce4-home/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/xfce4-home/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
index b27417c0..5ab7ba8e 100644
--- a/xfce4-home/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
+++ b/xfce4-home/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
@@ -4,21 +4,22 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/xfce4-home/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml b/xfce4-home/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
index 67a747d4..0282bade 100644
--- a/xfce4-home/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
+++ b/xfce4-home/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
@@ -19,10 +19,8 @@
-
-
-
-
+
+