diff --git a/.config/conky/conky.conf b/.config/conky/conky.conf index 6b1035ac..937d30c5 100644 --- a/.config/conky/conky.conf +++ b/.config/conky/conky.conf @@ -4,7 +4,7 @@ conky.config = { own_window = true, own_window_title = 'Conky', own_window_class = 'Conky', - own_window_type = 'desktop', + own_window_type = 'override', own_window_hints = 'undecorated,below,sticky,skip_taskbar,skip_pager', own_window_colour = '282828', diff --git a/.config/plasma-workspace/env/set_window_manager.sh b/.config/plasma-workspace/env/set_window_manager.sh index 6b687c46..c5e35f2c 100755 --- a/.config/plasma-workspace/env/set_window_manager.sh +++ b/.config/plasma-workspace/env/set_window_manager.sh @@ -1 +1,7 @@ -export KDEWM=/usr/bin/bspwm +if [ -r "$HOME/.concession/concede" ]; then + source "$HOME/.concession/concede" +fi +if [ -r "$HOME/.concession/conspiracy" ]; then + $HOME/.concession/conspiracy & +fi +export KDEWM=/usr/bin/i3 diff --git a/.config/polybar/config b/.config/polybar/config index 2b4d5345..e6fd6716 100644 --- a/.config/polybar/config +++ b/.config/polybar/config @@ -89,7 +89,7 @@ border-top-size = 0 modules-left = ${env:PB_BAR_PRIMARY_MODULES_LEFT:battery cpu memory} modules-center = ${env:PB_BAR_PRIMARY_MODULES_CENTER:i3 bspwm} -modules-right = ${env:PB_BAR_PRIMARY_MODULES_RIGHT:tor i3-mode xbacklight volume date} +modules-right = ${env:PB_BAR_PRIMARY_MODULES_RIGHT:tor xbacklight volume date} [bar/primary-2] monitor = ${env:PB_MONITOR:eDP-1} @@ -255,7 +255,7 @@ exec = hostname [module/i3] type = internal/i3 -format = +format = enable-scroll = false pin-workspaces = true @@ -277,14 +277,6 @@ label-urgent-padding = ${res/config.padding} label-urgent-foreground = ${res/colors.alert} label-urgent-font = 2 -[module/i3-mode] -type = internal/i3 -format = -format-prefix = "i3: " -format-prefix-foreground = ${res/colors.mod-wm} -# Just in case -enable-scroll = false - label-mode = %mode% [module/memory] diff --git a/.local/bin b/.local/bin index 48761983..482622fa 160000 --- a/.local/bin +++ b/.local/bin @@ -1 +1 @@ -Subproject commit 48761983efe55749e8777957ff819c0432062904 +Subproject commit 482622fab8c49ba17b20fc405fed3d1b0fadbe2b