From 9baeb16a9c9f5a770ba5d15ffa7c589751345358 Mon Sep 17 00:00:00 2001
From: vx-clutch <owestness@gmail.com>
Date: Sat, 31 May 2025 21:55:36 -0400
Subject: [PATCH] save

---
 nvim/.config/nvim/lua/vxclutch/lazy/lsp.lua | 12 ++++--
 tmux/.tmux.conf                             | 48 ++++++++++++++++++---
 zsh/.zshrc                                  |  9 ++++
 3 files changed, 59 insertions(+), 10 deletions(-)

diff --git a/nvim/.config/nvim/lua/vxclutch/lazy/lsp.lua b/nvim/.config/nvim/lua/vxclutch/lazy/lsp.lua
index ad1d6b2..263b4fc 100644
--- a/nvim/.config/nvim/lua/vxclutch/lazy/lsp.lua
+++ b/nvim/.config/nvim/lua/vxclutch/lazy/lsp.lua
@@ -6,8 +6,6 @@ return {
 			"williamboman/mason-lspconfig.nvim",
 			"j-hui/fidget.nvim",
 			"stevearc/conform.nvim",
-
-			-- Completion-related plugins
 			"hrsh7th/nvim-cmp",
 			"hrsh7th/cmp-nvim-lsp",
 			"hrsh7th/cmp-buffer",
@@ -17,7 +15,6 @@ return {
 		},
 
 		config = function()
-			-- Autocomplete Setup
 			local cmp = require("cmp")
 			local luasnip = require("luasnip")
 			local capabilities = require("cmp_nvim_lsp").default_capabilities()
@@ -42,7 +39,6 @@ return {
 				}),
 			})
 
-			-- LSP + Tools Setup
 			require("conform").setup({
 				formatters_by_ft = {},
 			})
@@ -85,6 +81,14 @@ return {
 					end,
 				},
 			})
+
+			vim.diagnostic.config({
+				virtual_text = true,
+				signs = true,
+				underline = true,
+				update_in_insert = false,
+				severity_sort = true,
+			})
 		end,
 	},
 }
diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index 0f96d76..675c110 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -1,14 +1,50 @@
-set -g default-terminal "tmux-256color"
-set -ga terminal-overrides ',xterm-256color:Tc'
 set -s escape-time 0
-
+set-option -sa terminal-features ',xterm-256color:RGB'
+set-option -g allow-passthrough on
 unbind C-b
-set-option -g prefix C-s
-bind-key C-s send-prefix
+set-option -g prefix C-SPACE
+bind-key C-SPACE send-prefix
+bind r source-file ~/.config/tmux/tmux.conf
+set -g base-index 1
 
-set -g status-style 'bg=#333333 fg=#5eacd3'
+# set-option remain-on-exit on
+set -g renumber-windows on   # renumber all windows when any window is closed
+set -g escape-time 0         # zero-out escape time delay
+set-window-option -g mode-keys vi
 
+# style
+set -g status-position top
+set -g status-justify absolute-centre
+set -g status-style 'fg=color7 bg=default'
+set -g status-right ''
+# set -g status-right ' #(cd #{pane_current_path}; git rev-parse --abbrev-ref HEAD)'
+# set -g status-right ''
+set -g status-left '#S'
+set -g status-left-style 'fg=color8'
+set -g status-right-length 0
+set -g status-left-length 100
+setw -g window-status-current-style 'fg=colour1 bg=default bold'
+setw -g window-status-current-format '#I:#W '
+setw -g window-status-style 'fg=color8'
+
+# vim-like pane switching
+bind -r ^ last-window
 bind -r k select-pane -U
 bind -r j select-pane -D
 bind -r h select-pane -L
 bind -r l select-pane -R
+
+# Scripts that are baked into tmux
+bind G new-window -n 'lazygit' lazygit
+bind-key f run-shell "tmux neww ~/.config/scripts/tmux-sessionizer.sh"
+bind-key F run-shell "tmux display-popup -E ~/.config/scripts/clone.sh"
+bind-key O run-shell "tmux neww ~/.config/scripts/op.sh"
+bind-key o run-shell "tmux neww ~/.config/scripts/oa.sh"
+bind-key g run-shell "~/.config/scripts/open_github.sh"
+bind-key -r N run-shell "~/.config/scripts/tmux-sessionizer.sh ~/documents/notes"
+bind-key -r P run-shell "~/.config/scripts/tmux-sessionizer.sh ~/documents/projects"
+bind-key -r D run-shell "~/.config/scripts/tmux-sessionizer.sh ~/.config"
+bind-key -r H run-shell "~/.config/scripts/tmux-sessionizer.sh ~"
+bind-key -r K run-shell "~/.config/scripts/tmux-sessionizer.sh ~/qmk_firmware/keyboards/ferris/keymaps/sylvanfranklinferrissweep"
+bind-key -r J run-shell "~/.config/scripts/tmux-sessionizer.sh ~/Journal"
+bind-key b set-option status
diff --git a/zsh/.zshrc b/zsh/.zshrc
index b47e417..493f853 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -62,3 +62,12 @@ eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
 
 # Tmux startup if not already in tmux
 if [ "$TMUX" = "" ]; then tmux; fi
+
+
+# BEGIN opam configuration
+# This is useful if you're using opam as it adds:
+#   - the correct directories to the PATH
+#   - auto-completion for the opam binary
+# This section can be safely removed at any time if needed.
+[[ ! -r '/home/owen/.opam/opam-init/init.zsh' ]] || source '/home/owen/.opam/opam-init/init.zsh' > /dev/null 2> /dev/null
+# END opam configuration