diff --git a/flake.lock b/flake.lock index 4bab839..371d5d1 100644 --- a/flake.lock +++ b/flake.lock @@ -74,11 +74,11 @@ ] }, "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "lastModified": 1749398372, + "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", "type": "github" }, "original": { @@ -249,11 +249,11 @@ ] }, "locked": { - "lastModified": 1747284884, - "narHash": "sha256-lTSKhRrassMcJ1ZsuUVunyl/F04vvCKY80HB/4rvvm4=", + "lastModified": 1748000383, + "narHash": "sha256-EaAJhwfJGBncgIV/0NlJviid2DP93cTMc9h0q6P6xXk=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "7168f6002a6b48a9b6151e1e97e974a0722ecfdc", + "rev": "231726642197817d20310b9d39dd4afb9e899489", "type": "github" }, "original": { @@ -281,11 +281,11 @@ "mini-nvim": { "flake": false, "locked": { - "lastModified": 1747734615, - "narHash": "sha256-Nym+lyfEkAdnEmUT6s8ejd+hTIMvC6tMUzJyZLmp6cg=", + "lastModified": 1749301386, + "narHash": "sha256-U6QkqrvmxEERLgrc3roBxMuNc8Djuxk/wOuH/Hwmu1M=", "owner": "echasnovski", "repo": "mini.nvim", - "rev": "94cae4660a8b2d95dbbd56e1fbc6fcfa2716d152", + "rev": "35e1767f4cd7dde51256eabae7349a5283a43cba", "type": "github" }, "original": { @@ -305,11 +305,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1747786187, - "narHash": "sha256-9SSsln1nd3SnECH7I466UzLZ2luJS1phTOYG0ehRAxQ=", + "lastModified": 1749625230, + "narHash": "sha256-o65mGvIz4+5gqyFG0gLK6BqIVRGqxl0AiY6Xy5De+Qk=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "1709adcc65a1779b6513db3470dad257de7c24ae", + "rev": "34f4b17993e9ec8e8a5c8a1cec5847b4520b3d26", "type": "github" }, "original": { @@ -321,11 +321,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1747760768, - "narHash": "sha256-5oDiP8Yn93692CUEH81LJbZxPIprIozLHdkFt5N9Np4=", + "lastModified": 1749599615, + "narHash": "sha256-7A4cafY420gsxdCA0yZhlOMjBSLzu3156QFEeAmcwrk=", "owner": "neovim", "repo": "neovim", - "rev": "cd9d8469b22cedeb5ccad3def6e3cfee2877577f", + "rev": "79ce71430fe5480e37a150522e2c6c925f5d0e66", "type": "github" }, "original": { @@ -336,11 +336,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1747728033, - "narHash": "sha256-NnXFQu7g4LnvPIPfJmBuZF7LFy/fey2g2+LCzjQhTUk=", + "lastModified": 1749523198, + "narHash": "sha256-How2kQw0psKmCdXgojc95Sf3K5maHB3qfINxTZFCAPM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2f9173bde1d3fbf1ad26ff6d52f952f9e9da52ea", + "rev": "cdc68935eba9f86d155585fdf6f17af6824f38ac", "type": "github" }, "original": { @@ -380,11 +380,11 @@ }, "nixpkgs-uns": { "locked": { - "lastModified": 1747744144, - "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", + "lastModified": 1749285348, + "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", + "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f", "type": "github" }, "original": { @@ -396,11 +396,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1747894227, - "narHash": "sha256-iMzxxhwF4ZqRDrMl7/kKPCiO0uWpnGywJ+oMPEvnP/Y=", + "lastModified": 1749625384, + "narHash": "sha256-DjWYlOFrddI5t5w4mimZJo1RGp2qxhcvTYWSZjx9+3I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ebcc1d6f281ceef7854bea032b65a5609ee45fad", + "rev": "ab301cc663dc2db37c53933b33d1070cb72934ec", "type": "github" }, "original": { @@ -443,11 +443,11 @@ ] }, "locked": { - "lastModified": 1747469671, - "narHash": "sha256-bo1ptiFoNqm6m1B2iAhJmWCBmqveLVvxom6xKmtuzjg=", + "lastModified": 1749194973, + "narHash": "sha256-eEy8cuS0mZ2j/r/FE0/LYBSBcIs/MKOIVakwHVuqTfk=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "ab0378b61b0d85e73a8ab05d5c6029b5bd58c9fb", + "rev": "a05be418a1af1198ca0f63facb13c985db4cb3c5", "type": "github" }, "original": { diff --git a/nix/neovim-overlay.nix b/nix/neovim-overlay.nix index 70217b8..3374c5a 100644 --- a/nix/neovim-overlay.nix +++ b/nix/neovim-overlay.nix @@ -17,7 +17,6 @@ with final.pkgs.lib; let blink-cmp blink-copilot blink-ripgrep-nvim - codecompanion-nvim conform-nvim copilot-lua diffview-nvim @@ -25,7 +24,6 @@ with final.pkgs.lib; let friendly-snippets lazy-nvim mini-nvim-git - neogit nightfox-nvim nvim-lint nvim-lspconfig diff --git a/nvim/lua/config/init.lua b/nvim/lua/config/init.lua index e2e11a9..9d7e6c5 100644 --- a/nvim/lua/config/init.lua +++ b/nvim/lua/config/init.lua @@ -58,6 +58,7 @@ vim.diagnostic.config { } -- random keymaps +vim.keymap.set({ 'v', 'i' }, 'wq', 'l', { noremap = true, silent = true }) vim.keymap.set('n', '', vim.cmd.bnext, { noremap = true, silent = true }) vim.keymap.set('n', '', vim.cmd.bprev, { noremap = true, silent = true }) vim.keymap.set('v', '<', 'as', - 'CodeCompanionChat Add', - noremap = true, - mode = { 'n', 'v' }, - desc = 'Copilot chat add selection', - }, - { - 'aa', - 'CodeCompanionActions', - noremap = true, - mode = { 'n', 'v' }, - desc = 'Copilot inline', - }, - }, - }, } diff --git a/nvim/lua/plugins/mini.lua b/nvim/lua/plugins/mini.lua index 78cbdf1..ee54407 100644 --- a/nvim/lua/plugins/mini.lua +++ b/nvim/lua/plugins/mini.lua @@ -92,9 +92,9 @@ return { '%<', -- Mark general truncate point { hl = 'MiniStatuslineFilename', strings = { '' } }, '%=', -- End left alignment - { hl = 'MiniStatusDevinfo', strings = { diff, diagnostics, lsp } }, + { hl = 'MiniStatusDevinfo', strings = { diff, diagnostics, lsp } }, { hl = 'MiniStatuslineFilename', strings = { search } }, - { hl = mode_hl, strings = { mode } }, + { hl = mode_hl, strings = { mode } }, } end, inactive = function() @@ -150,10 +150,10 @@ return { miniclue.gen_clues.registers(), miniclue.gen_clues.windows(), miniclue.gen_clues.z(), - { mode = 'n', keys = 'wj', postkeys = 'w', desc = 'TS Down' }, - { mode = 'n', keys = 'wk', postkeys = 'w', desc = 'TS Up' }, - { mode = 'n', keys = 'wh', postkeys = 'w', desc = 'TS Left' }, - { mode = 'n', keys = 'wl', postkeys = 'w', desc = 'TS Right' }, + { mode = 'n', keys = 'wj', postkeys = 'w', desc = 'TS Down' }, + { mode = 'n', keys = 'wk', postkeys = 'w', desc = 'TS Up' }, + { mode = 'n', keys = 'wh', postkeys = 'w', desc = 'TS Left' }, + { mode = 'n', keys = 'wl', postkeys = 'w', desc = 'TS Right' }, { mode = 'n', keys = 'w', postkeys = 'w', desc = 'Swap TS Down' }, { mode = 'n', keys = 'w', postkeys = 'w', desc = 'Swap TS Up' }, { mode = 'n', keys = 'w', postkeys = 'w', desc = 'Swap TS Left' }, @@ -179,9 +179,8 @@ return { vim.keymap.set('n', 'nm', map.toggle, { noremap = true, desc = 'minimap open' }) local multi = require('mini.keymap').map_multistep - local combo = require('mini.keymap').map_combo - combo({ 'v', 'i', 's' }, 'wq', 'l') - multi({ 'i', 's' }, '', { 'vimsnippet_next', 'increase_indent' }) + multi({ 'i' }, '', { 'minipairs_bs' }) + multi({ 'i', 's' }, '', { 'blink_accept', 'vimsnippet_next', 'increase_indent' }) multi({ 'i', 's' }, '', { 'vimsnippet_prev', 'decrease_indent' }) end) end, diff --git a/nvim/lua/plugins/misc.lua b/nvim/lua/plugins/misc.lua index e09d7d1..b2f4e71 100644 --- a/nvim/lua/plugins/misc.lua +++ b/nvim/lua/plugins/misc.lua @@ -37,7 +37,7 @@ return { 'MeanderingProgrammer/render-markdown.nvim', event = 'VeryLazy', opts = { - file_types = { 'markdown', 'codecompanion' }, + file_types = { 'markdown' }, }, }, { @@ -77,24 +77,6 @@ return { }, }, }, - { - 'NeogitOrg/neogit', - opts = { - disable_builtin_notifications = true, - integrations = { - diffview = true, - }, - }, - keys = { - { - 'ng', - function() - require('neogit').open() - end, - { noremap = true, silent = true, desc = 'Neogit' }, - }, - }, - }, { 'EdenEast/nightfox.nvim', lazy = false, diff --git a/nvim/lua/plugins/treesitter.lua b/nvim/lua/plugins/treesitter.lua index 867b9c2..5875a1e 100644 --- a/nvim/lua/plugins/treesitter.lua +++ b/nvim/lua/plugins/treesitter.lua @@ -78,7 +78,6 @@ return { incremental_selection = { enable = true, keymaps = { - init_selection = '', node_incremental = 'v', node_decremental = '', },