Housekeeping

.config/i3/config

@@ -152,24 +152,32 @@ exec --no-startup-id compton
 exec --no-startup-id nextcloud
 
 # Conky
-exec --no-startup-id $HOME/bin/startconky.sh
+exec --no-startup-id $HOME/bin/startup/start_conky.sh
 
 # Redshift
 exec --no-startup-id redshift-gtk
 
 # KeePassXC
-exec --no-startup-id $HOME/bin/start_keepassxc.sh
+exec --no-startup-id $HOME/bin/startup/start_keepassxc.sh
 
 # Nemo
 bindsym $mod+n exec nemo
 
-# Turn on/off internal laptop monitor
-bindsym $mod+Shift+s exec $HOME/bin/switch_monitors.sh
+# Turn on/off monitors
+bindsym $mod+m exec $HOME/bin/xrandr/switch_monitors.sh -i
+bindsym $mod+Shift+m exec $HOME/bin/xrandr/switch_monitors.sh -e
+
+# Monitor setup
+exec --no-startup-id $HOME/bin/xrandr/monitor_setup.sh single
+
+# Window titlebar
+for_window [class="^.*"] border pixel 2
 
 # reload the configuration file
 bindsym $mod+Shift+c reload
 # restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
 bindsym $mod+Shift+r restart
+
 # exit i3 (logs you out of your X session)
 bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'"
 

.config/polybar/config

@@ -45,13 +45,13 @@ padding-right = 2
 module-margin-left = 2
 module-margin-right = 2
 
-font-0 = Icons:size=10;1
+font-0 = FontAwesome:size=10;1
 font-1 = siji:pixelsize=10;1
 font-2 = Weather Icons:size=10;1
 
-modules-left = i3
+modules-left = powermenu i3
 modules-center = datetime openweathermap
-modules-right = system-usb-udev updates pulseaudio-tail wlan eth xkeyboard battery
+modules-right = system-usb-udev updates pulseaudio-tail wlan eth vpn xkeyboard battery
 
 tray-detached = false
 tray-position = right
@@ -75,7 +75,7 @@ label-indicator-underline = ${colors.secondary}
 
 [module/openweathermap]
 type = custom/script
-exec = ~/bin/openweathermap-simple.sh
+exec = ~/bin/polybar/openweathermap-simple.sh
 interval = 600
 label-font = 3
 
@@ -148,7 +148,7 @@ interface = wlo1
 interval = 3.0
 
 format-connected =  <label-connected>
-label-connected = ""
+label-connected = " %essid%" 
 
 format-disconnected =
 
@@ -175,6 +175,10 @@ label-close-foreground = ${colors.foreground}
 label-separator = " / "
 label-separator-foreground = ${colors.foreground}
 
+;logout
+menu-0-2 = ""
+menu-0-2-exec = i3-msg exit
+menu-0-2-foreground = ${colors.foreground}
 ; reboot
 menu-0-1 = ""
 menu-0-1-exec = systemctl reboot
@@ -196,19 +200,25 @@ click-left = gsimplecal
 
 [module/system-usb-udev]
 type = custom/script
-exec = ~/bin/system-usb-udev.sh
+exec = ~/bin/polybar/system-usb-udev.sh
 tail = true
-click-left = ~/bin/system-usb-udev.sh --mount
-click-right = ~/bin/system-usb-udev.sh --unmount
+click-left = ~/bin/polybar/system-usb-udev.sh --mount
+click-right = ~/bin/polybar/system-usb-udev.sh --unmount
 
 [module/pulseaudio-tail]
 type = custom/script
-exec = ~/bin/pulseaudio-tail.sh 2> /dev/null
+exec = ~/bin/polybar/pulseaudio-tail.sh 2> /dev/null
 tail = true
-click-right = ~/bin/pulseaudio-tail.sh --show 2> /dev/null
-click-left = ~/bin/pulseaudio-tail.sh --mute 2> /dev/null
-scroll-up = ~/bin/pulseaudio-tail.sh --up 2> /dev/null
-scroll-down = ~/bin/pulseaudio-tail.sh --down 2> /dev/null
+click-right = ~/bin/polybar/pulseaudio-tail.sh --show 2> /dev/null
+click-left = ~/bin/polybar/pulseaudio-tail.sh --mute 2> /dev/null
+scroll-up = ~/bin/polybar/pulseaudio-tail.sh --up 2> /dev/null
+scroll-down = ~/bin/polybar/pulseaudio-tail.sh --down 2> /dev/null
+
+[module/vpn]
+type = custom/script
+exec = ~/bin/polybar/vpn_running.sh
+interval = 5
+click-left = ~/bin/polybar/vpn_country.sh
 
 [module/updates]
 type = custom/script
@@ -229,6 +239,11 @@ format-charging-underline = ${colors.secondary}
 format-discharging = <label-discharging>
 format-discharging-underline = ${colors.alert}
 
+label-full = ""
+label-discharging = " %percentage%"
+label-charging = " %percentage%"
+
+
 [global/wm]
 margin-top = 5
 margin-bottom = 5