10 files changed, 35 insertions, 30 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 0019f82..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-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-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/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/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/.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
-  }
-}