feat: binds/mappings for GitSigns

lua/ward/init.lua

@@ -10,9 +10,10 @@ require("ward.lazy")
 
 --$ Neovide configuration if used
 if vim.g.neovide then
-  vim.g.neovide_opacity = 0.75
+  vim.g.neovide_opacity = 0.85
   vim.g.neovide_window_blurred = true
   -- vim.o.guifont = "Source Code Pro:h12"
+  vim.g.neovide_underline_stroke_scale = 1.5
 
   -- Increase/Decrease scale factor
   local change_scale_factor = function(delta)

lua/ward/plugins/alpha-dashboard.lua

@@ -32,6 +32,7 @@ return {
 			button("f", " Find Files", ":Telescope find_files <CR>"),
 			button("o", " Recent Files", "<cmd>Telescope oldfiles<cr>"),
 			button("t", " Terminal", ":terminal<CR>i"),
+			button("h", "⛨ check health", ":checkhealth<CR>"),
 			button("s", "S Find text/string", ":Telescope live_grep <CR>"),
 			button("m", "  Bookmarks", ":Telescope marks <CR>"),
 			button("c", " Neovim config", "<cmd>e ~/.config/nvim/ | cd %:p:h<cr>"),
@@ -40,11 +41,12 @@ return {
 		}
 
 		local function footer()
-			local footer_datetime = os.date("  %m-%d-%Y   %H:%M:%S")
+			local footer_datetime = os.date("%m-%d-%Y  %H:%M:%S")
 			local version = vim.version()
-			local nvim_version_info = "   v" .. version.major .. "." .. version.minor .. "." .. version.patch
+			local nvim_version_info = "  v" .. version.major .. "." .. version.minor .. "." .. version.patch
 			-- local ms = (math.floor(stats.startuptime * 100 + 0.5) / 100)
-			local value = footer_datetime .. "   Plugins " .. total_plugins .. nvim_version_info
+      local root_dir = "  ⌂" .. vim.fn['getcwd']()
+			local value = footer_datetime .. "  Plugins " .. total_plugins .. nvim_version_info .. root_dir
 			return value
 		end
 

lua/ward/plugins/bufferline.lua

@@ -19,6 +19,10 @@ return {
 						separator = true,
 					},
 				},
+				-- separator_style = "slant",
+        -- indicator = {
+        --   style = "underline",
+        -- },
 				diagnostics = "nvim_lsp",
 				diagnostics_indicator = function(count, level, diagnostics_dict, context)
 					local s = " "
@@ -39,6 +43,9 @@ return {
 			{ "<leader>bst", "<cmd>BufferLineSortByTabs<Cr>", desc = "Sort by tabs" },
 			{ "<leader>bsh", "<cmd>BufferLineMovePrev<Cr>", desc = "Sort by tabs" },
 			{ "<leader>bsl", "<cmd>BufferLineMoveNext<Cr>", desc = "Sort by tabs" },
+			{ "<leader>bb", "<cmd>BufferLineCyclePrev<Cr>", desc = "Previous buffer" },
+			{ "<leader>bn", "<cmd>BufferLineCycleNext<Cr>", desc = "Next buffer" },
+			{ "<leader>n", "<cmd>BufferLineCycleNext<Cr>", desc = "Next buffer" },
 		})
 	end,
 }

lua/ward/plugins/catppucin.lua

@@ -10,7 +10,7 @@ return {
       transparent_backgroud = true,
       term_colors = true,
     })
-    vim.cmd.colorscheme("catppuccin")
+    vim.cmd.colorscheme("catppuccin-nvim")
     LineNumberColors()
   end,
 }

lua/ward/plugins/gitsigns.lua

