Compare commits
	
		
			1 Commits
		
	
	
		
			main
			...
			6975177d74
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 6975177d74 | 
| @@ -1,41 +1,38 @@ | ||||
| { | ||||
|   "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" }, | ||||
|   "LuaSnip": { "branch": "master", "commit": "de10d8414235b0a8cabfeba60d07c24304e71f5c" }, | ||||
|   "blink.cmp": { "branch": "main", "commit": "bae4bae0eedd1fa55f34b685862e94a222d5c6f8" }, | ||||
|   "fidget.nvim": { "branch": "main", "commit": "4d5858bd4c471c895060e1b9f3575f1551184dc5" }, | ||||
|   "LuaSnip": { "branch": "master", "commit": "66b5c2707e624dcd2cd3605676c64a2efe47e9d1" }, | ||||
|   "blink.cmp": { "branch": "main", "commit": "586ee87534f5bf65f1c8dea2d1da2a57e8cddd36" }, | ||||
|   "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" }, | ||||
|   "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, | ||||
|   "gitsigns.nvim": { "branch": "main", "commit": "6e3c66548035e50db7bd8e360a29aec6620c3641" }, | ||||
|   "gitsigns.nvim": { "branch": "main", "commit": "d20209a154a8d11710607899b24a0698085b35cf" }, | ||||
|   "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" }, | ||||
|   "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, | ||||
|   "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, | ||||
|   "lua-utils.nvim": { "branch": "main", "commit": "e565749421f4bbb5d2e85e37c3cef9d56553d8bd" }, | ||||
|   "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" }, | ||||
|   "lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" }, | ||||
|   "luarocks.nvim": { "branch": "main", "commit": "1db9093915eb16ba2473cfb8d343ace5ee04130a" }, | ||||
|   "luvit-meta": { "branch": "main", "commit": "1df30b60b1b4aecfebc785aa98943db6c6989716" }, | ||||
|   "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, | ||||
|   "mini.icons": { "branch": "main", "commit": "f9a177c11daa7829389b7b6eaaec8b8a5c47052d" }, | ||||
|   "mini.nvim": { "branch": "main", "commit": "0ffc2af38b3c5293076317b138635d6d7c80a40f" }, | ||||
|   "mini.icons": { "branch": "main", "commit": "94848dad1589a199f876539bd79befb0c5e3abf0" }, | ||||
|   "mini.nvim": { "branch": "main", "commit": "ec0fc48de7408f1fc09b1ee2a87484396032dbb4" }, | ||||
|   "neorg": { "branch": "main", "commit": "790b0444c0c654131a722817dc893332e06c72b9" }, | ||||
|   "neorg-interim-ls": { "branch": "main", "commit": "52bdf8a8cd246a9205756449776aa057bd593d61" }, | ||||
|   "neorg-interim-ls": { "branch": "main", "commit": "348cd121d8b872248e9b0e48e3611c54dfad83f0" }, | ||||
|   "neorg-telescope": { "branch": "main", "commit": "7fb6ca6a632c3c095601d379a664c0c1f802dc6c" }, | ||||
|   "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, | ||||
|   "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, | ||||
|   "nvim-dap": { "branch": "master", "commit": "968f89f8aac11b6bdbfc942c71d3436658c1435f" }, | ||||
|   "nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" }, | ||||
|   "nvim-dap-virtual-text": { "branch": "master", "commit": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6" }, | ||||
|   "nvim-lspconfig": { "branch": "master", "commit": "408cf07b97535825cca6f1afa908d98348712ba6" }, | ||||
|   "nvim-dap": { "branch": "master", "commit": "cc77338e6e34c79f1c638f51ae4160dc9bfb05de" }, | ||||
|   "nvim-lspconfig": { "branch": "master", "commit": "5bb3fb4a63eb38361f3f992618f65dd4fa52e72b" }, | ||||
|   "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, | ||||
|   "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, | ||||
|   "nvim-treesitter-textobjects": { "branch": "master", "commit": "71385f191ec06ffc60e80e6b0c9a9d5daed4824c" }, | ||||
|   "oil.nvim": { "branch": "master", "commit": "07f80ad645895af849a597d1cac897059d89b686" }, | ||||
|   "nvim-treesitter-textobjects": { "branch": "master", "commit": "89ebe73cd2836db80a22d9748999ace0241917a5" }, | ||||
|   "oil.nvim": { "branch": "master", "commit": "bbad9a76b2617ce1221d49619e4e4b659b3c61fc" }, | ||||
|   "pathlib.nvim": { "branch": "main", "commit": "57e5598af6fe253761c1b48e0b59b7cd6699e2c1" }, | ||||
|   "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, | ||||
|   "rose-pine": { "branch": "main", "commit": "72a04c4065345b51b56aed4859ea1d884f734097" }, | ||||
|   "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, | ||||
|   "rose-pine": { "branch": "main", "commit": "f93360149e9ed4df8677fbb07c7231ea0fd03b97" }, | ||||
|   "tabular": { "branch": "master", "commit": "12437cd1b53488e24936ec4b091c9324cafee311" }, | ||||
|   "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" }, | ||||
|   "telescope.nvim": { "branch": "0.1.x", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" }, | ||||
|   "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, | ||||
|   "typst-preview.nvim": { "branch": "master", "commit": "dea4525d5420b7c32eebda7de15a6beb9d6574fa" }, | ||||
|   "typst.vim": { "branch": "main", "commit": "323539709e29a537ff39dfce6c05f175a8921504" }, | ||||
|   "undotree": { "branch": "master", "commit": "28f2f54a34baff90ea6f4a735ef1813ad875c743" }, | ||||
|   "vim-fugitive": { "branch": "master", "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4" }, | ||||
| @@ -43,6 +40,6 @@ | ||||
|   "vim-rhubarb": { "branch": "master", "commit": "5496d7c94581c4c9ad7430357449bb57fc59f501" }, | ||||
|   "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" }, | ||||
|   "vim-speeddating": { "branch": "master", "commit": "c17eb01ebf5aaf766c53bab1f6592710e5ffb796" }, | ||||
|   "vimtex": { "branch": "master", "commit": "dc90feacb86f7b85b0b791d8073eefc769a23725" }, | ||||
|   "vimtex": { "branch": "master", "commit": "7f2633027c8f496a85284de0c11aa32f1e07e049" }, | ||||
|   "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" } | ||||
| } | ||||
|   | ||||
| @@ -63,7 +63,7 @@ vim.api.nvim_create_autocmd("FileType", { | ||||
|   pattern = { "typst" }, | ||||
|   group = typstgroup, | ||||
|   callback = function() | ||||
|     vim.keymap.set('', '<LocalLeader>mp', ':TypstPreview<CR>', { noremap = true, silent = true, desc = "[M]ake [P]review" }) | ||||
|     vim.keymap.set('', '<LocalLeader>mp', ':TypstWatch<CR>', { noremap = true, silent = true, desc = "[M]ake [P]review" }) | ||||
|     vim.o.spell = true | ||||
|     spell_keymap() | ||||
|     vim.o.spelllang = "fr,en" | ||||
| @@ -81,12 +81,3 @@ vim.api.nvim_create_autocmd("FileType", { | ||||
|     vim.o.spelllang = "en" | ||||
|   end, | ||||
| }) | ||||
|  | ||||
| -- disable LSP for password-store | ||||
| vim.api.nvim_create_autocmd({"BufEnter", "BufRead" }, { | ||||
|   pattern = "/dev/shm/pass*", | ||||
|   group = vim.api.nvim_create_augroup('DisableLsp', {}), | ||||
|   callback = function () | ||||
|     vim.lsp.stop_client(vim.lsp.get_clients()) | ||||
|   end | ||||
| }) | ||||
|   | ||||
							
								
								
									
										72
									
								
								lua/lsp.lua
									
									
									
									
									
								
							
							
						
						
									
										72
									
								
								lua/lsp.lua
									
									
									
									
									
								
							| @@ -64,22 +64,20 @@ vim.api.nvim_create_autocmd("LspAttach", { | ||||
| require('which-key').add { | ||||
|   -- { "<leader>c",  group = "[C]ode" }, | ||||
|   -- { "<leader>c_", hidden = true }, | ||||
|   { "<leader>d",   group = "[D]ocument / [D]iagnostic/ [D]ebug" }, | ||||
|   { "<leader>d_",  hidden = true }, | ||||
|   { "<leader>ds",  group = "[D]ebug [S]tep" }, | ||||
|   { "<leader>ds_", hidden = true }, | ||||
|   { "<leader>g",   group = "[G]it" }, | ||||
|   { "<leader>g_",  hidden = true }, | ||||
|   { "<leader>h",   group = "Git [H]unk" }, | ||||
|   { "<leader>h_",  hidden = true }, | ||||
|   { "<leader>r",   group = "[R]ename" }, | ||||
|   { "<leader>r_",  hidden = true }, | ||||
|   { "<leader>s",   group = "[S]earch" }, | ||||
|   { "<leader>s_",  hidden = true }, | ||||
|   { "<leader>t",   group = "[T]oggle" }, | ||||
|   { "<leader>t_",  hidden = true }, | ||||
|   { "<leader>w",   group = "[W]orkspace" }, | ||||
|   { "<leader>w_",  hidden = true }, | ||||
|   { "<leader>d",  group = "[D]ocument / [D]iagnostic" }, | ||||
|   { "<leader>d_", hidden = true }, | ||||
|   { "<leader>g",  group = "[G]it" }, | ||||
|   { "<leader>g_", hidden = true }, | ||||
|   { "<leader>h",  group = "Git [H]unk" }, | ||||
|   { "<leader>h_", hidden = true }, | ||||
|   { "<leader>r",  group = "[R]ename" }, | ||||
|   { "<leader>r_", hidden = true }, | ||||
|   { "<leader>s",  group = "[S]earch" }, | ||||
|   { "<leader>s_", hidden = true }, | ||||
|   { "<leader>t",  group = "[T]oggle" }, | ||||
|   { "<leader>t_", hidden = true }, | ||||
|   { "<leader>w",  group = "[W]orkspace" }, | ||||
|   { "<leader>w_", hidden = true }, | ||||
| } | ||||
| -- register which-key VISUAL mode | ||||
| -- required for visual <leader>hs (hunk stage) to work | ||||
| @@ -92,45 +90,7 @@ require('which-key').add { | ||||
| -- local capabilities = vim.lsp.protocol.make_client_capabilities() | ||||
| -- capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities) | ||||
|  | ||||
| -- [[ DAP ]] | ||||
|  | ||||
| local setup_dap = function() | ||||
|   local dap = require('dap'); | ||||
|   local ui = require('dapui'); | ||||
|   ui.setup(); | ||||
|   require("nvim-dap-virtual-text").setup(); | ||||
|  | ||||
|   vim.keymap.set("n", "<Leader>b", dap.toggle_breakpoint, { desc = "Debug [B]reakpoint", silent = true }); | ||||
|   vim.keymap.set("n", "<Leader>dr", dap.run_to_cursor, { desc = "[D]ebug [R]un to cursor" }); | ||||
|   vim.keymap.set("n", "<Leader>de", function() | ||||
|     ui.eval(nil, { enter = true }) | ||||
|   end, { desc = "[D]ebug [E]val under cursor", silent = true }); | ||||
|  | ||||
|   -- TODO: add some DAP configs to test | ||||
|  | ||||
|   vim.keymap.set("n", "<Leader>dc", dap.continue, { desc = "[D]ebug [C]ontinue", silent = true }) | ||||
|   vim.keymap.set("n", "<Leader>dsi", dap.step_into, { desc = "[D]ebug [S]tep [I]nto", silent = true }) | ||||
|   vim.keymap.set("n", "<Leader>dso", dap.step_over, { desc = "[D]ebug [S]tep [O]ver", silent = true }) | ||||
|   vim.keymap.set("n", "<Leader>dsu", dap.step_out, { desc = "[D]ebug [S]tep o[U]t", silent = true }) | ||||
|   vim.keymap.set("n", "<Leader>dsb", dap.step_back, { desc = "[D]ebug [S]tep [B]ack", silent = true }) | ||||
|   vim.keymap.set("n", "<Leader>dr", dap.restart, { desc = "[D]ebug [R]estart", silent = true }) | ||||
|  | ||||
|   dap.listeners.before.attach.dapui_config = function() | ||||
|     ui.open() | ||||
|   end | ||||
|   dap.listeners.before.launch.dapui_config = function() | ||||
|     ui.open() | ||||
|   end | ||||
|   dap.listeners.before.event_terminated.dapui_config = function() | ||||
|     ui.close() | ||||
|   end | ||||
|   dap.listeners.before.event_exited.dapui_config = function() | ||||
|     ui.close() | ||||
|   end | ||||
| end | ||||
|  | ||||
| setup_dap() | ||||
|  | ||||
| -- [[ System LSPs ]] | ||||
| local setup_godot_dap = function() | ||||
|   local dap = require("dap") | ||||
|  | ||||
| @@ -172,5 +132,5 @@ vim.lsp.enable({ | ||||
|   -- managed in lsp directory | ||||
|   "ltex_ls_plus", "rust-analyzer", "gdscript", | ||||
|   -- managed by lsp-config | ||||
|   "tinymist", "texlab", "clangd", "pyright", "ts_ls", "eslint", "lua_ls", "bashls", "jsonls" | ||||
|   "tinymist", "texlab", "clangd", "pyright", "ts_ls", "eslint", "lua_ls", "bashls" | ||||
| }) | ||||
|   | ||||
| @@ -36,14 +36,7 @@ require('lazy').setup({ | ||||
|   }, | ||||
|  | ||||
|   -- DAP: Debug Adapter Protocol | ||||
|   { | ||||
|     'mfussenegger/nvim-dap', | ||||
|     dependencies = { | ||||
|       'rcarriga/nvim-dap-ui', | ||||
|       'theHamsta/nvim-dap-virtual-text', | ||||
|     }, | ||||
|   }, | ||||
|  | ||||
|   'mfussenegger/nvim-dap', | ||||
|   { | ||||
|     -- [[ Autocompletion ]] | ||||
|     'saghen/blink.cmp', | ||||
| @@ -75,7 +68,7 @@ require('lazy').setup({ | ||||
|       -- C-k: Toggle signature help (if signature.enabled = true) | ||||
|       -- | ||||
|       -- See :h blink-cmp-config-keymap for defining your own keymap | ||||
|       keymap = { preset = 'default' }, | ||||
|       keymap = { preset = 'super-tab' }, | ||||
|  | ||||
|       appearance = { | ||||
|         -- 'mono' (default) for 'Nerd Font Mono' or 'normal' for 'Nerd Font' | ||||
| @@ -110,9 +103,7 @@ require('lazy').setup({ | ||||
|       -- when the Rust fuzzy matcher is not available, by using `implementation = "prefer_rust"` | ||||
|       -- | ||||
|       -- See the fuzzy documentation for more information | ||||
|       fuzzy = { | ||||
|         implementation = "prefer_rust_with_warning", | ||||
|       } | ||||
|       fuzzy = { implementation = "prefer_rust_with_warning" } | ||||
|     }, | ||||
|     opts_extend = { "sources.default" } | ||||
|   }, | ||||
| @@ -369,16 +360,6 @@ require('lazy').setup({ | ||||
|     ft = 'typst', | ||||
|     lazy = false, | ||||
|   }, | ||||
|   { | ||||
|     'chomosuke/typst-preview.nvim', | ||||
|     lazy = false, -- or ft = 'typst' | ||||
|     version = '1.*', | ||||
|     opts = { | ||||
|       dependencies_bin = { | ||||
|         ['tinymist'] = 'tinymist' | ||||
|       } | ||||
|     },    -- lazy.nvim will implicitly calls `setup {}` | ||||
|   }, | ||||
|   -- oil.nvim | ||||
|   { | ||||
|     'stevearc/oil.nvim', | ||||
|   | ||||
		Reference in New Issue
	
	Block a user