diff options
Diffstat (limited to '.config/nvim')
-rw-r--r-- | .config/nvim/after/plugin/autocmds.vim | 17 | ||||
-rw-r--r-- | .config/nvim/lua/core/options.lua | 2 | ||||
-rw-r--r-- | .config/nvim/lua/helpers/autocmds.lua | 127 | ||||
-rw-r--r-- | .config/nvim/lua/plugins/conform.lua | 18 | ||||
-rw-r--r-- | .config/nvim/lua/plugins/git.lua | 6 | ||||
-rw-r--r-- | .config/nvim/lua/plugins/lastplace.lua | 11 | ||||
-rw-r--r-- | .config/nvim/lua/plugins/lsp.lua | 107 | ||||
-rw-r--r-- | .config/nvim/lua/plugins/telescope.lua | 4 | ||||
-rw-r--r-- | .config/nvim/lua/plugins/typst.lua | 10 |
9 files changed, 260 insertions, 42 deletions
diff --git a/.config/nvim/after/plugin/autocmds.vim b/.config/nvim/after/plugin/autocmds.vim index 0e7935b..21c7bc4 100644 --- a/.config/nvim/after/plugin/autocmds.vim +++ b/.config/nvim/after/plugin/autocmds.vim | |||
@@ -1,23 +1,6 @@ | |||
1 | " I don't know how to port this yet | 1 | " I don't know how to port this yet |
2 | autocmd BufRead,BufWrite * if ! &bin | silent! %s/\s\+$//ge | endif | 2 | autocmd BufRead,BufWrite * if ! &bin | silent! %s/\s\+$//ge | endif |
3 | 3 | ||
4 | autocmd BufNewFile,BufRead /tmp/neomutt* set noautoindent filetype=mail wm=0 tw=80 | ||
5 | |||
6 | augroup bukugroup | ||
7 | au! BufRead,BufNewFile,BufEnter buku-edit-* set filetype=buku | ||
8 | augroup END | ||
9 | |||
10 | " Restore last position | ||
11 | autocmd BufReadPost * | ||
12 | \ if line("'\"") >= 1 && line("'\"") <= line("$") && &ft !~# 'commit' | ||
13 | \ | exe "normal! g`\"" | ||
14 | \ | endif | ||
15 | |||
16 | augroup pkgbuild | ||
17 | autocmd! | ||
18 | autocmd BufRead,BufNewFile PKGBUILD set filetype=PKGBUILD | ||
19 | augroup END | ||
20 | |||
21 | augroup vimwiki | 4 | augroup vimwiki |
22 | autocmd! | 5 | autocmd! |
23 | autocmd BufRead,BufNewFile *.wiki set filetype=vimwiki | 6 | autocmd BufRead,BufNewFile *.wiki set filetype=vimwiki |
diff --git a/.config/nvim/lua/core/options.lua b/.config/nvim/lua/core/options.lua index 1a45b8f..9962f4f 100644 --- a/.config/nvim/lua/core/options.lua +++ b/.config/nvim/lua/core/options.lua | |||
@@ -63,6 +63,8 @@ local opts = { | |||
63 | -- switch case labels | 63 | -- switch case labels |
64 | cinoptions = "l1", | 64 | cinoptions = "l1", |
65 | 65 | ||
66 | signcolumn = "yes:1", | ||
67 | |||
66 | } | 68 | } |
67 | 69 | ||
68 | for opt, val in pairs(opts) do | 70 | for opt, val in pairs(opts) do |
diff --git a/.config/nvim/lua/helpers/autocmds.lua b/.config/nvim/lua/helpers/autocmds.lua index 11f4480..7461090 100644 --- a/.config/nvim/lua/helpers/autocmds.lua +++ b/.config/nvim/lua/helpers/autocmds.lua | |||
@@ -29,3 +29,130 @@ vim.api.nvim_create_autocmd("VimResized", { | |||
29 | }, | 29 | }, |
30 | command = "wincmd =", | 30 | command = "wincmd =", |
31 | }) | 31 | }) |
32 | |||
33 | -- https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/autocmds.lua | ||
34 | -- Set typst filetype | ||
35 | vim.api.nvim_create_autocmd( | ||
36 | { | ||
37 | "BufNewFile", | ||
38 | "BufRead", | ||
39 | }, | ||
40 | { | ||
41 | group = augroup("typst"), | ||
42 | pattern = "*.typ", | ||
43 | callback = function() | ||
44 | local buf = vim.api.nvim_get_current_buf() | ||
45 | vim.api.nvim_set_option_value("filetype", "typst", { buf = buf }) | ||
46 | vim.api.nvim_set_option_value("shiftwidth", 2, { buf = buf }) | ||
47 | end | ||
48 | } | ||
49 | ) | ||
50 | |||
51 | -- Set PKGBUILD filetype | ||
52 | vim.api.nvim_create_autocmd( | ||
53 | { | ||
54 | "BufNewFile", | ||
55 | "BufRead", | ||
56 | }, | ||
57 | { | ||
58 | group = augroup("pkgbuild"), | ||
59 | pattern = "PKGBUILD", | ||
60 | callback = function() | ||
61 | local buf = vim.api.nvim_get_current_buf() | ||
62 | vim.api.nvim_set_option_value("filetype", "PKGBUILD", { buf = buf }) | ||
63 | end | ||
64 | } | ||
65 | ) | ||
66 | |||
67 | -- Set buku-edit filetype | ||
68 | vim.api.nvim_create_autocmd( | ||
69 | { | ||
70 | "BufNewFile", | ||
71 | "BufRead", | ||
72 | }, | ||
73 | { | ||
74 | group = augroup("buku-edit"), | ||
75 | pattern = "buku-edit-*", | ||
76 | callback = function() | ||
77 | local buf = vim.api.nvim_get_current_buf() | ||
78 | vim.api.nvim_set_option_value("filetype", "buku", { buf = buf }) | ||
79 | end | ||
80 | } | ||
81 | ) | ||
82 | |||
83 | -- Set mail filetype | ||
84 | vim.api.nvim_create_autocmd( | ||
85 | { | ||
86 | "BufNewFile", | ||
87 | "BufRead", | ||
88 | }, | ||
89 | { | ||
90 | group = augroup("mail"), | ||
91 | pattern = "/tmp/neomutt*", | ||
92 | callback = function() | ||
93 | local buf = vim.api.nvim_get_current_buf() | ||
94 | vim.api.nvim_set_option_value("autoindent", false, { buf = buf }) | ||
95 | vim.api.nvim_set_option_value("filetype", "mail", { buf = buf }) | ||
96 | vim.api.nvim_set_option_value("wrapmargin", 0, { buf = buf }) | ||
97 | vim.api.nvim_set_option_value("textwidth", 80, { buf = buf }) | ||
98 | end | ||
99 | } | ||
100 | ) | ||
101 | |||
102 | -- Resize splits if window got resized | ||
103 | vim.api.nvim_create_autocmd({ "VimResized" }, { | ||
104 | group = augroup("resize_splits"), | ||
105 | callback = function() | ||
106 | local current_tab = vim.fn.tabpagenr() | ||
107 | vim.cmd("tabdo wincmd =") | ||
108 | vim.cmd("tabnext " .. current_tab) | ||
109 | end, | ||
110 | }) | ||
111 | |||
112 | -- close some filetypes with <q> | ||
113 | vim.api.nvim_create_autocmd("FileType", { | ||
114 | group = augroup("close_with_q"), | ||
115 | pattern = { | ||
116 | "PlenaryTestPopup", | ||
117 | "checkhealth", | ||
118 | "dbout", | ||
119 | "gitsigns-blame", | ||
120 | "grug-far", | ||
121 | "help", | ||
122 | "lspinfo", | ||
123 | "neotest-output", | ||
124 | "neotest-output-panel", | ||
125 | "neotest-summary", | ||
126 | "notify", | ||
127 | "qf", | ||
128 | "snacks_win", | ||
129 | "spectre_panel", | ||
130 | "startuptime", | ||
131 | "tsplayground", | ||
132 | }, | ||
133 | callback = function(event) | ||
134 | vim.bo[event.buf].buflisted = false | ||
135 | vim.schedule(function() | ||
136 | vim.keymap.set("n", "q", function() | ||
137 | vim.cmd("close") | ||
138 | pcall(vim.api.nvim_buf_delete, event.buf, { force = true }) | ||
139 | end, { | ||
140 | buffer = event.buf, | ||
141 | silent = true, | ||
142 | desc = "Quit buffer", | ||
143 | }) | ||
144 | end) | ||
145 | end, | ||
146 | }) | ||
147 | |||
148 | -- Auto create dir when saving a file, in case some intermediate directory does not exist | ||
149 | vim.api.nvim_create_autocmd({ "BufWritePre" }, { | ||
150 | group = augroup("auto_create_dir"), | ||
151 | callback = function(event) | ||
152 | if event.match:match("^%w%w+:[\\/][\\/]") then | ||
153 | return | ||
154 | end | ||
155 | local file = vim.uv.fs_realpath(event.match) or event.match | ||
156 | vim.fn.mkdir(vim.fn.fnamemodify(file, ":p:h"), "p") | ||
157 | end, | ||
158 | }) | ||
diff --git a/.config/nvim/lua/plugins/conform.lua b/.config/nvim/lua/plugins/conform.lua new file mode 100644 index 0000000..9f15bbb --- /dev/null +++ b/.config/nvim/lua/plugins/conform.lua | |||
@@ -0,0 +1,18 @@ | |||
1 | return { | ||
2 | { | ||
3 | 'stevearc/conform.nvim', | ||
4 | opts = { | ||
5 | formatters_by_ft = { | ||
6 | lua = { "stylua" }, | ||
7 | -- Conform will run multiple formatters sequentially | ||
8 | python = { "isort", "black" }, | ||
9 | -- You can customize some of the format options for the filetype (:help conform.format) | ||
10 | rust = { "rustfmt", lsp_format = "fallback" }, | ||
11 | -- Conform will run the first available formatter | ||
12 | javascript = { "prettierd", "prettier", stop_after_first = true }, | ||
13 | -- latex | ||
14 | tex = { "tex-fmt" }, | ||
15 | }, | ||
16 | } | ||
17 | }, | ||
18 | } | ||
diff --git a/.config/nvim/lua/plugins/git.lua b/.config/nvim/lua/plugins/git.lua index db1f435..5f1c1e3 100644 --- a/.config/nvim/lua/plugins/git.lua +++ b/.config/nvim/lua/plugins/git.lua | |||
@@ -99,11 +99,11 @@ return { | |||
99 | { | 99 | { |
100 | "NeogitOrg/neogit", | 100 | "NeogitOrg/neogit", |
101 | dependencies = { | 101 | dependencies = { |
102 | "nvim-lua/plenary.nvim", -- required | 102 | "nvim-lua/plenary.nvim", -- required |
103 | "sindrets/diffview.nvim", -- optional - Diff integration | 103 | "sindrets/diffview.nvim", -- optional - Diff integration |
104 | "nvim-telescope/telescope.nvim", -- optional | 104 | "nvim-telescope/telescope.nvim", -- optional |
105 | }, | 105 | }, |
106 | cmd="Neogit", | 106 | cmd = "Neogit", |
107 | config = true | 107 | config = true |
108 | } | 108 | } |
109 | } | 109 | } |
diff --git a/.config/nvim/lua/plugins/lastplace.lua b/.config/nvim/lua/plugins/lastplace.lua new file mode 100644 index 0000000..72e5c7f --- /dev/null +++ b/.config/nvim/lua/plugins/lastplace.lua | |||
@@ -0,0 +1,11 @@ | |||
1 | return { | ||
2 | { | ||
3 | "ethanholz/nvim-lastplace", | ||
4 | |||
5 | opts = { | ||
6 | lastplace_ignore_buftype = { "quickfix", "nofile", "help" }, | ||
7 | lastplace_ignore_filetype = { "gitcommit", "gitrebase", "svn", "hgcommit" }, | ||
8 | lastplace_open_folds = true, | ||
9 | }, | ||
10 | } | ||
11 | } | ||
diff --git a/.config/nvim/lua/plugins/lsp.lua b/.config/nvim/lua/plugins/lsp.lua index 41616de..e710fd7 100644 --- a/.config/nvim/lua/plugins/lsp.lua +++ b/.config/nvim/lua/plugins/lsp.lua | |||
@@ -80,6 +80,19 @@ return { | |||
80 | } | 80 | } |
81 | end | 81 | end |
82 | 82 | ||
83 | -- typst/tinymist | ||
84 | require("lspconfig")["tinymist"].setup({ | ||
85 | on_attach = on_attach, | ||
86 | capabilities = capabilities, | ||
87 | single_file_support = true, | ||
88 | root_dir = function() | ||
89 | return vim.fn.getcwd() | ||
90 | end, | ||
91 | settings = { | ||
92 | formatterMode = "typstyle", | ||
93 | } | ||
94 | }) | ||
95 | |||
83 | -- lua | 96 | -- lua |
84 | require("lspconfig")["lua_ls"].setup({ | 97 | require("lspconfig")["lua_ls"].setup({ |
85 | on_attach = on_attach, | 98 | on_attach = on_attach, |
@@ -142,26 +155,7 @@ return { | |||
142 | filetypes = { 'sh', 'tex' }, | 155 | filetypes = { 'sh', 'tex' }, |
143 | }) | 156 | }) |
144 | 157 | ||
145 | vim.g.rustaceanvim = { | 158 | require("lspconfig")["harper_ls"].setup { |
146 | -- Plugin configuration | ||
147 | tools = { | ||
148 | }, | ||
149 | -- LSP configuration | ||
150 | server = { | ||
151 | on_attach = on_attach, | ||
152 | vim.lsp.inlay_hint.enable(true), | ||
153 | default_settings = { | ||
154 | -- rust-analyzer language server configuration | ||
155 | ['rust-analyzer'] = { | ||
156 | }, | ||
157 | }, | ||
158 | }, | ||
159 | -- DAP configuration | ||
160 | dap = { | ||
161 | }, | ||
162 | } | ||
163 | |||
164 | lspconfig.harper_ls.setup { | ||
165 | on_attach = on_attach, | 159 | on_attach = on_attach, |
166 | capabilities = capabilities, | 160 | capabilities = capabilities, |
167 | settings = { | 161 | settings = { |
@@ -186,12 +180,58 @@ return { | |||
186 | } | 180 | } |
187 | }, | 181 | }, |
188 | filetypes = { | 182 | filetypes = { |
189 | "markdown", "rust", "typescript", "typescriptreact", "javascript", "python", "c", "cpp", "ruby", "swift", "csharp", "toml", "lua", "gitcommit", "java", "html", "vimwiki" | 183 | "markdown", "rust", "typescript", "typescriptreact", "javascript", "python", "c", "cpp", "ruby", "swift", "csharp", "toml", "lua", "gitcommit", "java", "html", "vimwiki", "tex" |
184 | }, | ||
185 | root_dir = function(fname) | ||
186 | return vim.fs.dirname(vim.fs.find('.git', { path = fname, upward = true })[1]) | ||
187 | end, | ||
188 | } | ||
189 | |||
190 | -- ltex | ||
191 | require("lspconfig")["ltex"].setup({ | ||
192 | capabilities = capabilities, | ||
193 | on_attach = function(client, bufnr) | ||
194 | on_attach(client, bufnr) | ||
195 | require("ltex_extra").setup { | ||
196 | load_langs = { "en-GB" }, | ||
197 | init_check = true, | ||
198 | log_level = "none", | ||
199 | } | ||
200 | end, | ||
201 | filetypes = { "bib", "gitcommit", "markdown", "org", "plaintex", "rst", "rnoweb", "tex", "pandoc", "quarto", "rmd", "context", "mail", "text" }, | ||
202 | settings = { | ||
203 | ltex = { | ||
204 | enabled = { "bibtex", "gitcommit", "markdown", "org", "tex", "restructuredtext", "rsweave", "latex", "quarto", "rmd", "context", "mail", "plaintext" } | ||
205 | } | ||
190 | } | 206 | } |
207 | }) | ||
208 | |||
209 | vim.g.rustaceanvim = { | ||
210 | -- Plugin configuration | ||
211 | tools = { | ||
212 | }, | ||
213 | -- LSP configuration | ||
214 | server = { | ||
215 | on_attach = on_attach, | ||
216 | vim.lsp.inlay_hint.enable(true), | ||
217 | default_settings = { | ||
218 | -- rust-analyzer language server configuration | ||
219 | ['rust-analyzer'] = { | ||
220 | }, | ||
221 | }, | ||
222 | }, | ||
223 | -- DAP configuration | ||
224 | dap = { | ||
225 | }, | ||
191 | } | 226 | } |
192 | end, | 227 | end, |
193 | }, | 228 | }, |
194 | { | 229 | { |
230 | "barreiroleo/ltex_extra.nvim", | ||
231 | ft = { "markdown", "tex" }, | ||
232 | dependencies = { "neovim/nvim-lspconfig" }, | ||
233 | }, | ||
234 | { | ||
195 | "j-hui/fidget.nvim", | 235 | "j-hui/fidget.nvim", |
196 | event = "VeryLazy", | 236 | event = "VeryLazy", |
197 | opts = { | 237 | opts = { |
@@ -215,9 +255,32 @@ return { | |||
215 | }, | 255 | }, |
216 | { | 256 | { |
217 | "folke/lazydev.nvim", | 257 | "folke/lazydev.nvim", |
218 | ft = "lua", -- only load on lua files | 258 | ft = "lua", |
219 | }, | 259 | }, |
220 | { | 260 | { |
221 | 'fatih/vim-go' | 261 | 'fatih/vim-go' |
262 | }, | ||
263 | { | ||
264 | "danymat/neogen", | ||
265 | config = true, | ||
266 | opts = { | ||
267 | snippet_engine = "luasnip", | ||
268 | languages = { | ||
269 | python = { | ||
270 | template = { | ||
271 | annotation_convention = "reST", | ||
272 | } | ||
273 | } | ||
274 | } | ||
275 | } | ||
276 | }, | ||
277 | { | ||
278 | 'marcelofern/vale.nvim', | ||
279 | config = function() | ||
280 | require("vale").setup({ | ||
281 | bin = "/usr/bin/vale", | ||
282 | vale_config_path = "$HOME/.config/vale/.vale.ini", | ||
283 | }) | ||
284 | end, | ||
222 | } | 285 | } |
223 | } | 286 | } |
diff --git a/.config/nvim/lua/plugins/telescope.lua b/.config/nvim/lua/plugins/telescope.lua index 40c99a4..bfda4aa 100644 --- a/.config/nvim/lua/plugins/telescope.lua +++ b/.config/nvim/lua/plugins/telescope.lua | |||
@@ -46,6 +46,10 @@ return { | |||
46 | map("n", "<leader>sw", require("telescope.builtin").grep_string, "ðŸ”: current word") | 46 | map("n", "<leader>sw", require("telescope.builtin").grep_string, "ðŸ”: current word") |
47 | map("n", "<leader>sg", require("telescope.builtin").live_grep, "ðŸ”: live grep") | 47 | map("n", "<leader>sg", require("telescope.builtin").live_grep, "ðŸ”: live grep") |
48 | map("n", "<leader>sd", require("telescope.builtin").diagnostics, "ðŸ”: diagnostics") | 48 | map("n", "<leader>sd", require("telescope.builtin").diagnostics, "ðŸ”: diagnostics") |
49 | map("n", "<leader>sc", function() | ||
50 | require("telescope.builtin").lsp_document_symbols({ symbols = 'function' }) | ||
51 | end, "ðŸ”: lsp symbols (functions)") | ||
52 | |||
49 | map("n", "<leader>st", function() | 53 | map("n", "<leader>st", function() |
50 | require("telescope.builtin").spell_suggest(require("telescope.themes").get_cursor({ | 54 | require("telescope.builtin").spell_suggest(require("telescope.themes").get_cursor({ |
51 | prompt_title = "", | 55 | prompt_title = "", |
diff --git a/.config/nvim/lua/plugins/typst.lua b/.config/nvim/lua/plugins/typst.lua new file mode 100644 index 0000000..c04ea70 --- /dev/null +++ b/.config/nvim/lua/plugins/typst.lua | |||
@@ -0,0 +1,10 @@ | |||
1 | return { | ||
2 | { | ||
3 | 'chomosuke/typst-preview.nvim', | ||
4 | ft = 'typst', | ||
5 | version = '1.*', | ||
6 | config = function() | ||
7 | require 'typst-preview'.setup {} | ||
8 | end, | ||
9 | } | ||
10 | } | ||