diff --git a/lazy-lock.json b/lazy-lock.json index 0b28263..4948d3f 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -3,35 +3,35 @@ "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" }, "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, "cmp-cmdline": { "branch": "main", "commit": "d126061b624e0af6c3a556428712dd4d4194ec6d" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "bd5a7d6db125d4654b50eeae9f5217f24bb22fd3" }, "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "031e6ba70b0ad5eee49fd2120ff7a2e325b17fa7" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, - "cmp-path": { "branch": "main", "commit": "c6635aae33a50d6010bf1aa756ac2398a2d54c32" }, + "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, - "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" }, - "gitsigns.nvim": { "branch": "main", "commit": "8b729e489f1475615dc6c9737da917b3bc163605" }, + "fidget.nvim": { "branch": "main", "commit": "2cb5edb2dd6700a958a446b20bb2be04d318da9d" }, + "gitsigns.nvim": { "branch": "main", "commit": "6e3c66548035e50db7bd8e360a29aec6620c3641" }, "kanagawa.nvim": { "branch": "master", "commit": "debe91547d7fb1eef34ce26a5106f277fbfdd109" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lspkind-nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" }, - "lualine.nvim": { "branch": "master", "commit": "0c6cca9f2c63dadeb9225c45bc92bb95a151d4af" }, + "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" }, "lunar.nvim": { "branch": "master", "commit": "08bbc93b96ad698d22fc2aa01805786bcedc34b9" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "3856bbb0da214d1f2f3d5a2dd3fea26591f930f9" }, - "mason.nvim": { "branch": "main", "commit": "9eaedb864cdadc29c6eb7d761a6c0d8aee26c91b" }, - "minuet-ai.nvim": { "branch": "main", "commit": "0d4464076216c4f46a54d44034bfd5c2284d0a32" }, - "nvim-autopairs": { "branch": "master", "commit": "4d74e75913832866aa7de35e4202463ddf6efd1b" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "7f0bf635082bb9b7d2b37766054526a6ccafdb85" }, + "mason.nvim": { "branch": "main", "commit": "7dc4facca9702f95353d5a1f87daf23d78e31c2a" }, + "minuet-ai.nvim": { "branch": "main", "commit": "2083b86ea01cb18dc9e7cb7a68f932ea06e999e8" }, + "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" }, "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, - "nvim-dap": { "branch": "master", "commit": "b0f983507e3702f073bfe1516846e58b56d4e42f" }, - "nvim-dap-ui": { "branch": "master", "commit": "73a26abf4941aa27da59820fd6b028ebcdbcf932" }, - "nvim-dap-virtual-text": { "branch": "master", "commit": "df66808cd78b5a97576bbaeee95ed5ca385a9750" }, - "nvim-jdtls": { "branch": "master", "commit": "c23f200fee469a415c77265ca55b496feb646992" }, - "nvim-lspconfig": { "branch": "master", "commit": "562487bc108bf73c2493f9e701b9334b48163216" }, + "nvim-dap": { "branch": "master", "commit": "a479e25ed5b5d331fb46ee4b9e160ff02ac64310" }, + "nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" }, + "nvim-dap-virtual-text": { "branch": "master", "commit": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6" }, + "nvim-jdtls": { "branch": "master", "commit": "4d77ff02063cf88963d5cf10683ab1fd15d072de" }, + "nvim-lspconfig": { "branch": "master", "commit": "a6dbc91d9ae373a87bcd9e3c15853e309691c39b" }, "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, - "nvim-treesitter": { "branch": "master", "commit": "066fd6505377e3fd4aa219e61ce94c2b8bdb0b79" }, - "nvim-treesitter-context": { "branch": "master", "commit": "4976d8b90401cba9b85f6861e4e5a6edef2f2086" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "0f051e9813a36481f48ca1f833897210dbcfffde" }, - "nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" }, - "opencode.nvim": { "branch": "main", "commit": "c8e40fdaa158a44b8ca075a76816b85a64452fdb" }, - "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, + "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, + "nvim-treesitter-context": { "branch": "master", "commit": "dca8726fea2c14e1ce6adbaa76a04816fbfaff61" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "71385f191ec06ffc60e80e6b0c9a9d5daed4824c" }, + "nvim-web-devicons": { "branch": "master", "commit": "c2599a81ecabaae07c49ff9b45dcd032a8d90f1a" }, + "opencode.nvim": { "branch": "main", "commit": "a429debd3e5b36ca91e2944e4c178c0633e96dd5" }, + "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "rustaceanvim": { "branch": "master", "commit": "047f9c9d8cd2861745eb9de6c1570ee0875aa795" }, "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, diff --git a/lua/commands.lua b/lua/commands.lua index c809dc4..c33ed4c 100644 --- a/lua/commands.lua +++ b/lua/commands.lua @@ -6,10 +6,12 @@ vim.cmd 'au BufRead,BufNewFile *.kdl set filetype=kdl' vim.cmd [[autocmd BufWritePre * lua vim.lsp.buf.format()]] -vim.cmd 'command W :execute \':silent w !sudo tee % > /dev/null\' | :edit!' +-- I don't know why but whenever I accidentally type :W instead of :w, I slows down the ide and reverts all changes +-- It doesn't even save files with sudo... +-- vim.cmd 'command W :execute \':silent w !sudo tee % > /dev/null\' | :edit!' -- Array of file names indicating root directory. Modify to your liking. -local root_names = { '.git', 'Makefile', 'justfile' } +local root_names = { '.git', 'Makefile', 'justfile', 'CMakeLists.txt', 'maskfile.md' } -- Cache to use for speed up (at cost of possibly outdated results) local root_cache = {} @@ -43,6 +45,8 @@ local function set_makeprg() vim.o.makeprg = 'just' elseif vim.fn.filereadable(cwd .. '/Makefile') == 1 then vim.o.makeprg = 'make' + elseif vim.fn.filereadable(cwd .. '/maskfile.md') == 1 then + vim.o.makeprg = 'mask' end end diff --git a/lua/plugins/ai.lua b/lua/plugins/ai.lua index 8ceafba..beb7d9d 100644 --- a/lua/plugins/ai.lua +++ b/lua/plugins/ai.lua @@ -1,23 +1,25 @@ return { - { - 'NickvanDyke/opencode.nvim', - dependencies = { 'folke/snacks.nvim', }, - ---@type opencode.Config - opts = { - port = 48291, - }, - -- stylua: ignore - keys = { - { 'ot', function() require('opencode').toggle({ port = 48291 }) end, desc = 'Toggle embedded opencode', }, - { 'oa', function() require('opencode').ask() end, desc = 'Ask opencode', mode = 'n', }, - { 'oa', function() require('opencode').ask('@selection: ') end, desc = 'Ask opencode about selection', mode = 'v', }, - { 'op', function() require('opencode').select_prompt() end, desc = 'Select prompt', mode = { 'n', 'v', }, }, - { 'on', function() require('opencode').command('session_new') end, desc = 'New session', }, - { 'oy', function() require('opencode').command('messages_copy') end, desc = 'Copy last message', }, - { '', function() require('opencode').command('messages_half_page_up') end, desc = 'Scroll messages up', }, - { '', function() require('opencode').command('messages_half_page_down') end, desc = 'Scroll messages down', }, - }, - }, + -- I don't know if I use this wrong or what but opencode does not seem to work that well + -- { + -- 'NickvanDyke/opencode.nvim', + -- dependencies = { 'folke/snacks.nvim', }, + -- ---@type opencode.Config + -- opts = { + -- port = 48291, + -- }, + -- -- stylua: ignore + -- keys = { + -- { 'ot', function() require('opencode').toggle({ port = 48291 }) end, desc = 'Toggle embedded opencode', }, + -- { 'oa', function() require('opencode').ask() end, desc = 'Ask opencode', mode = 'n', }, + -- { 'oa', function() require('opencode').ask('@selection: ') end, desc = 'Ask opencode about selection', mode = 'v', }, + -- { 'op', function() require('opencode').select_prompt() end, desc = 'Select prompt', mode = { 'n', 'v', }, }, + -- { 'on', function() require('opencode').command('session_new') end, desc = 'New session', }, + -- { 'oy', function() require('opencode').command('messages_copy') end, desc = 'Copy last message', }, + -- { '', function() require('opencode').command('messages_half_page_up') end, desc = 'Scroll messages up', }, + -- { '', function() require('opencode').command('messages_half_page_down') end, desc = 'Scroll messages down', }, + -- }, + -- }, + -- This is great tho { 'milanglacier/minuet-ai.nvim', dependencies = { 'hrsh7th/nvim-cmp', 'nvim-lua/plenary.nvim' }, diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 58453a3..d345051 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -156,7 +156,11 @@ return { variables = {}, }, }) - lspconfig.ccls.setup { + -- lspconfig.ccls.setup { + -- capabilities = capabilities, + -- on_attach = lsp_attach, + -- } + lspconfig.clangd.setup { capabilities = capabilities, on_attach = lsp_attach, } diff --git a/lua/plugins/navigation.lua b/lua/plugins/navigation.lua index 563d4d5..3e0947e 100644 --- a/lua/plugins/navigation.lua +++ b/lua/plugins/navigation.lua @@ -19,7 +19,10 @@ return { { 'fk', telescope.keymaps, { noremap = true, silent = true }, desc = "Search in keymaps" }, { 'cc', telescope.colorscheme, desc = "Select colorscheme" }, }) - end + require("telescope.config").set_defaults({ + file_ignore_patterns = { "doc/" } + }) + end, }, { 'nvim-telescope/telescope-ui-select.nvim',