updates

14 files changed, 236 insertions, 219 deletions

diff --git a/ar/.config/TheSiahxyz/lua/TheSiahxyz/core/keymaps.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/core/keymaps.lua
index 500abf0..5b461ab 100644
--- a/ar/.config/TheSiahxyz/lua/TheSiahxyz/core/keymaps.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/core/keymaps.lua
@@ -68,7 +68,7 @@ vim.keymap.set("n", "gcD", function()
 	vim.cmd("cd " .. vim.fn.fnameescape(vim.fn.fnamemodify(realpath, ":h")))
 	vim.cmd("pwd")
 end, { desc = "Go to real path of current file" })
-vim.keymap.set("n", "gc.", ":cd ..<cr>:pwd<cr>", { desc = "Go to current file path" })
+vim.keymap.set("n", "gc.", ":cd ..<cr>:pwd<cr>", { desc = "Go to parent file path" })
 
 -- Check health
 vim.keymap.set("n", "<leader>ch", ":checkhealth<cr>", { desc = "Check neovim health" })
diff --git a/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/ssh.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/ssh.lua
new file mode 100644
index 0000000..20cead1
--- /dev/null
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/ssh.lua
@@ -0,0 +1,10 @@
+return {
+	"amitds1997/remote-nvim.nvim",
+	version = "*", -- Pin to GitHub releases
+	dependencies = {
+		"nvim-lua/plenary.nvim", -- For standard functions
+		"MunifTanjim/nui.nvim", -- To build the plugin UI
+		"nvim-telescope/telescope.nvim", -- For picking b/w different remote methods
+	},
+	config = true,
+}
diff --git a/mac/.config/TheSiahxyz/lua/TheSiahxyz/core/keymaps.lua b/mac/.config/TheSiahxyz/lua/TheSiahxyz/core/keymaps.lua
index 500abf0..5b461ab 100644
--- a/mac/.config/TheSiahxyz/lua/TheSiahxyz/core/keymaps.lua
+++ b/mac/.config/TheSiahxyz/lua/TheSiahxyz/core/keymaps.lua
@@ -68,7 +68,7 @@ vim.keymap.set("n", "gcD", function()
 	vim.cmd("cd " .. vim.fn.fnameescape(vim.fn.fnamemodify(realpath, ":h")))
 	vim.cmd("pwd")
 end, { desc = "Go to real path of current file" })
-vim.keymap.set("n", "gc.", ":cd ..<cr>:pwd<cr>", { desc = "Go to current file path" })
+vim.keymap.set("n", "gc.", ":cd ..<cr>:pwd<cr>", { desc = "Go to parent file path" })
 
 -- Check health
 vim.keymap.set("n", "<leader>ch", ":checkhealth<cr>", { desc = "Check neovim health" })
