5 files changed, 30 insertions, 672 deletions
diff --git a/bspwm/.config/bspwm/bspwmrc b/bspwm/.config/bspwm/bspwmrc
index b514a7a..beef1f7 100755
--- a/bspwm/.config/bspwm/bspwmrc
+++ b/bspwm/.config/bspwm/bspwmrc
@@ -1,18 +1,34 @@
 #! /bin/sh
 
 # reset polybar
-$HOME/.config/polybar/launch.sh &
+$HOME/.config/polybar/launch.sh bspwm
 
 # Autostart
-[[ ! $(pidof -x sxhkd) ]] && sxhkd &
-[[ ! $(pidof -x compton) ]] && compton &
-[[ ! $(pidof -x nm-applet) ]] && nm-applet &
-[[ ! $(pidof -x feh ) ]] && feh --bg-scale "$HOME/.local/share/images/wallpaper.jpg" &
+[ ! "$(pidof -x sxhkd)" ] && sxhkd &
+[ ! "$(pidof -x picom)" ] && picom &
+[ ! "$(pidof -x nm-applet)" ] && nm-applet &
 
 # locker
-[[ ! $(pidof -x xautolock) ]] && xautolock -locker "$HOME/.local/share/scripts/lock.sh" -time 60 -detectsleep -notify 10 &
-
-bspc monitor -d I II III IV V VI VII VIII IX X
+# [ ! "$(pidof -x xautolock)" ] && xautolock -locker "$HOME/.local/share/scripts/lock.sh" -time 60 -detectsleep -notify 10 &
+xset s 300 5
+xss-lock -n /usr/bin/xsecurelock/dimmer -l -- xsecurelock
+
+# setup monitor
+monitors=$(xrandr -q | grep " connected " | cut -d " " -f1)
+monitor_list=$(printf "%s" "$monitors" | tr '\n' ' ')
+num_monitors=$(echo "$monitors" | wc -w)
+case $num_monitors in
+    1)
+        bspc monitor -d I II III IV V VI VII VIII IX X ;;
+    2)
+        primary=$(echo "$monitor_list" | cut -d ' ' -f1)
+        secondary=$(echo "$monitor_list" | cut -d ' ' -f2)
+        echo "prim: $primary second: $secondary"
+        bspc monitor "$primary" -d I II III IV V
+        bspc monitor "$secondary" -d VI VII VII IX X
+        bspc wm -O "$primary" "$secondary" ;;
+    *)
+esac
 
 bspc config border_width         2
 bspc config window_gap          12
@@ -28,4 +44,4 @@ bspc rule -a Kupfer.py focus=on
 bspc rule -a Screenkey manage=off
 
 bspc rule -a scratchpad sticky=on state=floating hidden=on
