diff options
Diffstat (limited to 'vim/lua/plugins/init.lua')
-rw-r--r-- | vim/lua/plugins/init.lua | 120 |
1 files changed, 66 insertions, 54 deletions
diff --git a/vim/lua/plugins/init.lua b/vim/lua/plugins/init.lua index e510475..393378a 100644 --- a/vim/lua/plugins/init.lua +++ b/vim/lua/plugins/init.lua | |||
@@ -1,11 +1,11 @@ | |||
1 | return { | 1 | return { |
2 | 2 | ||
3 | -- Detect tabstop and shiftwidth automatically | 3 | -- Detect tabstop and shiftwidth automatically |
4 | 'tpope/vim-sleuth', | 4 | "tpope/vim-sleuth", |
5 | 5 | ||
6 | -- Use sudo in command mode | 6 | -- Use sudo in command mode |
7 | { | 7 | { |
8 | 'lambdalisue/suda.vim', | 8 | "lambdalisue/suda.vim", |
9 | cmd = { "SudaWrite" }, | 9 | cmd = { "SudaWrite" }, |
10 | }, | 10 | }, |
11 | 11 | ||
@@ -18,15 +18,15 @@ return { | |||
18 | 18 | ||
19 | -- hop.nvim: For quick jump | 19 | -- hop.nvim: For quick jump |
20 | { | 20 | { |
21 | 'smoka7/hop.nvim', | 21 | "smoka7/hop.nvim", |
22 | lazy = false, | 22 | lazy = false, |
23 | version = "*", | 23 | version = "*", |
24 | opts = { | 24 | opts = { |
25 | keys = 'etovxqpdygfblzhckisuran' | 25 | keys = "etovxqpdygfblzhckisuran", |
26 | }, | 26 | }, |
27 | config = function() | 27 | config = function() |
28 | require("hop").setup() | 28 | require("hop").setup() |
29 | end | 29 | end, |
30 | }, | 30 | }, |
31 | 31 | ||
32 | { | 32 | { |
@@ -34,17 +34,17 @@ return { | |||
34 | lazy = false, | 34 | lazy = false, |
35 | -- event = 'BufWritePre', -- uncomment for format on save | 35 | -- event = 'BufWritePre', -- uncomment for format on save |
36 | config = function() | 36 | config = function() |
37 | require "configs.conform" | 37 | require("configs.conform") |
38 | 38 | ||
39 | vim.keymap.set("n", "<leader>F", function() | 39 | vim.keymap.set("n", "<leader>F", function() |
40 | require("conform").format { lsp_fallback = true } | 40 | require("conform").format({ lsp_fallback = true }) |
41 | end, { desc = "format files" }) | 41 | end, { desc = "format files" }) |
42 | end, | 42 | end, |
43 | }, | 43 | }, |
44 | 44 | ||
45 | { | 45 | { |
46 | -- Add indentation guides even on blank lines | 46 | -- Add indentation guides even on blank lines |
47 | 'lukas-reineke/indent-blankline.nvim', | 47 | "lukas-reineke/indent-blankline.nvim", |
48 | -- See `:help ibl` | 48 | -- See `:help ibl` |
49 | enabled = true, | 49 | enabled = true, |
50 | main = "ibl", | 50 | main = "ibl", |
@@ -55,34 +55,47 @@ return { | |||
55 | }, | 55 | }, |
56 | 56 | ||
57 | { | 57 | { |
58 | 'lewis6991/gitsigns.nvim', | 58 | "lewis6991/gitsigns.nvim", |
59 | opts = function() | 59 | opts = function() |
60 | return { | 60 | return { |
61 | -- See `:help gitsigns.txt` | 61 | -- See `:help gitsigns.txt` |
62 | signs = { | 62 | signs = { |
63 | add = { text = '+' }, | 63 | add = { text = "+" }, |
64 | change = { text = '~' }, | 64 | change = { text = "~" }, |
65 | delete = { text = '_' }, | 65 | delete = { text = "_" }, |
66 | topdelete = { text = '‾' }, | 66 | topdelete = { text = "‾" }, |
67 | changedelete = { text = '~' }, | 67 | changedelete = { text = "~" }, |
68 | }, | 68 | }, |
69 | on_attach = function(bufnr) | 69 | on_attach = function(bufnr) |
70 | local gs = require('gitsigns') | 70 | local gs = require("gitsigns") |
71 | vim.keymap.set('n', '<leader>gp', gs.prev_hunk, { buffer = bufnr, desc = '[G]o to [P]revious Hunk' }) | 71 | vim.keymap.set( |
72 | vim.keymap.set('n', '<leader>gn', gs.next_hunk, { buffer = bufnr, desc = '[G]o to [N]ext Hunk' }) | 72 | "n", |
73 | vim.keymap.set('n', '<leader>hp', gs.preview_hunk, { buffer = bufnr, desc = '[P]review [H]unk' }) | 73 | "<leader>gp", |
74 | vim.keymap.set('n', '<leader>hd', gs.diffthis, { buffer = bufnr, desc = '[h]unk [d]iff' }) | 74 | gs.prev_hunk, |
75 | vim.keymap.set('n', '<leader>hD', function() gs.diffthis('~') end, | 75 | { buffer = bufnr, desc = "[G]o to [P]revious Hunk" } |
76 | { buffer = bufnr, desc = '[h]unk [d]iff for ~' }) | 76 | ) |
77 | vim.keymap.set("n", "<leader>gn", gs.next_hunk, { buffer = bufnr, desc = "[G]o to [N]ext Hunk" }) | ||
78 | vim.keymap.set("n", "<leader>hp", gs.preview_hunk, { buffer = bufnr, desc = "[P]review [H]unk" }) | ||
79 | vim.keymap.set("n", "<leader>hd", gs.diffthis, { buffer = bufnr, desc = "[h]unk [d]iff" }) | ||
80 | vim.keymap.set("n", "<leader>hD", function() | ||
81 | gs.diffthis("~") | ||
82 | end, { buffer = bufnr, desc = "[h]unk [d]iff for ~" }) | ||
77 | -- vim.keymap.set("n", "<leader>gb", gs.blame_line{full=true}, { desc = "Git Blame" }) | 83 | -- vim.keymap.set("n", "<leader>gb", gs.blame_line{full=true}, { desc = "Git Blame" }) |
78 | vim.keymap.set("n", "<leader>gb", gs.toggle_current_line_blame, { desc = "Blame Line" }) | 84 | vim.keymap.set("n", "<leader>gb", gs.toggle_current_line_blame, { desc = "Blame Line" }) |
79 | vim.keymap.set('v', 'hr', gs.reset_hunk, { buffer = bufnr, desc = '[h]unk [r]eset' }) | 85 | vim.keymap.set("v", "hr", gs.reset_hunk, { buffer = bufnr, desc = "[h]unk [r]eset" }) |
80 | end | 86 | end, |
81 | } | 87 | } |
82 | end, | 88 | end, |
83 | }, | 89 | }, |
84 | 90 | ||
85 | { | 91 | { |
92 | "iberianpig/tig-explorer.vim", | ||
93 | lazy = false, | ||
94 | dependencies = { | ||
95 | "rbgrouleff/bclose.vim", | ||
96 | }, | ||
97 | }, | ||
98 | { | ||
86 | "epwalsh/obsidian.nvim", | 99 | "epwalsh/obsidian.nvim", |
87 | version = "*", -- recommended, use latest release instead of latest commit | 100 | version = "*", -- recommended, use latest release instead of latest commit |
88 | lazy = true, | 101 | lazy = true, |
@@ -125,7 +138,7 @@ return { | |||
125 | return require("obsidian").util.smart_action() | 138 | return require("obsidian").util.smart_action() |
126 | end, | 139 | end, |
127 | opts = { buffer = true, expr = true }, | 140 | opts = { buffer = true, expr = true }, |
128 | } | 141 | }, |
129 | }, | 142 | }, |
130 | -- see below for full list of options 👇 | 143 | -- see below for full list of options 👇 |
131 | note_id_func = function(title) | 144 | note_id_func = function(title) |
@@ -157,24 +170,25 @@ return { | |||
157 | }, | 170 | }, |
158 | }, | 171 | }, |
159 | config = function() | 172 | config = function() |
160 | vim.keymap.set('n', "<leader>oo", ':Obsidian', { buffer = true }) | 173 | vim.keymap.set("n", "<leader>oo", ":Obsidian", { buffer = true }) |
161 | vim.keymap.set('n', "<leader>ot", ':ObsidianTags<CR>', { buffer = true }) | 174 | vim.keymap.set("n", "<leader>ot", ":ObsidianTags<CR>", { buffer = true }) |
162 | vim.keymap.set('n', "<leader>os", ':ObsidianSearch<CR>', { buffer = true }) | 175 | vim.keymap.set("n", "<leader>os", ":ObsidianSearch<CR>", { buffer = true }) |
163 | vim.keymap.set('n', "<leader>oq", ':ObsidianQuickSwitch<CR>', { buffer = true }) | 176 | vim.keymap.set("n", "<leader>oq", ":ObsidianQuickSwitch<CR>", { buffer = true }) |
164 | vim.keymap.set('v', "<leader>on", ':ObsidianLinkNew<CR>', { buffer = true }) | 177 | vim.keymap.set("v", "<leader>on", ":ObsidianLinkNew<CR>", { buffer = true }) |
165 | vim.keymap.set('n', "<leader>ol", ':ObsidianLinks<CR>', { buffer = true }) | 178 | vim.keymap.set("n", "<leader>ol", ":ObsidianLinks<CR>", { buffer = true }) |
166 | end | 179 | end, |
167 | }, | 180 | }, |
168 | 181 | ||
169 | { | 182 | { |
170 | "iamcco/markdown-preview.nvim", | 183 | "iamcco/markdown-preview.nvim", |
171 | cmd = { "MarkdownPreviewToggle", "MarkdownPreview", "MarkdownPreviewStop" }, | 184 | cmd = { "MarkdownPreviewToggle", "MarkdownPreview", "MarkdownPreviewStop" }, |
172 | ft = { "markdown" }, | 185 | ft = { "markdown" }, |
173 | build = function() vim.fn["mkdp#util#install"]() end, | 186 | build = function() |
187 | vim.fn["mkdp#util#install"]() | ||
188 | end, | ||
174 | init = function() | 189 | init = function() |
175 | vim.g.mkdp_preview_options = { | 190 | vim.g.mkdp_preview_options = { |
176 | mkit = { | 191 | mkit = {}, |
177 | } | ||
178 | } | 192 | } |
179 | end, | 193 | end, |
180 | }, | 194 | }, |
@@ -182,33 +196,32 @@ return { | |||
182 | { | 196 | { |
183 | "nvim-telescope/telescope.nvim", | 197 | "nvim-telescope/telescope.nvim", |
184 | opts = function() | 198 | opts = function() |
185 | return require "configs.telescope" | 199 | return require("configs.telescope") |
186 | end, | 200 | end, |
187 | }, | 201 | }, |
188 | 202 | ||
189 | { | 203 | { |
190 | 'nvim-telescope/telescope-fzf-native.nvim', | 204 | "nvim-telescope/telescope-fzf-native.nvim", |
191 | build = 'cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release' | 205 | build = "cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release", |
192 | }, | 206 | }, |
193 | 207 | ||
194 | { | 208 | { |
195 | "nvim-treesitter/nvim-treesitter", | 209 | "nvim-treesitter/nvim-treesitter", |
196 | dependencies = { | 210 | dependencies = { |
197 | 'nvim-treesitter/nvim-treesitter-textobjects', | 211 | "nvim-treesitter/nvim-treesitter-textobjects", |
198 | }, | 212 | }, |
199 | opts = function() | 213 | opts = function() |
200 | return require "configs.treesitter" | 214 | return require("configs.treesitter") |
201 | end, | 215 | end, |
202 | }, | 216 | }, |
203 | 217 | ||
204 | { | 218 | { |
205 | 'stevearc/aerial.nvim', | 219 | "stevearc/aerial.nvim", |
206 | opts = { | 220 | opts = {}, |
207 | }, | ||
208 | -- Optional dependencies | 221 | -- Optional dependencies |
209 | dependencies = { | 222 | dependencies = { |
210 | "nvim-treesitter/nvim-treesitter", | 223 | "nvim-treesitter/nvim-treesitter", |
211 | "nvim-tree/nvim-web-devicons" | 224 | "nvim-tree/nvim-web-devicons", |
212 | }, | 225 | }, |
213 | }, | 226 | }, |
214 | 227 | ||
@@ -230,7 +243,7 @@ return { | |||
230 | lazy = false, | 243 | lazy = false, |
231 | config = function() | 244 | config = function() |
232 | require("nvchad.configs.lspconfig").defaults() | 245 | require("nvchad.configs.lspconfig").defaults() |
233 | require "configs.lspconfig" | 246 | require("configs.lspconfig") |
234 | end, | 247 | end, |
235 | }, | 248 | }, |
236 | -- | 249 | -- |
@@ -250,34 +263,34 @@ return { | |||
250 | }, | 263 | }, |
251 | 264 | ||
252 | { | 265 | { |
253 | 'numToStr/Comment.nvim', | 266 | "numToStr/Comment.nvim", |
254 | lazy = false, | 267 | lazy = false, |
255 | opts = { | 268 | opts = { |
256 | toggler = { | 269 | toggler = { |
257 | line = '<C-/>', | 270 | line = "<C-/>", |
258 | block = 'gb', | 271 | block = "gb", |
259 | }, | 272 | }, |
260 | opleader = { | 273 | opleader = { |
261 | line = '<C-/>', | 274 | line = "<C-/>", |
262 | block = 'gb', | 275 | block = "gb", |
263 | }, | 276 | }, |
264 | }, | 277 | }, |
265 | }, | 278 | }, |
266 | 279 | ||
267 | { | 280 | { |
268 | 'tpope/vim-surround', | 281 | "tpope/vim-surround", |
269 | lazy = false, | 282 | lazy = false, |
270 | }, | 283 | }, |
271 | 284 | ||
272 | { | 285 | { |
273 | "nvim-tree/nvim-tree.lua", | 286 | "nvim-tree/nvim-tree.lua", |
274 | opts = function() | 287 | opts = function() |
275 | local opts = require "nvchad.configs.nvimtree" | 288 | local opts = require("nvchad.configs.nvimtree") |
276 | opts.on_attach = function(bufnr) | 289 | opts.on_attach = function(bufnr) |
277 | local api = require("nvim-tree.api") | 290 | local api = require("nvim-tree.api") |
278 | api.config.mappings.default_on_attach(bufnr) | 291 | api.config.mappings.default_on_attach(bufnr) |
279 | vim.keymap.set('n', 'l', api.node.open.edit, { buffer = bufnr, nowait = true }) | 292 | vim.keymap.set("n", "l", api.node.open.edit, { buffer = bufnr, nowait = true }) |
280 | vim.keymap.set('n', 'h', api.tree.change_root_to_parent, { buffer = bufnr, nowait = true }) | 293 | vim.keymap.set("n", "h", api.tree.change_root_to_parent, { buffer = bufnr, nowait = true }) |
281 | end | 294 | end |
282 | return opts | 295 | return opts |
283 | end, | 296 | end, |
@@ -287,7 +300,6 @@ return { | |||
287 | -- lazy = false, | 300 | -- lazy = false, |
288 | -- }, | 301 | -- }, |
289 | 302 | ||
290 | |||
291 | -- { | 303 | -- { |
292 | -- 'akinsho/bufferline.nvim', | 304 | -- 'akinsho/bufferline.nvim', |
293 | -- lazy = false, | 305 | -- lazy = false, |