diff --git a/mac/.config/TheSiahxyz/lua/TheSiahxyz/plugins/goyo.lua b/mac/.config/TheSiahxyz/lua/TheSiahxyz/plugins/goyo.lua
index 86b9a03..b268472 100644
--- a/mac/.config/TheSiahxyz/lua/TheSiahxyz/plugins/goyo.lua
+++ b/mac/.config/TheSiahxyz/lua/TheSiahxyz/plugins/goyo.lua
@@ -5,7 +5,7 @@ return {
 		-- Enable Goyo by default for mutt writing
 		vim.api.nvim_create_autocmd({ "BufRead", "BufNewFile" }, {
 			group = vim.api.nvim_create_augroup("TheSiahxyz_goyo_config", { clear = true }),
-			pattern = "/tmp/neomutt*",
+			pattern = "/private/var/folders/rz/*/T/neomutt*",
 			callback = function()
 				vim.g.goyo_width = 80
 				vim.g.seoul256_background = 235
diff --git a/mac/.config/TheSiahxyz/lua/TheSiahxyz/plugins/ssh.lua b/mac/.config/TheSiahxyz/lua/TheSiahxyz/plugins/ssh.lua
new file mode 100644
index 0000000..20cead1
--- /dev/null
+++ b/mac/.config/TheSiahxyz/lua/TheSiahxyz/plugins/ssh.lua
@@ -0,0 +1,10 @@
+return {
+	"amitds1997/remote-nvim.nvim",
+	version = "*", -- Pin to GitHub releases
+	dependencies = {
+		"nvim-lua/plenary.nvim", -- For standard functions
+		"MunifTanjim/nui.nvim", -- To build the plugin UI
+		"nvim-telescope/telescope.nvim", -- For picking b/w different remote methods
+	},
+	config = true,
+}
diff --git a/mac/.config/TheSiahxyz/lua/TheSiahxyz/plugins/telescope.lua b/mac/.config/TheSiahxyz/lua/TheSiahxyz/plugins/telescope.lua
index 9460187..dfaffea 100644
--- a/mac/.config/TheSiahxyz/lua/TheSiahxyz/plugins/telescope.lua
+++ b/mac/.config/TheSiahxyz/lua/TheSiahxyz/plugins/telescope.lua
@@ -645,7 +645,7 @@ return {
 				require("telescope.builtin").buffers({
 					sort_mru = true,
 					sort_lastused = true,
-					initial_mode = "normal",
+					-- initial_mode = "normal",
 				})
 			end, { desc = "Find buffer files" })
 			vim.keymap.set("n", "<leader>fb", function()
diff --git a/mac/.config/aerospace/aerospace.toml b/mac/.config/aerospace/aerospace.toml
index c684090..0737240 100644
--- a/mac/.config/aerospace/aerospace.toml
+++ b/mac/.config/aerospace/aerospace.toml
@@ -107,11 +107,12 @@ on-focus-changed = ['move-mouse window-lazy-center']
     # See: https://nikitabobko.github.io/AeroSpace/commands#exec-and-forget
     # alt-enter = 'exec-and-forget open -n /System/Applications/Utilities/Terminal.app'
     alt-enter = 'exec-and-forget open -n /Applications/Kitty.app'
-    alt-c = 'exec-and-forget /Applications/kitty.app/Contents/MacOS/kitty --title "calcurse" -e calcurse'
+    alt-c = 'exec-and-forget 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-e = 'exec-and-forget kitty --title "neomutt" -e env EDITOR="nvim -u ~/.config/nvim/init.lua" neomutt'
+    alt-shift-e = 'exec-and-forget open -na "Microsoft Outlook"'
+    alt-r = 'exec-and-forget kitty --title "htop" -e htop'
+    alt-s = 'exec-and-forget 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/aliasrc b/mac/.config/shell/aliasrc
index 30fb9f9..270227c 100644
--- a/mac/.config/shell/aliasrc
+++ b/mac/.config/shell/aliasrc
@@ -460,6 +460,9 @@ alias uzl='unzip -l'
 alias vi='vim'
 alias vi.='vim .'
 
+# vpn
+alias ovpn='sudo openvpn --config ~/.config/openvpn/thesiah.ovpn'
+
 # watch
 alias w1='watch -n 1'
 
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/shell/profile b/mac/.config/shell/profile
index 2101982..5549050 100644
--- a/mac/.config/shell/profile
+++ b/mac/.config/shell/profile
@@ -129,6 +129,9 @@ export LYNX_CFG_PATH="$XDG_CONFIG_HOME/lynx"
     export LESSOPEN="| lesspipe.sh %s"
 }
 
+### --- MBSYNC --- ###
+export MBSYNCRC="$XDG_CONFIG_HOME/mbsync/config"
+
 ### --- MOZILLA --- ###
 export MOZ_USE_XINPUT2=1 # Mozilla smooth scrolling/touchpads.
 
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
-
diff --git a/mac/.local/bin/ovpn b/mac/.local/bin/ovpn
deleted file mode 100755
index a89c357..0000000
--- a/mac/.local/bin/ovpn
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-turnonoffvpn() {
-  case "$1" in
-  *on*)
-    nmcli connection up "$THESIAH_VPN" 2>/dev/null && notify-send "🛰️ THESIAH_VPN: ON" || notify-send "🛰️ Error to connect"
-    ;;
-  *off*)
-    nmcli connection down "$THESIAH_VPN" 2>/dev/null && notify-send "✂️ THESIAH_VPN: OFF" || notify-send "✂️ Error to disconnect"
-
-    ;;
-  esac
-}
-
-[ -n "$(cat /sys/class/net/tun*/operstate 2>/dev/null)" ] && {
-  turnonoffvpn off
-} || {
-  nmcli connection show | grep "$THESIAH_VPN" >/dev/null 2>&1 && turnonoffvpn on || {
-    nmcli connection import type openvpn file ~/.config/openvpn/thesiah.ovpn >/dev/null 2>&1
-    turnonoffvpn on
-  }
-}