modified aerospace/aerospace.toml, modified borders/bordersrc, modified sesh/sesh.toml, modified shell/bm-files, modified sketchybar/sketchybarrc

5 files changed, 202 insertions, 190 deletions

diff --git a/mac/.config/aerospace/aerospace.toml b/mac/.config/aerospace/aerospace.toml
index c684090..0019f82 100644
--- a/mac/.config/aerospace/aerospace.toml
+++ b/mac/.config/aerospace/aerospace.toml
@@ -110,8 +110,8 @@ on-focus-changed = ['move-mouse window-lazy-center']
     alt-c = 'exec-and-forget /Applications/kitty.app/Contents/MacOS/kitty --title "calcurse" -e calcurse'
     alt-d = 'exec-and-forget open -na Dbeaver'
     alt-e = 'exec-and-forget /Applications/kitty.app/Contents/MacOS/kitty --title "neomutt" -e neomutt'
-    alt-n = 'exec-and-forget /Applications/kitty.app/Contents/MacOS/kitty --title "newsboat" -e newsboat'
     alt-r = 'exec-and-forget /Applications/kitty.app/Contents/MacOS/kitty --title "htop" -e htop'
+    alt-s = 'exec-and-forget /Applications/kitty.app/Contents/MacOS/kitty --title "newsboat" -e newsboat'
     alt-t = 'exec-and-forget open -na "Microsoft Teams"'
     alt-w = 'exec-and-forget open -na Firefox'
 
diff --git a/mac/.config/borders/bordersrc b/mac/.config/borders/bordersrc
index d043d83..f73156d 100755
--- a/mac/.config/borders/bordersrc
+++ b/mac/.config/borders/bordersrc
@@ -1,12 +1,12 @@
 #!/bin/bash
 
 options=(
-	style=square
-	width=6.0
-	hidpi=on
-	active_color=0xff269043
-	# active_color="gradient(top_left=0xffebeb99,bottom_right=0xfff57f17)"
-	inactive_color=0xff4b5356
+  style=square
+  width=6.0
+  hidpi=on
+  active_color=0xff770000
+  # active_color="gradient(top_left=0xffebeb99,bottom_right=0xfff57f17)"
+  inactive_color=0xff444444
 )
 
 borders "${options[@]}"
diff --git a/mac/.config/sesh/sesh.toml b/mac/.config/sesh/sesh.toml
index 349c5ba..954e199 100644
--- a/mac/.config/sesh/sesh.toml
+++ b/mac/.config/sesh/sesh.toml
@@ -42,6 +42,10 @@ name = "public"
 path = "~/Public"
 
 [[session]]
+name = "work"
+path = "~/Desktop/work"
+
+[[session]]
 name = "scripts"
 path = "~/.local/bin"
 
diff --git a/mac/.config/shell/bm-files b/mac/.config/shell/bm-files
index 81774e5..bb83c7b 100644
--- a/mac/.config/shell/bm-files
+++ b/mac/.config/shell/bm-files
@@ -28,9 +28,9 @@ vns     ${XDG_CONFIG_HOME:-${HOME}/.config}/newsboat/config
 vnu     ${XDG_CONFIG_HOME:-${HOME}/.config}/newsboat/urls                       # Newsboat url (RSS reader)
 vqt     ${XDG_CONFIG_HOME:-${HOME}/.config}/qutebrowser/config.py               # Qutebrowser config
 Vsm     /etc/samba/smb.conf                                                     # Samba config
-vsc     $HOME/.ssh/config                                                       # SSH config
 vse     ${XDG_CONFIG_HOME:-${HOME}/.config}/sesh/sesh.toml                      # Sesh config
 vsf     ${XDG_SOURCES_HOME:-${HOME}/.local/src}/suckless/surf/config.def.h      # Surf: a simple browser
+vsh     $HOME/.ssh/config                                                       # SSH config
 vsk     ${XDG_CONFIG_HOME:-${HOME}/.config}/sketchybar/sketchybarrc             # Sketchybar config
 vsl     ${XDG_SOURCES_HOME:-${HOME}/.local/src}/suckless/slock/config.def.h     # Slock: lock screen
 vsp     ${XDG_DATA_HOME:-${HOME}/.local/share}/thesiah/snippets                 # Snippets
