Updated nvimHEADmain

9 files changed, 70 insertions, 73 deletions

diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 275c609..6635444 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -19,20 +19,22 @@ vim.g.loaded_perl_provider = 0
 vim.g.loaded_ruby_provider = 0
 vim.g.loaded_python3_provider = 0
 
+vim.o.autocomplete = true
+
 vim.o.list = true
 vim.o.mouse = 'a'
 
 vim.o.foldcolumn = "auto"
 vim.o.cursorline = true
 vim.o.laststatus = 2
-vim.o.statusline = table.concat({
-	'%<%n:',
-	'%f %h%w%m%r%y ',
-	'%=',
-	"%{% &showcmdloc == 'statusline' ? '%-10.S ' : '' %}",
-	"%{% exists('b:keymap_name') ? '<'..b:keymap_name..'> ' : '' %}",
-	"%{% &ruler ? ( &rulerformat == '' ? '%-14.(%l,%c%V%) %P' : &rulerformat ) : '' %}",
-})
+-- vim.o.statusline = table.concat({
+-- 	'%<%n:',
+-- 	'%f %h%w%m%r%y ',
+-- 	'%=',
+-- 	"%{% &showcmdloc == 'statusline' ? '%-10.S ' : '' %}",
+-- 	"%{% exists('b:keymap_name') ? '<'..b:keymap_name..'> ' : '' %}",
+-- 	"%{% &ruler ? ( &rulerformat == '' ? '%-14.(%l,%c%V%) %P' : &rulerformat ) : '' %}",
+-- })
 vim.o.signcolumn = 'yes'
 
 vim.o.completeopt = "menuone,noselect,popup,fuzzy"
