Skip to content

Commit 0f0b4b6

Browse files
committed
add nvim plugins from nix, switch pickers
1 parent dc19fca commit 0f0b4b6

File tree

7 files changed

+227
-147
lines changed

7 files changed

+227
-147
lines changed

home/nvim/default.nix

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,13 @@
4141
"nui-nvim"
4242
"nvim-bqf"
4343
"nvim-dap"
44+
"nvim-impairative"
4445
"nvim-lint"
4546
"nvim-tree-lua"
4647
"nvim-treesitter"
4748
"nvim-treesitter-context"
4849
"nvim-treesitter-textobjects"
50+
"quicker-nvim"
4951
"render-markdown-nvim"
5052
"snacks-nvim"
5153
]
@@ -99,14 +101,6 @@
99101
"nvim/nixpkgs/fzf" = {
100102
source = "${pkgs.fzf}/share/vim-plugins/fzf";
101103
};
102-
"nvim/nixpkgs/nvim-impairative" = {
103-
source = pkgs.fetchFromGitHub {
104-
owner = "idanarye";
105-
repo = "nvim-impairative";
106-
rev = "v0.5.0";
107-
sha256 = "sha256-YywI9ntLEmXAf788anlvaUFPLDBne7kmOIIe0GaaC+U=";
108-
};
109-
};
110104
}
111105
// vimPlugins
112106
// miniPlugins;