diff --git a/mac/.config/sketchybar/sketchybarrc b/mac/.config/sketchybar/sketchybarrc
index 1169de5..7da0bd0 100755
--- a/mac/.config/sketchybar/sketchybarrc
+++ b/mac/.config/sketchybar/sketchybarrc
@@ -10,16 +10,16 @@ PLUGIN_DIR="$CONFIG_DIR/plugins"
 
 ##### Bar Appearance #####
 sketchybar --bar position=top height=42 \
-                 color=$BAR_COLOR \
-                 border_width=0 \
-                 corner_radius=0 \
-                 margin=0 \
-                 blur_radius=0 \
-                 padding_left=16 \
-                 padding_right=16 \
-                 shadow=off \
-                 sticky=on \
-                 topmost=window
+  color=$BAR_COLOR \
+  border_width=0 \
+  corner_radius=0 \
+  margin=0 \
+  blur_radius=0 \
+  padding_left=16 \
+  padding_right=16 \
+  shadow=off \
+  sticky=on \
+  topmost=window
 
 ##### Changing Defaults #####
 default=(
@@ -50,221 +50,230 @@ sketchybar --default "${default[@]}"
 
 # Apple Logo
 sketchybar --add item apple.logo left \
-           --set apple.logo icon=$APPLE \
-                           icon.font="SF Pro:Black:16.0" \
-                           icon.color=$ACCENT_SECONDARY \
-                           padding_right=12 \
-                           padding_left=4 \
-                           label.drawing=off \
-                           click_script="$PLUGIN_DIR/apple.sh"
+  --set apple.logo icon=$APPLE \
+  icon.font="SF Pro:Black:16.0" \
+  icon.color=$ACCENT_SECONDARY \
+  padding_right=12 \
+  padding_left=4 \
+  label.drawing=off \
+  click_script="$PLUGIN_DIR/apple.sh"
 
 # Aerospace Display-Aware Workspaces
 sketchybar --add event aerospace_workspace_change
 
 # Monitor 1 Workspace Indicator (Primary - Built-in Display)
 sketchybar --add item monitor_1_workspace left \
-           --subscribe monitor_1_workspace aerospace_workspace_change \
-           --set monitor_1_workspace \
-                 icon="M1:4" \
-                 icon.font="SF Pro:Medium:12.0" \
-                 icon.color=$GREY \
-                 icon.padding_left=8 \
-                 icon.padding_right=8 \
-                 label.drawing=off \
-                 padding_left=4 \
-                 padding_right=4 \
-                 background.color=$BACKGROUND_1 \
-                 background.corner_radius=6 \
-                 background.height=26 \
-                 background.drawing=on \
-                 script="$PLUGIN_DIR/aerospace_display.sh"
+  --subscribe monitor_1_workspace aerospace_workspace_change \
+  --set monitor_1_workspace \
+  icon="M1:4" \
+  icon.font="SF Pro:Medium:12.0" \
+  icon.color=$GREY \
+  icon.padding_left=8 \
+  icon.padding_right=8 \
+  label.drawing=off \
+  padding_left=4 \
+  padding_right=4 \
+  background.color=$BACKGROUND_1 \
+  background.corner_radius=6 \
+  background.height=26 \
+  background.drawing=on \
+  script="$PLUGIN_DIR/aerospace_display.sh"
 
 # Monitor 2 Workspace Indicator (External - MAG 274UPF E2)
 sketchybar --add item monitor_2_workspace left \
-           --subscribe monitor_2_workspace aerospace_workspace_change \
-           --set monitor_2_workspace \
-                 icon="M2:1" \
-                 icon.font="SF Pro:Medium:12.0" \
-                 icon.color=$GREY \
-                 icon.padding_left=8 \
-                 icon.padding_right=8 \
-                 label.drawing=off \
-                 padding_left=4 \
-                 padding_right=4 \
-                 background.color=$BACKGROUND_1 \
-                 background.corner_radius=6 \
-                 background.height=26 \
-                 background.drawing=on \
-                 script="$PLUGIN_DIR/aerospace_display.sh"
+  --subscribe monitor_2_workspace aerospace_workspace_change \
+  --set monitor_2_workspace \
+  icon="M2:1" \
+  icon.font="SF Pro:Medium:12.0" \
+  icon.color=$GREY \
+  icon.padding_left=8 \
+  icon.padding_right=8 \
+  label.drawing=off \
+  padding_left=4 \
+  padding_right=4 \
+  background.color=$BACKGROUND_1 \
+  background.corner_radius=6 \
+  background.height=26 \
+  background.drawing=on \
+  script="$PLUGIN_DIR/aerospace_display.sh"
 
 # Monitor Connection Watcher (detects when monitors are connected/disconnected)
 sketchybar --add item monitor_watcher left \
-           --set monitor_watcher \
-                 drawing=off \
-                 update_freq=5 \
-                 script="$PLUGIN_DIR/monitor_watcher.sh"
+  --set monitor_watcher \
+  drawing=off \
+  update_freq=5 \
+  script="$PLUGIN_DIR/monitor_watcher.sh"
 
 # Separator
 sketchybar --add item separator left \
-           --set separator icon="󰇙" \
-                          icon.font="SF Pro:Regular:16.0" \
-                          icon.color=$ACCENT_TERTIARY \
-                          padding_left=12 \
-                          padding_right=8 \
-                          label.drawing=off
+  --set separator icon="󰇙" \
+  icon.font="SF Pro:Regular:16.0" \
+  icon.color=$ACCENT_TERTIARY \
+  padding_left=12 \
+  padding_right=8 \
+  label.drawing=off
 
 # Front App
 sketchybar --add item front_app left \
-           --set front_app icon.drawing=on \
-                          icon.font="SF Pro:Semibold:15.0" \
-                          icon.color=$ACCENT_QUATERNARY \
-                          icon.padding_left=6 \
-                          icon.padding_right=8 \
-                          label.font="SF Pro:Medium:13.0" \
-                          label.color=$WHITE \
-                          label.padding_left=4 \
-                          label.padding_right=8 \
-                          padding_left=8 \
-                          padding_right=8 \
-                          script="$PLUGIN_DIR/front_app.sh" \
-           --subscribe front_app front_app_switched
+  --set front_app icon.drawing=on \
+  icon.font="SF Pro:Semibold:15.0" \
+  icon.color=$ACCENT_QUATERNARY \
+  icon.padding_left=6 \
+  icon.padding_right=8 \
+  label.font="SF Pro:Medium:13.0" \
+  label.color=$WHITE \
+  label.padding_left=4 \
+  label.padding_right=8 \
+  padding_left=8 \
+  padding_right=8 \
+  script="$PLUGIN_DIR/front_app.sh" \
+  --subscribe front_app front_app_switched
 
 ##### Right Side Items #####
 
-
-
 # Calendar Events
 sketchybar --add item calendar right \
-           --set calendar icon.font="SF Pro:Semibold:12.0" \
-                          icon.padding_left=8 \
-                          icon.padding_right=6 \
-                          label.font="SF Pro:Medium:10.0" \
-                          label.padding_left=4 \
-                          label.padding_right=8 \
-                          label.max_chars=25 \
-                          update_freq=300 \
-                          script="$PLUGIN_DIR/calendar.sh" \
-                          background.color=$BACKGROUND_1 \
-                          background.drawing=on \
-                          background.height=26 \
-                          padding_left=4 \
-                          padding_right=4
+  --set calendar icon.font="SF Pro:Semibold:12.0" \
+  icon.padding_left=8 \
+  icon.padding_right=6 \
+  label.font="SF Pro:Medium:10.0" \
+  label.padding_left=4 \
+  label.padding_right=8 \
+  label.max_chars=25 \
+  update_freq=300 \
+  script="$PLUGIN_DIR/calendar.sh" \
+  background.color=$BACKGROUND_1 \
+  background.drawing=on \
+  background.height=26 \
+  padding_left=4 \
+  padding_right=4
 
 # Now Playing
 sketchybar --add item now_playing right \
-           --set now_playing icon.font="SF Pro:Semibold:15.0" \
-                            icon.padding_left=8 \
-                            icon.padding_right=6 \
-                            label.font="SF Pro:Medium:12.0" \
-                            label.padding_left=4 \
-                            label.padding_right=8 \
-                            update_freq=2 \
-                            script="$PLUGIN_DIR/now_playing.sh" \
-                            background.color=$BACKGROUND_1 \
-                            background.drawing=on \
-                            drawing=off \
-                            padding_left=4 \
-                            padding_right=4
-
-
+  --set now_playing icon.font="SF Pro:Semibold:15.0" \
+  icon.padding_left=8 \
+  icon.padding_right=6 \
+  label.font="SF Pro:Medium:12.0" \
+  label.padding_left=4 \
+  label.padding_right=8 \
+  update_freq=2 \
+  script="$PLUGIN_DIR/now_playing.sh" \
+  background.color=$BACKGROUND_1 \
+  background.drawing=on \
+  drawing=off \
+  padding_left=4 \
+  padding_right=4
 
 # WiFi Status
 sketchybar --add item wifi right \
-           --set wifi icon.font="SF Pro:Semibold:15.0" \
-                      icon.padding_left=8 \
-                      icon.padding_right=8 \
-                      label.drawing=off \
-                      update_freq=10 \
-                      script="$PLUGIN_DIR/wifi.sh" \
-                      background.color=$BACKGROUND_1 \
-                      background.drawing=on \
-                      padding_left=4 \
-                      padding_right=4
+  --set wifi icon.font="SF Pro:Semibold:15.0" \
+  icon.padding_left=8 \
+  icon.padding_right=8 \
+  label.drawing=off \
+  update_freq=10 \
+  script="$PLUGIN_DIR/wifi.sh" \
+  background.color=$BACKGROUND_1 \
+  background.drawing=on \
+  padding_left=4 \
+  padding_right=4
 
 # Bluetooth Status
 sketchybar --add item bluetooth right \
-           --set bluetooth icon.font="SF Pro:Semibold:15.0" \
-                          icon.padding_left=9 \
-                          icon.padding_right=9 \
-                          label.drawing=off \
-                          update_freq=10 \
-                          script="$PLUGIN_DIR/bluetooth.sh" \
-                          background.color=$BACKGROUND_1 \
-                          background.drawing=on \
-                          padding_left=4 \
-                          padding_right=4
+  --set bluetooth icon.font="SF Pro:Semibold:15.0" \
+  icon.padding_left=9 \
+  icon.padding_right=9 \
+  label.drawing=off \
+  update_freq=10 \
+  script="$PLUGIN_DIR/bluetooth.sh" \
+  background.color=$BACKGROUND_1 \
+  background.drawing=on \
+  padding_left=4 \
+  padding_right=4
+
+# Input Source
+sketchybar --add item input_source right \
+  --set input_source icon.font="SF Pro:Semibold:15.0" \
+  icon.font="SF Pro:Semibold:15.0" \
+  icon.padding_left=8 \
+  icon.padding_right=10 \
+  label.drawing=off \
+  update_freq=1 \
+  script="$PLUGIN_DIR/get_input_source.sh" \
+  background.color=$BACKGROUND_1 \
+  background.drawing=on \
+  padding_left=4 \
+  padding_right=4
 
 # Clock
 sketchybar --add item clock right \
-           --set clock icon="󰅐" \
-                       icon.font="SF Pro:Semibold:15.0" \
-                       icon.color=$YELLOW \
-                       icon.padding_left=8 \
-                       icon.padding_right=6 \
-                       label.font="SF Pro:Medium:12.0" \
-                       label.color=$WHITE \
-                       label.padding_left=4 \
-                       label.padding_right=8 \
-                       update_freq=10 \
-                       script="$PLUGIN_DIR/clock.sh" \
-                       background.color=$BACKGROUND_1 \
-                       background.drawing=on \
-                       padding_left=4 \
-                       padding_right=4 \
-                       click_script="$PLUGIN_DIR/clock_click.sh"
+  --set clock icon="󰅐" \
+  icon.font="SF Pro:Semibold:15.0" \
+  icon.color=$YELLOW \
+  icon.padding_left=8 \
+  icon.padding_right=6 \
+  label.font="SF Pro:Medium:12.0" \
+  label.color=$WHITE \
+  label.padding_left=4 \
+  label.padding_right=8 \
+  update_freq=10 \
+  script="$PLUGIN_DIR/clock.sh" \
+  background.color=$BACKGROUND_1 \
+  background.drawing=on \
+  padding_left=4 \
+  padding_right=4 \
+  click_script="$PLUGIN_DIR/clock_click.sh"
 
 # Volume
 sketchybar --add item volume right \
-           --set volume icon.font="SF Pro:Semibold:15.0" \
-                        icon.color=$ACCENT_PRIMARY \
-                        icon.padding_left=10 \
-                        icon.padding_right=12 \
-                        label.drawing=off \
-                        script="$PLUGIN_DIR/volume.sh" \
-                        background.color=$BACKGROUND_1 \
-                        background.drawing=on \
-                        padding_left=4 \
-                        padding_right=4 \
-                        click_script="$PLUGIN_DIR/volume_click.sh" \
-                        popup.background.border_width=2 \
-                        popup.background.corner_radius=6 \
-                        popup.background.border_color=$POPUP_BORDER_COLOR \
-                        popup.background.color=$POPUP_BACKGROUND_COLOR \
-                        popup.horizontal=on \
-           --subscribe volume volume_change
+  --set volume icon.font="SF Pro:Semibold:15.0" \
+  icon.color=$ACCENT_PRIMARY \
+  icon.padding_left=10 \
+  icon.padding_right=12 \
+  label.drawing=off \
+  script="$PLUGIN_DIR/volume.sh" \
+  background.color=$BACKGROUND_1 \
+  background.drawing=on \
+  padding_left=4 \
+  padding_right=4 \
+  click_script="$PLUGIN_DIR/volume_click.sh" \
+  popup.background.border_width=2 \
+  popup.background.corner_radius=6 \
+  popup.background.border_color=$POPUP_BORDER_COLOR \
+  popup.background.color=$POPUP_BACKGROUND_COLOR \
+  popup.horizontal=on \
+  --subscribe volume volume_change
 
 # Battery
 sketchybar --add item battery right \
-           --set battery icon.font="SF Pro:Semibold:15.0" \
-                        icon.color=$ACCENT_SECONDARY \
-                        icon.padding_left=8 \
-                        icon.padding_right=6 \
-                        label.font="SF Pro:Medium:12.0" \
-                        label.color=$WHITE \
-                        label.padding_left=4 \
-                        label.padding_right=8 \
-                        update_freq=120 \
-                        script="$PLUGIN_DIR/battery.sh" \
-                        background.color=$BACKGROUND_1 \
-                        background.drawing=on \
-                        padding_left=4 \
-                        padding_right=4 \
-           --subscribe battery system_woke power_source_change
+  --set battery icon.font="SF Pro:Semibold:15.0" \
+  icon.color=$ACCENT_SECONDARY \
+  icon.padding_left=8 \
+  icon.padding_right=6 \
+  label.font="SF Pro:Medium:12.0" \
+  label.color=$WHITE \
+  label.padding_left=4 \
+  label.padding_right=8 \
+  update_freq=120 \
+  script="$PLUGIN_DIR/battery.sh" \
+  background.color=$BACKGROUND_1 \
+  background.drawing=on \
+  padding_left=4 \
+  padding_right=4 \
+  --subscribe battery system_woke power_source_change
 
 # Pritunl VPN
 sketchybar --add item pritunl right \
-           --set pritunl icon="􀤆" \
-                        icon.font="SF Pro:Semibold:13.0" \
-                        icon.color=$ACCENT_PRIMARY \
-                        icon.padding_left=8 \
-                        icon.padding_right=10 \
-                        label.drawing=off \
-                        background.color=$BACKGROUND_1 \
-                        background.drawing=on \
-                        padding_left=4 \
-                        padding_right=4 \
-                        click_script="open -a Pritunl"
-
+  --set pritunl icon="􀤆" \
+  icon.font="SF Pro:Semibold:13.0" \
+  icon.color=$ACCENT_PRIMARY \
+  icon.padding_left=8 \
+  icon.padding_right=10 \
+  label.drawing=off \
+  background.color=$BACKGROUND_1 \
+  background.drawing=on \
+  padding_left=4 \
+  padding_right=4 \
+  click_script="open -a Pritunl"
 
 # Weather
 # sketchybar --add item weather right \
@@ -284,4 +293,3 @@ sketchybar --add item pritunl right \
 
 ##### Finalize Setup #####
 sketchybar --update
-