# Tmux Config

- Added Catppuccin theme
- Added kitty terminal config

# Sync and Rectify Vim & NVIM

- Undo files are incompatible between VIM & NVIM - saved those files separately
- Keybinding for saving and quitting moved to VIM config
- VIM & NVIM swapfiles removed
- More VIM options set to enhance usability
- Synced system vim config and keybindings with ideavimrc

# Shell Script File Changes

- Reverted to using `#!/bin/sh` as bash is slow and not POSIX compliant.
- Reformatted

common/.config/nvim/lua/configs/configs.lua

@@ -1,2 +1,3 @@
--- Nvim Specific Configs that don't apply to VIM
+vim.opt.undodir = vim.fn.stdpath("config") .. "/undo"
+vim.opt.backupdir = vim.fn.stdpath("config") .. "/backup/"
 

common/.config/nvim/lua/configs/keymaps.lua

@@ -1,8 +1,3 @@
--- <Ctrl-Alt-s> -> to save all files
-vim.keymap.set({ "n", "i", "v" }, "<C-M-s>", "<cmd>wa<CR>", {})
--- <Ctrl-q> -> Save all files and quit Nvim
-vim.keymap.set({ "n", "i", "v" }, "<C-q>", "<cmd>wqa<CR>", {})
-
 -- Remap for dealing with word wrap
 vim.keymap.set('n', 'k', "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true })
 vim.keymap.set('n', 'j', "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })

common/.config/nvim/vim-sync.vim

@@ -1,10 +1,9 @@
 """"""""""""""""""""""""""""""""""""""
 "
-" Source common configs from VIM
+" Source common keymaps & configs from VIM
 "
 """"""""""""""""""""""""""""""""""""""
 let $VIMDIR="$HOME/.vim"
-let $NVIMDIR="$HOME/.config/nvim"
 
 " Load VIM Configurations
 source $VIMDIR/configs.vim
@@ -14,4 +13,3 @@ source $VIMDIR/key_maps.vim
 
 " Save session files to $HOME/.vim/session directory
 let g:session_dir="$VIMDIR/session"
-

common/.config/tmux/tmux.conf

@@ -79,6 +79,9 @@ set -g @resurrect-capture-pane-contents "on"
 set -g @resurrect-strategy-nvim "session"
 set -g @resurrect-dir "$HOME/.config/tmux/resurrect"
 
+# Don't exit tmux when closing a session
+set -g detach-on-destroy off
+
 #========================================================
 # APPEARANCE
 #========================================================
@@ -89,7 +92,8 @@ set -g renumber-windows on
 set-window-option -g pane-base-index 1
 
 # Improve colors
-set -g default-terminal "xterm-256color"
+set -g default-terminal "${TERM}"
+set-option -g default-terminal "xterm-256color"
 set-option -sa terminal-overrides ",xterm*:Tc"
 
 # Status at top
@@ -101,23 +105,38 @@ set -g status-position top
 run "~/.config/tmux/plugins/tpm/tpm" # Init Tmux Plugin Manager
 
 # TODO: Get into Tmux copy stuff when required
-#       set -g @plugin 'tmux-plugins/tmux-yank'
-#       set -g @plugin "tmux-plugins/tmux-copycat"
 
 set -g @plugin "christoomey/vim-tmux-navigator" # sync pane nav with Vim window nav
 set -g @plugin "tmux-plugins/tmux-resurrect" # Persist sessions
 set -g @plugin "tmux-plugins/tmux-continuum" # Auto save sessions every 15mins
 set -g @plugin 'tmux-plugins/tmux-yank'
 set -g @plugin "tmux-plugins/tmux-copycat"
-set -g @plugin "fabioluciano/tmux-tokyo-night"
+set -g @plugin "catppuccin/tmux"
 
 #========================================================
 # PLUGINS Configurations
 #========================================================
 
 # Color schemes
-set -g @theme_variation "night"
-set -g @theme_disable_plugins 1
-set -g status-right ""
+set -g @catppuccin_flavour "mocha"
+
+set -g @catppuccin_window_left_separator ""
+set -g @catppuccin_window_right_separator " "
+set -g @catppuccin_window_middle_separator " █"
+set -g @catppuccin_status_left_separator  " "
+set -g @catppuccin_status_right_separator " "
+set -g @catppuccin_status_right_separator_inverse "no"
+
+set -g @catppuccin_status_fill "icon"
+set -g @catppuccin_window_current_text "#W"
+set -g @catppuccin_window_current_fill "number"
+set -g @catppuccin_window_default_text "#W"
+set -g @catppuccin_window_default_fill "number"
+set -g @catppuccin_window_status_enable "yes"
+set -g @catppuccin_window_status_icon_enable "yes"
+set -g @catppuccin_window_number_position "right"
+set -g @catppuccin_status_connect_separator "no"
+set -g @catppuccin_directory_text "#{pane_current_path}"
+set -g @catppuccin_status_modules_right "session directory"
 
 set -g @plugin "tmux-plugins/tpm"

common/.config/wezterm/wezterm.lua

@@ -6,7 +6,7 @@ return {
     font = wezterm.font_with_fallback({
         -- "JetBrains Mono",
         "JetBrainsMono Nerd Font",
-        { family = "Symbols Nerd Font Mono", scale = 0.75 }
+        { family = "Symbols Nerd Font Mono", scale = 0.75 },
     }),
     window_decorations = "RESIZE",
     enable_tab_bar = true,
@@ -36,7 +36,7 @@ return {
             event = { Up = { streak = 1, button = "Left" } },
             mods = "CTRL",
             action = wezterm.action.OpenLinkAtMouseCursor,
-        }
+        },
     },
 
     force_reverse_video_cursor = true,