home/nvim/lua/aucmd.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ vim.api.nvim_create_autocmd("LspAttach", {
1616
vim.keymap.set("n", "gd", vim.lsp.buf.definition, { buffer = event.buf, desc = "lsp: show definition" })
1717
vim.keymap.set("n", "gD", vim.lsp.buf.type_definition, { buffer = event.buf, desc = "lsp: show type definition" })
1818
vim.keymap.set("n", "gi", vim.lsp.buf.implementation, { buffer = event.buf, desc = "lsp: show implementations" })
19-
vim.keymap.set("n", "go", vim.lsp.buf.document_symbol, { buffer = event.buf, desc = "lsp: outline symbols" })
19+
-- vim.keymap.set("n", "go", vim.lsp.buf.document_symbol, { buffer = event.buf, desc = "lsp: outline symbols" })
2020
vim.keymap.set("n", "<leader>r", vim.lsp.buf.rename, { buffer = event.buf, desc = "lsp: rename symbol" })
2121
vim.keymap.set("n", "<leader>?", vim.lsp.buf.code_action, { buffer = event.buf, desc = "lsp: run code action" })
2222
vim.keymap.set("n", "<leader>qd", vim.diagnostic.setqflist, { buffer = event.buf, desc = "lsp: list diagnostics" })

home/nvim/lua/maps.lua

Lines changed: 15 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -16,40 +16,10 @@ vim.keymap.set({ "o", "x" }, "H", "^", { desc = "go to start of line" })
1616
vim.keymap.set({ "n", "o", "x" }, "L", "$", { desc = "go to end of line" })
1717

1818
-- better paste
19-
vim.keymap.set({ "n", "x" }, "<leader>p", '"+p', { desc = "paste system clipboard" })
20-
vim.keymap.set({ "n", "x" }, "<leader>P", function()
19+
vim.keymap.set({ "n", "x" }, "<leader>p", function()
2120
vim.fn.setreg("+", vim.fn.getreg("+"), "V")
2221
vim.cmd.normal('"+p')
23-
end, { desc = "paste system clipboard as lines" })
24-
-- better paste
25-
vim.keymap.set({ "n", "x" }, "<leader>y", '"+y', { desc = "yank system clipboard" })
26-
27-
-- live grep
28-
vim.keymap.set("x", "<leader>*", function()
29-
local a_orig = vim.fn.getreg("a")
30-
local mode = vim.fn.mode()
31-
if mode ~= "v" and mode ~= "V" then
32-
vim.cmd([[normal! gv]])
33-
end
34-
vim.cmd([[silent! normal! "aygv]])
35-
local input = vim.fn.getreg("a")
36-
vim.fn.setreg("a", a_orig)
37-
if #input > 0 and not string.find(input, "\n") then
38-
vim.cmd('silent! grep! "' .. input .. '" | cwindow')
39-
end
40-
end, { desc = "grep visual selection in project" })
41-
vim.keymap.set("n", "<leader>*", function()
42-
local input = vim.fn.expand("<cword>")
43-
if #input > 0 then
44-
vim.cmd('silent! grep! "' .. input .. '" | cwindow')
45-
end
46-
end, { desc = "grep cursor word in project" })
47-
vim.keymap.set("n", "<leader>/", function()
48-
local input = vim.fn.input("grep: ")
49-
if #input > 0 then
50-
vim.cmd('silent! grep! "' .. input .. '" | cwindow')
51-
end
52-
end, { desc = "grep in project" })
22+
end, { desc = "paste as lines" })
5323

5424
-- jump back to last position
5525
vim.keymap.set("n", "<bs>", "<c-o>", { desc = "jump backwards" })
@@ -80,16 +50,16 @@ vim.keymap.set("x", ">", ">gv", { desc = "indent and reselect" })
8050
vim.keymap.set({ "n" }, "<esc>", "<cmd>nohl<cr><esc>", { desc = "escape and clear search" })
8151

8252
-- window movement
83-
vim.keymap.set("n", "<c-h>", "<c-w>h", { desc = "move focus to left window" })
84-
vim.keymap.set("n", "<c-j>", "<c-w>j", { desc = "move focus to window below" })
85-
vim.keymap.set("n", "<c-k>", "<c-w>k", { desc = "move focus to window above" })
86-
vim.keymap.set("n", "<c-l>", "<c-w>l", { desc = "move focus to right window" })
53+
vim.keymap.set("n", "<m-h>", "<c-w>h", { desc = "move focus to left window" })
54+
vim.keymap.set("n", "<m-j>", "<c-w>j", { desc = "move focus to window below" })
55+
vim.keymap.set("n", "<m-k>", "<c-w>k", { desc = "move focus to window above" })
56+
vim.keymap.set("n", "<m-l>", "<c-w>l", { desc = "move focus to right window" })
8757

8858
-- same for terminal and insert mode
89-
vim.keymap.set({ "i", "t" }, "<c-h>", "<c-\\><c-n><c-w>h", { desc = "move focus to left window" })
90-
vim.keymap.set({ "i", "t" }, "<c-j>", "<c-\\><c-n><c-w>j", { desc = "move focus to window below" })
91-
vim.keymap.set({ "i", "t" }, "<c-k>", "<c-\\><c-n><c-w>k", { desc = "move focus to window above" })
92-
vim.keymap.set({ "i", "t" }, "<c-l>", "<c-\\><c-n><c-w>l", { desc = "move focus to right window" })
59+
vim.keymap.set({ "i", "t" }, "<m-h>", "<c-\\><c-n><c-w>h", { desc = "move focus to left window" })
60+
vim.keymap.set({ "i", "t" }, "<m-j>", "<c-\\><c-n><c-w>j", { desc = "move focus to window below" })
61+
vim.keymap.set({ "i", "t" }, "<m-k>", "<c-\\><c-n><c-w>k", { desc = "move focus to window above" })
62+
vim.keymap.set({ "i", "t" }, "<m-l>", "<c-\\><c-n><c-w>l", { desc = "move focus to right window" })
9363

9464
-- window control for terminals
9565
vim.keymap.set({ "t" }, "<c-w>", "<c-\\><c-n><c-w>", { desc = "window control" })
@@ -186,3 +156,8 @@ end, { desc = "open quickfix" })
186156

187157
-- add undo state when inserting a newline
188158
vim.keymap.set("i", "<cr>", "<cr><c-g>u")
159+
160+
-- zz on cr
161+
vim.keymap.set("n", "<c-l>", function()
162+
vim.cmd("normal! zz")
163+
end, { desc = "center sceen" })

home/nvim/lua/options.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ vim.opt.updatetime = 500 -- faster CursorHold
33
vim.opt.mouse = "" -- no mouse
44
vim.opt.jumpoptions = "stack,view" -- discard jumps when diverging from an earlier position
55
vim.opt.spelloptions = "camel,noplainbuffer" -- set some spell options for when I enable
6+
vim.opt.clipboard = "unnamedplus"
67

78
-- indent and wrap defaults
89
vim.opt.shiftwidth = 0 -- look at tabstop, no sense in two settings

0 commit comments

Comments
 (0)