@@ -4,7 +4,7 @@ return {
 	-- event = "BufReadPre",
 
 	config = function()
-    require("gitsigns").setup {
+		require("gitsigns").setup({
 			signs = {
 				-- add = { text = "│" },
 				-- change = { text = "│" },
@@ -15,10 +15,35 @@ return {
 			},
 			numhl = true, -- Toggle with `:Gitsigns toggle_numhl`
 			linehl = false, -- Toggle with `:Gitsigns toggle_linehl`
-    }
 
-    vim.keymap.set('n', '<Leader>xs', function()
+      on_attach = function(bufnr)
-      require("gitsigns").refresh();
+        local gitsigns = require("gitsigns")
-    end, { desc = "Gitsigns refresh" })
+        local wk = require("which-key")
+        wk.add({
+          { "<leader>g", group = "Gitsigns" };
+          { "<leader>gj", function ()
+            gitsigns.nav_hunk('next')
+          end, buffer = bufnr, desc = "next hunk" },
+          { "<leader>gk", function ()
+            gitsigns.nav_hunk('prev')
+          end, buffer = bufnr, desc = "prev hunk" },
+          { "<leader>gu", gitsigns.reset_buffer_index, buffer = bufnr, desc = "unstage buffer" },
+          { "<leader>gp", gitsigns.preview_hunk, buffer = bufnr, desc = "preview hunk" },
+          { "<leader>gP", gitsigns.preview_hunk_inline, buffer = bufnr, desc = "preview hunk inline" },
+          { "<leader>gs", gitsigns.stage_hunk, buffer = bufnr, desc = "stage hunk" },
+          { "<leader>gr", gitsigns.reset_hunk, buffer = bufnr, desc = "reset hunk" },
+          { "<leader>gS", gitsigns.stage_buffer, buffer = bufnr, desc = "stage buffer" },
+          { "<leader>gR", gitsigns.reset_buffer, buffer = bufnr, desc = "reset buffer" },
+          { "<leader>gd", gitsigns.diffthis, buffer = bufnr, desc = "diff this" },
+          { "<leader>gD", function()
+            gitsigns.diffthis('~')
+          end, buffer = bufnr, desc = "diff ~" },
+          { "<leader>gt", group = "Gitsigns toggles" };
+          { "<leader>gtr", gitsigns.refresh, desc = "Gitsigns refresh" },
+          { "<leader>gtb", gitsigns.toggle_current_line_blame, desc = "toggle blame" },
+          { "<leader>gtw", gitsigns.toggle_word_diff, desc = "toggle word diff" },
+        })
+      end,
+		})
 	end,
 }

lua/ward/plugins/lsp-config.lua

@@ -22,14 +22,8 @@ return {
 			{ "│", "FloatBorder" },
 		}
 
-    -- LSP settings (for overriding per client)
-    local handlers = {
-      ["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, { border = border }),
-      ["textDocument/signatureHelp"] = vim.lsp.with(vim.lsp.handlers.signature_help, { border = border }),
-    }
-
 		-- lspconfig.clangd.setup({
-    vim.lsp.config("clangd",{
+		vim.lsp.config("clangd", {
 			keys = {
 				{ "<leader>pc", "<cmd>ClangdSwitchSourceHeader<cr>", desc = "Switch Source/Header (C/C++)" },
 			},
@@ -48,13 +42,11 @@ return {
 			-- init_options = {
 			--   fallbackFlags = { '-std=c17' },
 			-- },
-      handlers = handlers,
 		})
 
 		-- lspconfig.glsl_analyzer.setup({
-    vim.lsp.config("glsl_analyzer",{
+		vim.lsp.config("glsl_analyzer", {
 			filetypes = { "glsl", "vert", "tese", "frag", "geom", "comp", "vs", "fs" },
-      handlers = handlers,
 		})
 
 		-- diagnostics border
@@ -81,16 +73,10 @@ return {
 		})
 
 		-- lspconfig.rust_analyzer.setup({
-    vim.lsp.config("rust_analyzer",{
+		vim.lsp.config("rust_analyzer", {
 			settings = {
 				["rust-analyzer"] = {},
 			},
-      handlers = handlers,
-    })
-
-    -- lspconfig.lua_ls.setup({
-    vim.lsp.config("lua_ls",{
-      handlers = handlers,
 		})
 
 		-- These lsp keybinds only load when an LSP is attatched to the buffer.
@@ -113,7 +99,6 @@ return {
 				--  For example, in C this would take you to the header.
 				map("gD", vim.lsp.buf.declaration, "[G]oto [D]eclaration")
 
-
 				-- Find references for the word under your cursor.
 				map("gr", require("telescope.builtin").lsp_references, "[G]oto [R]eferences")
 
@@ -140,11 +125,7 @@ return {
 
 				-- Fuzzy find all the symbols in your current workspace.
 				--  Similar to document symbols, except searches over your entire project.
-        map(
+				map("<leader>lw", require("telescope.builtin").lsp_dynamic_workspace_symbols, "[W]orkspace symbols")
-          "<leader>lw",
-          require("telescope.builtin").lsp_dynamic_workspace_symbols,
-          "[W]orkspace symbols"
-        )
 				map("<leader>li", vim.cmd.LspInfo, "Show lsp info")
 				map("<leader>lp", vim.diagnostic.goto_prev, "Go to [P]revious diagnostic message")
 
@@ -156,8 +137,23 @@ return {
 				map("<leader>lq", vim.diagnostic.setloclist, "Open diagnostic [Q]uickfix list")
 
 				-- Rename the variable under your cursor.
-        --  Most Language Servers support renaming across files, etc.
+				local function rename()
-        map("<leader>lr", vim.lsp.buf.rename, "[R]ename")
+					local clients = vim.lsp.get_clients({ bufnr = 0, method = "textDocument/rename" })
+					if #clients > 0 then
+						local targetClient = clients[1] -- Use the first client .. or angularls if available
+						for _, client in ipairs(clients) do
+							if client.name == "angularls" then
+								targetClient = client
+								break
+							end
+						end
+						vim.lsp.buf.rename(nil, { name = targetClient.name })
+					else
+						print("No LSP attached supports renaming")
+					end
+				end
+				--Most Language Servers support renaming across files, etc.
+				map("<leader>lr", rename, "[R]ename")
 
 				-- Execute a code action, usually your cursor needs to be on top of an error
 				-- or a suggestion from your LSP for this to activate.

lua/ward/plugins/statusline.lua

@@ -13,5 +13,6 @@ return {
 			},
 			extensions = { "nvim-tree" },
 		})
+    vim.o.cmdheight = 0
 	end,
 }

lua/ward/plugins/telescope.lua

@@ -3,7 +3,7 @@
 --$ :help telescope
 return {
   'nvim-telescope/telescope.nvim',
-  tag = '0.1.8',
+  tag = 'v0.2.2',
   dependencies = { 'nvim-lua/plenary.nvim' },
 
   config = function()

lua/ward/plugins/treesitter.lua

@@ -3,18 +3,27 @@
 --# :help treesitter
 return {
 	"nvim-treesitter/nvim-treesitter",
+	branch = "main",
+	lazy = false,
 	build = ":TSUpdate",
 
-  config = function()
+	-- config = function()
-    local configs = require("nvim-treesitter.configs")
+	-- 	local configs = require("nvim-treesitter.configs")
-
+	--
-    configs.setup({
+	-- 	configs.setup({
-      ensure_installed = {
+	-- 		ensure_installed = {
-        "c", "lua", "vim", "vimdoc", "javascript", "html", "python", "typescript"
+	-- 			"c",
-      },
+	-- 			"lua",
-      sync_install = false,
+	-- 			"vim",
-      highlight = { enable = true },
+	-- 			"vimdoc",
-      indent = { enable = true },
+	-- 			"javascript",
-    })
+	-- 			"html",
-  end
+	-- 			"python",
+	-- 			"typescript",
+	-- 		},
+	-- 		sync_install = false,
+	-- 		highlight = { enable = true },
+	-- 		indent = { enable = true },
+	-- 	})
+	-- end,
 }

lua/ward/setup.lua

@@ -35,5 +35,5 @@ end
 LineNumberColors()
 
 -- Set spell checker 
-vim.opt.spell = true
+-- vim.opt.spell = true
 vim.opt.spelllang = { 'en_gb', 'nl' }