Nixfiles! :3
ok
Signed-off-by: MLC Bloeiman <mar@strawmelonjuice.com>
MLC Bloeiman
(Apr 26, 2026, 10:26 PM +0200)
61350af3
8cfabc51
+61
-20
+17
-17
configs/nvim/lua/config/keymaps.lua
+17
-17
configs/nvim/lua/config/keymaps.lua
···
5
5
6
6
-- Visual VCS managers group
7
7
wk.add({
8
-
{ "<Space>v", group = "Visual VCS", mode = { "n" } },
8
+
{ "<space>v", group = "Visual VCS", mode = { "n" } },
9
9
})
10
10
-- Control-S save
11
11
map("i", "<C-s>", "<esc><cmd>w<cr>", { desc = "Save and go to normal mode" })
···
13
13
map("n", "<C-s>", "<cmd>w<cr>", { desc = "Save and stay in normal mode" })
14
14
15
15
-- Splitting
16
-
map("n", "<Space>\\", "<cmd>vsplit<CR>", { desc = "Vertical split" })
17
-
map("n", "<Space>-", "<cmd>split<CR>", { desc = "Horizontal split" })
16
+
map("n", "<space>\\", "<cmd>vsplit<CR>", { desc = "Vertical split" })
17
+
map("n", "<space>-", "<cmd>split<CR>", { desc = "Horizontal split" })
18
18
19
19
-- Pickers --------------------------------------------------------------------------------------------------------------------------------------------------
20
20
---@diagnostic disable-next-line: assign-type-mismatch
21
-
map("n", "<Space>f", function()
21
+
map("n", "<space>f", function()
22
22
Snacks.picker.files()
23
23
end, { desc = "Open file picker" })
24
24
25
-
map("n", "<Space>/", function()
25
+
map("n", "<space>/", function()
26
26
Snacks.picker.grep()
27
27
end, { desc = "Project grep" })
28
28
29
-
map("n", "<Space>d", function()
29
+
map("n", "<space>d", function()
30
30
Snacks.picker.diagnostics_buffer()
31
31
end, { desc = "Buffer diagnostics" })
32
32
33
-
map("n", "<Space>D", function()
33
+
map("n", "<space>D", function()
34
34
Snacks.picker.diagnostics()
35
35
end, { desc = "Project diagnostics" })
36
36
37
-
map("n", "<Space>b", function()
37
+
map("n", "<space>b", function()
38
38
Snacks.picker.buffers()
39
39
end, { desc = "Open buffer picker" })
40
40
41
-
map("n", "<Space>s", function()
41
+
map("n", "<space>s", function()
42
42
Snacks.picker.lsp_symbols()
43
43
end, { desc = "Open symbol picker" })
44
44
45
-
map("n", "<Space>S", function()
45
+
map("n", "<space>S", function()
46
46
Snacks.picker.lsp_workspace_symbols()
47
47
end, { desc = "Open project symbol picker" })
48
48
49
-
map("n", "<Space>?", function()
49
+
map("n", "<space>?", function()
50
50
Snacks.picker.commands()
51
51
end, { desc = "Open command picker" })
52
52
53
-
map("n", "<Space>r", function()
53
+
map("n", "<space>r", function()
54
54
Snacks.picker.resume()
55
55
end, { desc = "Resume last search" })
56
56
57
-
map("n", "<Space>o", "<cmd>FzfLua oldfiles<CR>", { desc = "Oldfiles" })
57
+
map("n", "<space>o", "<cmd>FzfLua oldfiles<CR>", { desc = "Oldfiles" })
58
58
59
-
map("n", "<Space>e", function()
59
+
map("n", "<space>e", function()
60
60
Snacks.explorer({ layout = { layout = { position = "right" } } })
61
61
end, { desc = "Explorer" })
62
62
63
-
map("n", "<Space><Space>", function()
63
+
map("n", "<space><space>", function()
64
64
Snacks.picker.resume()
65
65
end, { desc = "Resume last search" })
66
66
67
67
-- LSP --------------------------------------------------------------------------------------------------------------------------------------------------
68
68
-- LSP group
69
69
wk.add({
70
-
{ "<Space>c", group = "LSP ->", mode = { "n", "v" } },
70
+
{ "<space>c", group = "LSP ->", mode = { "n", "v" } },
71
71
})
72
72
-- Hover info
73
73
map("n", "<C-k>", vim.lsp.buf.hover, {})
···
83
83
map("n", "<space>cr", vim.lsp.buf.rename, { desc = "LSP -> Rename symbol" })
84
84
85
85
-- Stolen from Ollie
86
+
vim.keymap.set("n", "<space>cew", vim.diagnostic.open_float, { desc = "Open [E]rror [W]indow" })
86
87
map("n", "<space>cs", function()
87
88
-- get current line(string) and row(int) in the buffer
88
89
local line = vim.trim(vim.api.nvim_get_current_line())
89
90
local row, _ = unpack(vim.api.nvim_win_get_cursor(0))
90
-
91
91
-- make "-----------" seperator line at consitent length
92
92
local seperator = string.rep("-", 120 - string.len(line))
93
93
+30
-1
configs/nvim/lua/config/options.lua
+30
-1
configs/nvim/lua/config/options.lua
···
2
2
-- Add any additional options here
3
3
4
4
-- // Set mapleader to space
5
-
vim.cmd.let('mapleader = "<SPACE>"')
5
+
vim.cmd.let('mapleader = "<space>"')
6
6
7
7
vim.opt.relativenumber = true
8
8
9
9
vim.opt.mouse = "a"
10
10
11
11
vim.opt.guicursor = "n-v-c:block,i-ci-ve:ver25,r-cr:hor20,o:hor50"
12
+
13
+
local show_errors = false
14
+
-- toggle showing virtual_lines
15
+
vim.keymap.set("n", "Te", function()
16
+
if show_errors then
17
+
-- // Initially set as lsp-config setting inside ../plugins/lsp.lua
18
+
vim.diagnostic.config({
19
+
virtual_text = {
20
+
format = function(diagnostic)
21
+
return string.match(diagnostic.message, "(.-)\n")
22
+
end,
23
+
},
24
+
virtual_lines = {
25
+
current_line = true,
26
+
},
27
+
})
28
+
show_errors = false
29
+
else
30
+
vim.diagnostic.config({
31
+
virtual_text = {
32
+
format = function(diagnostic)
33
+
return string.match(diagnostic.message, "(.-)\n")
34
+
end,
35
+
},
36
+
virtual_lines = false,
37
+
})
38
+
show_errors = true
39
+
end
40
+
end, { desc = "[T]oggle [E]rrors" })
+11
configs/nvim/lua/plugins/lsp.lua
+11
configs/nvim/lua/plugins/lsp.lua
···
69
69
{
70
70
"neovim/nvim-lspconfig",
71
71
opts = {
72
+
diagnostics = {
73
+
virtual_text = {
74
+
format = function(diagnostic)
75
+
return string.match(diagnostic.message, "(.-)\n")
76
+
end,
77
+
},
78
+
virtual_lines = {
79
+
current_line = true,
80
+
},
81
+
},
82
+
72
83
servers = {
73
84
-- Nix
74
85
nil_ls = {
+1
-1
home/modules/fonts.nix
+1
-1
home/modules/fonts.nix