Configuration for my NixOS based systems and Home Manager
Clean up lua LSP and gitsigns in neovim
+86
-9
+1
flake.nix
+1
flake.nix
···
246
246
inherit (self.checks.${system}.pre-commit-check) shellHook;
247
247
buildInputs = [
248
248
nixpkgs.legacyPackages.${system}.nixfmt-rfc-style
249
+
nixpkgs-unstable.legacyPackages.${system}.lua-language-server
249
250
]
250
251
++ self.checks.${system}.pre-commit-check.enabledPackages;
251
252
};
+8
-1
nvim/lua/lsp/lua_ls.lua
+8
-1
nvim/lua/lsp/lua_ls.lua
···
14
14
library = vim.api.nvim_get_runtime_file("", true)
15
15
},
16
16
-- Do not send telemetry data containing a randomized but unique identifier
17
-
telemetry = { enable = false }
17
+
telemetry = { enable = false },
18
+
format = {
19
+
enable = true,
20
+
defaultConfig = {
21
+
indent_style = "tab",
22
+
indent_size = "1",
23
+
}
24
+
}
18
25
}
19
26
}
20
27
}
+77
-8
nvim/lua/plugins.lua
+77
-8
nvim/lua/plugins.lua
···
289
289
config = function() require("crates").setup() end,
290
290
lazy = true,
291
291
ft = { "rust" }
292
-
}, -- RISC-V Assembly syntax highlighting
293
-
{ "kylelaker/riscv.vim", ft = "riscv" }, -- Hare Stuff
292
+
},
293
+
-- RISC-V Assembly syntax highlighting
294
+
{ "kylelaker/riscv.vim", ft = "riscv" },
294
295
-- Hare stuff
295
296
-- Haredoc
296
297
{
···
334
335
vim.keymap.set({ "n", "x" }, "<leader>sr", function() ssr.open() end)
335
336
end
336
337
},
337
-
{ "lewis6991/gitsigns.nvim", config = true },
338
338
{
339
-
"greggh/claude-code.nvim",
340
-
dependencies = {
341
-
"nvim-lua/plenary.nvim"
342
-
},
343
-
config = true
339
+
"lewis6991/gitsigns.nvim",
340
+
config = true,
341
+
opts = {
342
+
on_attach = function(bufnr)
343
+
local gitsigns = require('gitsigns')
344
+
345
+
local function map(mode, l, r, opts)
346
+
opts = opts or {}
347
+
opts.buffer = bufnr
348
+
vim.keymap.set(mode, l, r, opts)
349
+
end
350
+
351
+
-- Navigation
352
+
map('n', ']c', function()
353
+
if vim.wo.diff then
354
+
vim.cmd.normal({ ']c', bang = true })
355
+
else
356
+
gitsigns.nav_hunk('next')
357
+
end
358
+
end)
359
+
360
+
map('n', '[c', function()
361
+
if vim.wo.diff then
362
+
vim.cmd.normal({ '[c', bang = true })
363
+
else
364
+
gitsigns.nav_hunk('prev')
365
+
end
366
+
end)
367
+
368
+
-- Actions
369
+
map('n', '<leader>hs', gitsigns.stage_hunk)
370
+
map('n', '<leader>hr', gitsigns.reset_hunk)
371
+
372
+
map('v', '<leader>hs', function()
373
+
gitsigns.stage_hunk({ vim.fn.line('.'), vim.fn.line('v') })
374
+
end)
375
+
376
+
map('v', '<leader>hr', function()
377
+
gitsigns.reset_hunk({ vim.fn.line('.'), vim.fn.line('v') })
378
+
end)
379
+
380
+
map('n', '<leader>hS', gitsigns.stage_buffer)
381
+
map('n', '<leader>hR', gitsigns.reset_buffer)
382
+
map('n', '<leader>hp', gitsigns.preview_hunk)
383
+
map('n', '<leader>hi', gitsigns.preview_hunk_inline)
384
+
385
+
map('n', '<leader>hb', function()
386
+
gitsigns.blame_line({ full = true })
387
+
end)
388
+
389
+
map('n', '<leader>hd', gitsigns.diffthis)
390
+
391
+
map('n', '<leader>hD', function()
392
+
gitsigns.diffthis('~')
393
+
end)
394
+
395
+
map('n', '<leader>hQ', function() gitsigns.setqflist('all') end)
396
+
map('n', '<leader>hq', gitsigns.setqflist)
397
+
398
+
-- Toggles
399
+
map('n', '<leader>tb', gitsigns.toggle_current_line_blame)
400
+
map('n', '<leader>tw', gitsigns.toggle_word_diff)
401
+
402
+
-- Text object
403
+
map({ 'o', 'x' }, 'ih', gitsigns.select_hunk)
404
+
end
405
+
}
344
406
},
407
+
--{
408
+
-- "greggh/claude-code.nvim",
409
+
-- dependencies = {
410
+
-- "nvim-lua/plenary.nvim"
411
+
-- },
412
+
-- config = true
413
+
--},
345
414
{
346
415
"Bowuigi/acme-nvim",
347
416
config = function()