-alacritty --class scratchpad,scratchpad -e ~/code/dotfiles/bspwm/.bin/scratch &
+alacritty --class scratchpad,scratchpad -e ~/.local/bin/scratch &
diff --git a/bspwm/.config/polybar/config b/bspwm/.config/polybar/config
deleted file mode 100644
index 05d6334..0000000
--- a/bspwm/.config/polybar/config
+++ /dev/null
@@ -1,637 +0,0 @@
-;==========================================================
-;
-;
-;   ██████╗  ██████╗ ██╗  ██╗   ██╗██████╗  █████╗ ██████╗
-;   ██╔══██╗██╔═══██╗██║  ╚██╗ ██╔╝██╔══██╗██╔══██╗██╔══██╗
-;   ██████╔╝██║   ██║██║   ╚████╔╝ ██████╔╝███████║██████╔╝
-;   ██╔═══╝ ██║   ██║██║    ╚██╔╝  ██╔══██╗██╔══██║██╔══██╗
-;   ██║     ╚██████╔╝███████╗██║   ██████╔╝██║  ██║██║  ██║
-;   ╚═╝      ╚═════╝ ╚══════╝╚═╝   ╚═════╝ ╚═╝  ╚═╝╚═╝  ╚═╝
-;
-;
-;   To learn more about how to configure Polybar
-;   go to https://github.com/jaagr/polybar
-;
-;   The README contains alot of information
-;
-;==========================================================
-
-[colors]
-;background = ${xrdb:color0:#222}
-background = #222
-background-alt = #444
-;foreground = ${xrdb:color7:#222}
-foreground = #dfdfdf
-foreground-alt = #555
-primary = #ffb52a
-secondary = #e60053
-alert = #bd2c40
-
-[bar/topbar]
-monitor = ${env:MONITOR:eDP-1}
-width = 100%
-height = 40
-dpi = 96
-;offset-x = 1%
-;offset-y = 1%
-radius = 6.0
-fixed-center = false
-
-background = ${colors.background}
-foreground = ${colors.foreground}
-
-line-size = 3
-line-color = #f00
-
-border-size = 10
-border-bottom-size = 0
-border-color = #00000000
-
-padding-left = 2
-padding-right = 2
-
-font-0 = fixed:pixelsize=10;1
-font-1 = unifont:fontformat=truetype:size=8:antialias=false;0
-font-2 = siji:pixelsize=10;1
-font-3 = "Font Awesome 5 Brands:style=Regular:pixelsize=8;1"
-font-4 = "Font Awesome 5 Free:style=Regular:pixelsize=8;1"
-font-5 = "Font Awesome 5 Free:style=Solid:pixelsize=8;1"
-
-tray-position = right
-tray-padding = 2
-;tray-transparent = true
-;tray-background = #0063ff
-tray-scale = 1
-tray-detached = false
-
-wm-restack = bspwm
-override-redirect = false
-
-scroll-up = bspwm-desknext
-scroll-down = bspwm-deskprev
-cursor-click = pointer
-cursor-scroll = ns-resize
-
-module-margin-left = 2
-module-margin-right = 2
-modules-left = hostname xwindow
-modules-center =
-modules-right = filesystem backlight pulseaudio xkeyboard memory cpu wlan eth ethvpn battery temperature
-
-[bar/topbar-second]
-monitor = ${env:MONITOR:eDP-1}
-width = 100%
-height = 40
-dpi = 96
-;offset-x = 1%
-offset-y = 50
-radius = 6.0
-fixed-center = true
-
-background = ${colors.background}
-foreground = ${colors.foreground}
-
-line-size = 3
-line-color = #f00
-
-border-size = 10
-border-top-size = 0
-border-bottom-size = 0
-border-color = #00000000
-
-padding-left = 2
-padding-right = 2
-
-font-0 = fixed:pixelsize=10;1
-font-1 = unifont:fontformat=truetype:size=8:antialias=false;0
-font-2 = siji:pixelsize=10;1
-font-3 = "Font Awesome 5 Brands:style=Regular:pixelsize=8;1"
-font-4 = "Font Awesome 5 Free:style=Regular:pixelsize=8;1"
-font-5 = "Font Awesome 5 Free:style=Solid:pixelsize=8;1"
-
-wm-restack = bspwm
-override-redirect = false
-
-scroll-up = bspwm-desknext
-scroll-down = bspwm-deskprev
-cursor-click = pointer
-cursor-scroll = ns-resize
-
-module-margin-left = 2
-module-margin-right = 2
-modules-left = bspwm
-modules-center = spotify
-modules-right = taskwarrior date
-
-[module/hostname]
-type = custom/script
-interval = 256
-format = "<label> "
-"format-prefix = "  "
-format-prefix = " ƸӜƷ "
-format-prefix-foreground = ${colors.secondary}
-format-padding = 0
-exec = echo "$(uname -n)"
-
-[module/spotify]
-type = custom/script
-exec = spotifycl status
-tail = true
-format = <label>
-format-foreground = ${colors.foreground-alt}
-format-underline = ${colors.primary}
-click-right = playerctl play-pause
-click-left = playerctl play-pause
-click-middle = playerctl next
-scroll-up = playerctl next
-scroll-down = playerctl previous
-label-maxlen = 120
-label-ellipsis = true
-
-[module/xwindow]
-type = internal/xwindow
-label = %title:0:40:...%
-
-[module/xkeyboard]
-type = internal/xkeyboard
-blacklist-0 = num lock
-
-format = <label-layout>
-format-prefix = " "
-format-prefix-foreground = ${colors.foreground}
-format-prefix-underline = ${colors.secondary}
-
-label-layout = %name%
-label-layout-underline = ${colors.secondary}
-
-label-indicator-padding = 2
-label-indicator-margin = 1
-label-indicator-background = ${colors.secondary}
-label-indicator-underline = ${colors.secondary}
-
-[module/filesystem]
-type = internal/fs
-interval = 25
-
-mount-0 = /
-
-label-mounted =  %{F#0a81f5}%mountpoint%%{F-}: %percentage_used%%
-label-unmounted = %mountpoint% not mounted
-label-unmounted-foreground = ${colors.foreground-alt}
-
-[module/bspwm]
-type = internal/bspwm
-
-pin-workspaces = true
-inline-mode = false
-enable-click = true
-enable-scroll = false
-reverse-scroll = false
-fuzzy-matching = true
-
-; Available tags:
-;   <label-monitor>
-;   <label-state> - gets replaced with <label-(focused|urgent|occupied|empty)>
-;   <label-mode> - gets replaced with
-;   <label-(monocle|tiled|fullscreen|floating|locked|sticky|private)>
-; Default: <label-state>
-format = <label-state> <label-mode>
-
-; Available tokens:
-;   %name%
-; Default: %name%
-label-monitor = %name%
-
-; If any values for label-dimmed-N are defined, the workspace/mode
-; colors will get overridden with those values if the monitor is out of focus
-; To only override workspaces in a specific state, use:
-;   label-dimmed-focused
-;   label-dimmed-occupied
-;   label-dimmed-urgent
-;   label-dimmed-empty
-label-dimmed-foreground = #555
-label-dimmed-underline = ${colors.background}
-label-dimmed-focused-background = #f00
-
-; Available tokens:
-;   %name%
-;   %icon%
-;   %index%
-; Default: %icon%  %name%
-label-focused = %icon% %name%
-label-focused-background = ${colors.background-alt}
-label-focused-underline= ${colors.primary}
-label-focused-padding = 2
-
-; Available tokens:
-;   %name%
-;   %icon%
-;   %index%
-; Default: %icon%  %name%
-label-occupied = %icon% %name%
-label-occupied-padding = 2
-
-; Available tokens:
-;   %name%
-;   %icon%
-;   %index%
-; Default: %icon%  %name%
-label-urgent = %icon% %name%!
-label-urgent-background = ${colors.alert}
-label-urgent-padding = 2
-
-; Available tokens:
-;   %name%
-;   %icon%
-;   %index%
-; Default: %icon%  %name%
-label-empty = %icon% %name%
-label-empty-foreground = ${colors.foreground-alt}
-label-empty-padding = 0
-
-; The following labels will be used to indicate the layout/mode
-; for the focused workspace. Requires <label-mode>
-;
-; Available tokens:
-;   None
-;label-monocle = 
-;label-tiled = 
-;label-fullscreen = 
-;label-floating = 
-;label-pseudotiled = P
-;label-locked = 
-;label-locked-foreground = #bd2c40
-;label-sticky = 
-;label-sticky-foreground = #fba922
-;label-private = 
-;label-private-foreground = #bd2c40
-;label-marked = M
-
-; Separator in between workspaces
-label-separator =
-label-separator-padding = 0
-label-separator-foreground = #ffb52a
-
-[module/i3]
-type = internal/i3
-; Only show workspaces on the same output as the bar
-pin-workspaces = true
-strip-wsnumbers = true
-format = <label-state> <label-mode>
-index-sort = true
-wrapping-scroll = false
-
-label-mode = %mode%
-label-mode-padding = 2
-label-mode-foreground = #000
-label-mode-background = ${colors.primary}
-
-; focused = Active workspace on focused monitor
-label-focused = %name%
-label-focused-background = ${module/bspwm.label-focused-background}
-label-focused-underline = ${module/bspwm.label-focused-underline}
-label-focused-padding = ${module/bspwm.label-focused-padding}
-
-; unfocused = Inactive workspace on any monitor
-label-unfocused = %name%
-label-unfocused-padding = ${module/bspwm.label-occupied-padding}
-
-; visible = Active workspace on unfocused monitor
-label-visible = %name%
-label-visible-background = ${self.label-focused-background}
-label-visible-underline = ${self.label-focused-underline}
-label-visible-padding = ${self.label-focused-padding}
-
-; urgent = Workspace with urgency hint set
-label-urgent = %name%
-label-urgent-background = ${module/bspwm.label-urgent-background}
-label-urgent-padding = ${module/bspwm.label-urgent-padding}
-
-; Separator in between workspaces
-; label-separator = |
-
-
-[module/taskwarrior]
-interval = 30
-type = custom/script
-exec = $HOME/.config/polybar/task_polybar.sh
-format = <label>
-format-foreground = #FFF
-format-prefix = "§ "
-click-left = task "$((`cat /tmp/tw_polybar_id`))" done
-
-[module/line-l]
-type = custom/text
-content = "____[ "
-content-foreground = ${colors.primary}
-
-[module/line-r]
-type = custom/text
-content = " ]____"
-content-foreground = ${colors.primary}
-
-[module/mpd]
-type = internal/mpd
-format-online = <label-song>  <icon-prev> <icon-stop> <toggle> <icon-next>
-
-icon-prev = 
-icon-stop = 
-icon-play = 
-icon-pause = 
-icon-next = 
-
-label-song-maxlen = 25
-label-song-ellipsis = true
-
-[module/backlight]
-type = internal/backlight
-card = intel_backlight
-format = <label> <ramp>
-label = "" 
-
-ramp-0 = 🌕
-ramp-1 = 🌔
-ramp-2 = 🌓
-ramp-3 = 🌒
-ramp-4 = 🌑
-
-bar-width = 10
-bar-indicator = |
-bar-indicator-foreground = #fff
-bar-indicator-font = 2
-bar-fill = ─
-bar-fill-font = 2
-bar-fill-foreground = #9f78e1
-bar-empty = ─
-bar-empty-font = 2
-bar-empty-foreground = ${colors.foreground-alt}
-
-[module/xbacklight]
-type = internal/xbacklight
-
-format = <label> <bar>
-label = 
-
-bar-width = 10
-bar-indicator = |
-bar-indicator-foreground = #fff
-bar-indicator-font = 2
-bar-fill = ─
-bar-fill-font = 2
-bar-fill-foreground = #9f78e1
-bar-empty = ─
-bar-empty-font = 2
-bar-empty-foreground = ${colors.foreground-alt}
-
-[module/backlight-acpi]
-inherit = module/xbacklight
-type = internal/backlight
-card = intel_backlight
-
-[module/cpu]
-type = internal/cpu
-interval = 2
-format-prefix = " "
-format-prefix-foreground = ${colors.foreground}
-format-underline = #f90000
-label = %percentage:2%%
-
-[module/memory]
-type = internal/memory
-interval = 2
-format-prefix = " "
-format-prefix-foreground = ${colors.foreground}
-format-underline = #4bffdc
-label = %percentage_used%%
-
-[module/wlan]
-type = internal/network
-interface = wlp3s0
-interval = 3.0
-accumulate-stats = true
-
-format-connected-prefix = " "
-format-connected = <label-connected>
-format-connected-underline = #9f78e1
-label-connected = %essid% %local_ip% ↓%downspeed% ↑%upspeed% (%signal%)
-
-format-disconnected =
-;format-disconnected = <label-disconnected>
-;format-disconnected-underline = ${self.format-connected-underline}
-;label-disconnected = %ifname% disconnected
-;label-disconnected-foreground = ${colors.foreground-alt}
-
-ramp-signal-0 = 
-ramp-signal-foreground = ${colors.foreground-alt}
-
-[module/eth]
-type = internal/network
-interface = eno1
-interval = 3.0
-accumulate-stats = true
-
-format-connected-underline = #55aa55
-format-connected-prefix = " "
-format-connected-prefix-foreground = ${colors.foreground}
-label-connected = %local_ip% ↓%downspeed% ↑%upspeed% ↕%linkspeed%
-
-format-disconnected =
-;format-disconnected = <label-disconnected>
-;format-disconnected-underline = ${self.format-connected-underline}
-;label-disconnected = %ifname% disconnected
-;label-disconnected-foreground = ${colors.foreground-alt}
-
-[module/ethvpn]
-type = internal/network
-interface = tun0
-interval = 3.0
-accumulate-stats = true
-
-format-connected-underline = #55aa55
-format-connected-prefix = ""
-format-connected-prefix-foreground = ${colors.foreground}
-label-connected = %local_ip% %local_ip6%
-
-format-disconnected =
-;format-disconnected = <label-disconnected>
-;format-disconnected-underline = ${self.format-connected-underline}
-label-disconnected = %ifname% disconnected
-;label-disconnected-foreground = ${colors.foreground-alt}
-
-[module/date]
-type = internal/date
-interval = 1
-
-date =
-date-alt = " %Y-%m-%d"
-
-time = %H:%M:%S
-time-alt = %H:%M:%S
-
-format-prefix = 
-format-prefix-foreground = ${colors.foreground}
-format-underline = #0a6cf5
-
-label = %date% %time%
-
-[module/pulseaudio]
-type = internal/pulseaudio
-
-format-volume = <label-volume> <bar-volume>
-label-volume = %percentage%%
-label-volume-foreground = ${root.foreground}
-
-label-muted = 
-label-muted-foreground = #666
-
-bar-volume-width = 10
-bar-volume-foreground-0 = #55aa55
-bar-volume-foreground-1 = #55aa55
-bar-volume-foreground-2 = #55aa55
-bar-volume-foreground-3 = #55aa55
-bar-volume-foreground-4 = #55aa55
-bar-volume-foreground-5 = #f5a70a
-bar-volume-foreground-6 = #ff5555
-bar-volume-gradient = false
-bar-volume-indicator = |
-bar-volume-indicator-font = 2
-bar-volume-fill = ─
-bar-volume-fill-font = 2
-bar-volume-empty = ─
-bar-volume-empty-font = 2
-bar-volume-empty-foreground = ${colors.foreground-alt}
-
-ramp-volume-0 = 
-ramp-volume-1 = 
-
-[module/alsa]
-type = internal/alsa
-
-format-volume = <label-volume> <bar-volume>
-label-volume = VOL
-label-volume-foreground = ${root.foreground}
-
-format-muted-foreground = ${colors.foreground-alt}
-label-muted = 
-
-bar-volume-width = 10
-bar-volume-foreground-0 = #55aa55
-bar-volume-foreground-1 = #55aa55
-bar-volume-foreground-2 = #55aa55
-bar-volume-foreground-3 = #55aa55
-bar-volume-foreground-4 = #55aa55
-bar-volume-foreground-5 = #f5a70a
-bar-volume-foreground-6 = #ff5555
-bar-volume-gradient = false
-bar-volume-indicator = |
-bar-volume-indicator-font = 2
-bar-volume-fill = ─
-bar-volume-fill-font = 2
-bar-volume-empty = ─
-bar-volume-empty-font = 2
-bar-volume-empty-foreground = ${colors.foreground-alt}
-
-[module/battery]
-type = internal/battery
-time-format = %H:%M
-battery = BAT0
-adapter = AC
-full-at = 89
-
-format-charging = <animation-charging> <label-charging>
-format-charging-underline = #ffb52a
-label-charging = %percentage%% | %time%
-
-format-discharging = <animation-discharging> <label-discharging>
-format-discharging-underline = ${self.format-charging-underline}
-label-discharging = %percentage%% | %time%
-
-format-full = 
-format-full-foreground = ${colors.foreground}
-format-full-underline = ${self.format-charging-underline}
-
-ramp-capacity-0 = 
-ramp-capacity-1 = 
-ramp-capacity-2 = 
-ramp-capacity-3 = 
-ramp-capacity-4 = 
-ramp-capacity-foreground = ${colors.foreground-alt}
-
-animation-charging-0 = 
-animation-charging-1 = 
-animation-charging-2 = 
-animation-charging-3 = 
-animation-charging-4 = 
-animation-charging-foreground = ${colors.foreground}
-animation-charging-framerate = 750
-
-animation-discharging-0 = 
-animation-discharging-1 = 
-animation-discharging-2 = 
-animation-discharging-3 = 
-animation-discharging-4 = 
-animation-discharging-foreground = ${colors.foreground}
-animation-discharging-framerate = 1000
-
-[module/temperature]
-type = internal/temperature
-thermal-zone = 0
-warn-temperature = 60
-
-format = <ramp> <label>
-format-underline = #f50a4d
-format-warn = <ramp> <label-warn>
-format-warn-underline = ${self.format-underline}
-
-label = %temperature-c%
-label-warn = %temperature-c%
-label-warn-foreground = ${colors.secondary}
-
-ramp-0 = 
-ramp-1 = 
-ramp-2 = 
-ramp-foreground = ${colors.foreground}
-
-[module/powermenu]
-type = custom/menu
-
-expand-right = true
-
-format-spacing = 1
-
-label-open = 
-label-open-foreground = ${colors.secondary}
-label-close = cancel
-label-close-foreground = ${colors.secondary}
-label-separator = |
-label-separator-foreground = ${colors.foreground-alt}
-
-menu-0-0 = reboot
-menu-0-0-exec = menu-open-1
-menu-0-1 = power off
-menu-0-1-exec = menu-open-2
-menu-0-2 = sleep
-menu-0-2-exec = systemctl suspend
-
-menu-1-0 = cancel
-menu-1-0-exec = menu-open-0
-menu-1-1 = reboot
-menu-1-1-exec = sudo reboot
-
-menu-2-0 = power off
-menu-2-0-exec = sudo poweroff
-menu-2-1 = cancel
-menu-2-1-exec = menu-open-0
-
-[settings]
-screenchange-reload = true
-;compositing-background = xor
-;compositing-background = screen
-;compositing-foreground = source
-;compositing-border = over
-
-[global/wm]
-margin-top = 5
-margin-bottom = 5
-
-; vim:ft=dosini
diff --git a/bspwm/.config/polybar/launch.sh b/bspwm/.config/polybar/launch.sh
deleted file mode 100755
index c45e085..0000000
--- a/bspwm/.config/polybar/launch.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env sh
-
-# Terminate already running bar instances
-killall -q polybar
-
-# Wait until the processes have been shut down
-while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done
-
-
-# Launch bar1 and bar2
-MONITOR=$(polybar -m|tail -n1|sed -e 's/:.*$//g') polybar topbar &
-sleep 1
-MONITORS=$(polybar -m|sed -e 's/:.*$//g')
-while read -r monitor; do
-	MONITOR=$monitor polybar topbar-second &
-	sleep 1
-done <<< $MONITORS
-
-echo "Bars launched..."
diff --git a/bspwm/.config/polybar/task_polybar.sh b/bspwm/.config/polybar/task_polybar.sh
deleted file mode 100755
index 555ff1b..0000000
--- a/bspwm/.config/polybar/task_polybar.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-most_urgent_desc=`task rc.verbose: rc.report.next.columns:description rc.report.next.labels:1 limit:1 next`
-most_urgent_id=`task rc.verbose: rc.report.next.columns:id rc.report.next.labels:1 limit:1 next`
-most_urgent_due=`task rc.verbose: rc.report.next.columns:due.relative rc.report.next.labels:1 limit:1 next`
-echo "$most_urgent_id" > /tmp/tw_polybar_id
-echo "$most_urgent_desc ·  $most_urgent_due"
diff --git a/bspwm/.config/sxhkd/sxhkdrc b/bspwm/.config/sxhkd/sxhkdrc
index 48f764d..14555c0 100644
--- a/bspwm/.config/sxhkd/sxhkdrc
+++ b/bspwm/.config/sxhkd/sxhkdrc
@@ -144,3 +144,8 @@ XF86Audio{Play,Pause,Next,Prev}
 
 super + shift + Delete
 	xautolock -locknow
+
+# scratchpad
+super + `
+	id=$(cat /tmp/scratchid)
+	bspc node $id --flag hidden; bspc node -f $id