From aece90902890c459699ddfad7ed985fbbacaaec4 Mon Sep 17 00:00:00 2001
From: Daveanand Mannie <dave@printgeek.ca>
Date: Sun, 21 Dec 2025 17:57:53 -0500
Subject: [PATCH] [chore] update some lsp  stuff and link config files

---
 lazyvim.json                                |  3 +--
 lua/plugins/conform.lua                     | 10 +++++----
 lua/plugins/langs/python/nvim-lspconfig.lua |  2 +-
 lua/plugins/langs/ruby/nvim-lspconfig.lua   | 24 ++-------------------
 lua/plugins/mason.lua                       |  1 -
 lua/plugins/snacks.lua                      |  2 +-
 zsh/.zshrc                                  |  4 ++++
 zsh/custom/aliases.zsh                      |  2 ++
 8 files changed, 17 insertions(+), 31 deletions(-)

diff --git a/lazyvim.json b/lazyvim.json
index 61c0ca7..3ccd6a7 100644
--- a/lazyvim.json
+++ b/lazyvim.json
@@ -1,7 +1,6 @@
 {
   "extras": [
-    "lazyvim.plugins.extras.lang.json",
-    "lazyvim.plugins.extras.lang.markdown"
+
   ],
   "install_version": 7,
   "news": {
diff --git a/lua/plugins/conform.lua b/lua/plugins/conform.lua
index 4c105a0..96fc639 100644
--- a/lua/plugins/conform.lua
+++ b/lua/plugins/conform.lua
@@ -1,16 +1,18 @@
 return {
 	"stevearc/conform.nvim",
 	opts = {
-		lsp_formatting = false,
-		fallback = false,
+		-- lsp_formatting = false,
+		-- fallback = false,
 		formatters_by_ft = {
 			python = { "black" },
 			go = { "goimports", "gofumpt" },
 			xml = { "lemminx" },
-			ruby = { "rubocop" },
-			json = { "biome" },
+			ruby = { "standardrb" },
+			json = { "biome" , "json-lsp"},
 			css = { "biome" },
 			javascript = { "biome" },
+			sql = { "pg_format" },
+      yaml = {"hydra_lsp"}
 		},
 	},
 	dependencies = {
diff --git a/lua/plugins/langs/python/nvim-lspconfig.lua b/lua/plugins/langs/python/nvim-lspconfig.lua
index e913c66..4c19707 100644
--- a/lua/plugins/langs/python/nvim-lspconfig.lua
+++ b/lua/plugins/langs/python/nvim-lspconfig.lua
@@ -4,7 +4,7 @@ local config_path
 
 -- Determine the config path based on the OS
 if os_info.is_linux then
-  config_path = os.getenv("HOME") .. "/.config/nvim/ruff.toml"
+  config_path = os.getenv("HOME") .. "/.config/nvim/config_files/ruff.toml"
 elseif os_info.is_windows then
   config_path = os.getenv("LOCALAPPDATA") .. "\\nvim\\ruff.toml"
 end
diff --git a/lua/plugins/langs/ruby/nvim-lspconfig.lua b/lua/plugins/langs/ruby/nvim-lspconfig.lua
index 66838a8..668700b 100644
--- a/lua/plugins/langs/ruby/nvim-lspconfig.lua
+++ b/lua/plugins/langs/ruby/nvim-lspconfig.lua
@@ -5,28 +5,8 @@ return {
 			ruby_lsp = {
 				mason = false,
 				cmd = { os.getenv("HOME") .. "/.rbenv/shims/ruby-lsp" },
-				init_options = {
-					enabled_features = {
-						codeActions = true,
-						codeLens = true,
-						completion = true,
-						definition = true,
-						diagnostics = true,
-						documentHighlights = true,
-						documentLink = true,
-						documentSymbols = true,
-						foldingRanges = true,
-						formatting = true,
-						hover = true,
-						inlayHint = true,
-						onTypeFormatting = true,
-						selectionRanges = true,
-						semanticHighlighting = true,
-						signatureHelp = true,
-						typeHierarchy = true,
-						workspaceSymbol = true,
-					},
-				},
+				single_file_support = false,
+				root_partern = { ".git" },
 			},
 		},
 	},
diff --git a/lua/plugins/mason.lua b/lua/plugins/mason.lua
index cb69dab..01ad7b9 100644
--- a/lua/plugins/mason.lua
+++ b/lua/plugins/mason.lua
@@ -16,7 +16,6 @@ return {
       "stylua",
       "lua-language-server",
       --ruby
-      "ruby-lsp",
       -- bash
       "shfmt",
       -- go
diff --git a/lua/plugins/snacks.lua b/lua/plugins/snacks.lua
index 8b740dd..39e7dd8 100644
--- a/lua/plugins/snacks.lua
+++ b/lua/plugins/snacks.lua
@@ -61,7 +61,7 @@ return {
         files = {
           hidden = true,
           ignored = true,
-          exclude = { "venvs/*", "*.pyc", "*.po" },
+          exclude = { "venvs/*", "*.pyc", "*.po" ,"node_modules/*", "bundle/*"},
           layout = { preset = "file_telescope" },
         },
       },
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 2ee4b6d..233ff42 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -110,3 +110,7 @@ export PATH="$HOME/.cargo/bin:$PATH"
 export GOPATH=$HOME/workspace/go-tools
 export GOBIN=$GOPATH/bin
 export PATH="$GOBIN:/usr/local/go/bin:$PATH"
+
+# node / js / nvm
+export NVM_DIR="$HOME/workspace/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
diff --git a/zsh/custom/aliases.zsh b/zsh/custom/aliases.zsh
index b532ece..9eadb11 100644
--- a/zsh/custom/aliases.zsh
+++ b/zsh/custom/aliases.zsh
@@ -25,3 +25,5 @@ alias erp-dev-test='cd ~/workspace/pg/erp && source venvs/odoo18/bin/activate &&
 alias erp-portal-server='erp-dev && source venvs/odoo17/bin/activate && cd odoo && python3 odoo-bin -c ../.portalrc --dev all'
 alias portal-dev='cd ~/workspace/pg/portal/'
 
+alias lg='lazygit'
+alias ..nvim="../ && nvim"