@@ -58,11 +60,26 @@ for _, value in ipairs({
 	vim.keymap.set({ 'n', 'i' }, value, '<Nop>', { noremap = true, silent = false })
 end
 
+vim.pack.add {
+	'git://git.sudomsg.com/mirror/nvim-treesitter',
+	'git://git.sudomsg.com/mirror/nvim-lspconfig',
+	'git://git.sudomsg.com/mirror/mason',
+	'git://git.sudomsg.com/mirror/mason-lspconfig',
+}
+
+vim.api.nvim_create_autocmd('PackChanged', {
+	callback = function(ev)
+		local name, kind = ev.data.spec.name, ev.data.kind
+		if name == 'nvim-treesitter' and kind == 'update' then
+			if not ev.data.active then vim.cmd.packadd('nvim-treesitter') end
+			require 'nvim-treesitter'.update()
+		end
+	end
+})
+
 require 'mason'.setup {}
 require 'mason-lspconfig'.setup {}
 
-require 'nvim-treesitter'.update()
-
 vim.api.nvim_create_autocmd('FileType', {
 	callback = function(args)
 		local ok = pcall(vim.treesitter.start, args.buf, args.match)
diff --git a/.config/nvim/lua/lsp.lua b/.config/nvim/lua/lsp.lua
index 144eb6a..aeee855 100644
--- a/.config/nvim/lua/lsp.lua
+++ b/.config/nvim/lua/lsp.lua
@@ -19,7 +19,7 @@ function Lsp(client, buf)
 		vim.lsp.buf.type_definition()
 	end, { buffer = buf })
 
-	vim.keymap.set({'n', 'v'}, '<leader>f', ":Format<CR>", { buffer = buf })
+	vim.keymap.set({ 'n', 'v' }, '<leader>f', ":Format<CR>", { buffer = buf })
 
 	vim.api.nvim_buf_create_user_command(buf, "Format", function(args)
 		local range = nil
@@ -50,39 +50,16 @@ function Lsp(client, buf)
 		end, { buffer = buf })
 	end
 
-	if client:supports_method(ms.textDocument_completion) then
-		local chars = {}
-		for i = 32, 126 do
-			table.insert(chars, string.char(i))
-		end
-		client.server_capabilities.completionProvider.triggerCharacters = chars
-		vim.lsp.completion.enable(true, client.id, buf, { autotrigger = true })
-	end
-
 	if client:supports_method(ms.textDocument_documentHighlight) then
-		local highlight_augroup = vim.api.nvim_create_augroup('lsp-highlight',
-			{ clear = false })
-		vim.api.nvim_create_autocmd({ 'CursorHold', 'CursorHoldI' }, {
-			buffer = buf,
-			group = highlight_augroup,
-			callback = vim.lsp.buf.document_highlight,
-		})
+		vim.lsp.semantic_tokens.enable(true, { client_id = client.id })
+	end
 
-		vim.api.nvim_create_autocmd({ 'CursorMoved', 'CursorMovedI' }, {
-			buffer = buf,
-			group = highlight_augroup,
-			callback = vim.lsp.buf.clear_references,
-		})
+	if client:supports_method(ms.textDocument_linkedEditingRange) then
+		vim.lsp.linked_editing_range.enable(true, { client_id = client.id })
+	end
 
-		vim.api.nvim_create_autocmd('LspDetach', {
-			callback = function(event)
-				vim.lsp.buf.clear_references()
-				vim.api.nvim_clear_autocmds {
-					group = highlight_augroup,
-					buffer = event.buf
-				}
-			end,
-		})
+	if client:supports_method(ms.textDocument_colorPresentation) then
+		vim.lsp.document_color.enable(true, { client_id = client.id }, { style = 'virtual' })
 	end
 
 	if client:supports_method(ms.textDocument_foldingRange) then
@@ -91,19 +68,6 @@ function Lsp(client, buf)
 		vim.wo[win][0].foldmethod = "expr"
 		vim.wo[win][0].foldexpr = 'v:lua.vim.lsp.foldexpr()'
 	end
-
-	if client:supports_method(ms.textDocument_codeLens) then
-		vim.keymap.set({ 'n', 'v' }, 'grl', function()
-			vim.lsp.codelens.run()
-		end, { buffer = buf })
-		vim.lsp.codelens.refresh { bufnr = buf }
-		vim.api.nvim_create_autocmd({ 'CursorHold', 'InsertLeave' }, {
-			buffer = buf,
-			callback = function()
-				vim.lsp.codelens.refresh { bufnr = buf }
-			end,
-		})
-	end
 end
 
 return Lsp
diff --git a/.config/nvim/nvim-pack-lock.json b/.config/nvim/nvim-pack-lock.json
new file mode 100644
index 0000000..131f738
--- /dev/null
+++ b/.config/nvim/nvim-pack-lock.json
@@ -0,0 +1,20 @@
+{
+  "plugins": {
+    "mason": {
+      "rev": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65",
+      "src": "git://git.sudomsg.com/mirror/mason"
+    },
+    "mason-lspconfig": {
+      "rev": "037398b9ce4a53ba48d5f94765c641a1fd16d906",
+      "src": "git://git.sudomsg.com/mirror/mason-lspconfig"
+    },
+    "nvim-lspconfig": {
+      "rev": "16812abf0e8d8175155f26143a8504e8253e92b0",
+      "src": "git://git.sudomsg.com/mirror/nvim-lspconfig"
+    },
+    "nvim-treesitter": {
+      "rev": "7caec274fd19c12b55902a5b795100d21531391f",
+      "src": "git://git.sudomsg.com/mirror/nvim-treesitter"
+    }
+  }
+}
diff --git a/.gitmodules b/.gitmodules
index 8131ab4..14ff2f8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,16 +1,3 @@
-[submodule "nvim-treesitter"]
-	path = .local/share/nvim/site/pack/plugins/start/nvim-treesitter
-	url = git://git.sudomsg.com/mirror/nvim-treesitter
-	branch = main
-[submodule "mason"]
-	path = .local/share/nvim/site/pack/plugins/start/mason
-	url = git://git.sudomsg.com/mirror/mason
-[submodule "nvim-lspconfig"]
-	path = .local/share/nvim/site/pack/plugins/start/nvim-lspconfig
-	url = git://git.sudomsg.com/mirror/nvim-lspconfig
-[submodule "mason-lspconfig"]
-	path = .local/share/nvim/site/pack/plugins/start/mason-lspconfig.nvim
-	url = git://git.sudomsg.com/mirror/mason-lspconfig
 [submodule "zsh-completions"]
 	path = .zfunc/zsh-completions
 	url = git://git.sudomsg.com/mirror/zsh-completions
diff --git a/.local/share/nvim/site/pack/plugins/start/mason b/.local/share/nvim/site/pack/plugins/start/mason
deleted file mode 160000
-Subproject 44d1e90e1f66e077268191e3ee9d2ac97cc18e6
diff --git a/.local/share/nvim/site/pack/plugins/start/mason-lspconfig.nvim b/.local/share/nvim/site/pack/plugins/start/mason-lspconfig.nvim
deleted file mode 160000
-Subproject a979821a975897b88493843301950c456a72598
diff --git a/.local/share/nvim/site/pack/plugins/start/nvim-lspconfig b/.local/share/nvim/site/pack/plugins/start/nvim-lspconfig
deleted file mode 160000
-Subproject 841c6d4139aedb8a3f2baf30cef5327371385b9
diff --git a/.local/share/nvim/site/pack/plugins/start/nvim-treesitter b/.local/share/nvim/site/pack/plugins/start/nvim-treesitter
deleted file mode 160000
-Subproject e5f65e31a5ec0e8526b2311ff8c7aaea4a581c8
diff --git a/.zfunc/_dotfiles b/.zfunc/_dotfiles
index 1a29842..55ca15a 100644
--- a/.zfunc/_dotfiles
+++ b/.zfunc/_dotfiles
@@ -1,9 +1,18 @@
 #compdef dotfiles
 
-_arguments -C '*:: :->args'
+_dotfiles() {
+    # 1. Define your paths relative to HOME
+    # The :a modifier turns it into an absolute path for Git's internals
+    local -x GIT_DIR="${HOME}/.dotfiles"
+    local -x GIT_WORKTREE="${HOME}"
 
-oldwords=($words)
-words=(git --git-dir="$HOME/.dotfiles/" --work-tree="$HOME/.dotfiles/" ${words[@]:0})
-CURRENT=$(( CURRENT + $#words - $#oldwords ))
-_normal && return 0
-return 1
+    # 2. Prepare the command line for the real 'git' completion
+    # We replace 'gwrap' (the first word) with 'git'
+    words[1]=git
+    
+    # 3. Tell Zsh to use the official git completion logic
+    service=git
+    _git
+}
+
+_dotfiles "$@"