diff --git a/nvim/after/plugin/config.lua b/nvim/after/plugin/config.lua new file mode 100644 index 0000000..843c6a1 --- /dev/null +++ b/nvim/after/plugin/config.lua @@ -0,0 +1,3 @@ +-- vim.cmd("colorscheme kanagawa-lotus") +-- vim.cmd("colorscheme kanagawa-lotus") +-- vim.cmd("colorscheme oxycarbon") diff --git a/nvim/bookmarks.db.json b/nvim/bookmarks.db.json deleted file mode 100644 index b89f347..0000000 --- a/nvim/bookmarks.db.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "bookmark_lists": [ - { - "bookmarks": [], - "id": "2024091613040340996507", - "is_active": true, - "name": "Default" - } - ], - "projects": [ - { - "name": "mercurius", - "path": "/Users/kacper.marzecki@schibsted.com/git/mercurius" - }, - { - "name": "tethys", - "path": "/Users/kacper.marzecki@schibsted.com/git/tethys" - } - ] -} diff --git a/nvim/bookmarks.db.json.backup b/nvim/bookmarks.db.json.backup deleted file mode 100644 index 0c371ff..0000000 --- a/nvim/bookmarks.db.json.backup +++ /dev/null @@ -1,32 +0,0 @@ -{ - "bookmark_lists": [ - { - "bookmarks": [ - { - "content": " provider_name: \"aws\"", - "created_at": 1726484642, - "githash": "3f5c155", - "id": 1726484642, - "location": { - "col": 2, - "line": 74, - "path": "/Users/kacper.marzecki@schibsted.com/git/mercurius/lib/mercurius/hermes/jobs/send_ses_email.ex", - "project_name": "mercurius", - "relative_path": "lib/mercurius/hermes/jobs/send_ses_email.ex" - }, - "name": "send SES", - "visited_at": 1726484642 - } - ], - "id": "2024091613040340996507", - "is_active": true, - "name": "Default" - } - ], - "projects": [ - { - "name": "mercurius", - "path": "/Users/kacper.marzecki@schibsted.com/git/mercurius" - } - ] -} diff --git a/nvim/init.lua b/nvim/init.lua index c924cd3..2514f9e 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -1,6 +1,2 @@ -- bootstrap lazy.nvim, LazyVim and your plugins require("config.lazy") --- light, sunny theme :) --- vim.cmd("colorscheme kanagawa-lotus") --- darker one -vim.cmd("colorscheme kanagawa") diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index f2bf7dc..f5121d4 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -1,75 +1,66 @@ { - "LazyVim": { "branch": "main", "commit": "3f034d0a7f58031123300309f2efd3bb0356ee21" }, - "avante.nvim": { "branch": "main", "commit": "04336913b32f66f45b20a6ba2f033dd742f04374" }, + "LazyVim": { "branch": "main", "commit": "dc1ffa5bcb66f46284f91a8593dda5c7c54a1824" }, "blink-cmp-copilot": { "branch": "main", "commit": "439cff78780c033aa23cf061d7315314b347e3c1" }, - "blink-copilot": { "branch": "main", "commit": "71102fe2fa1616353f8cb315bb8b85db0812a218" }, - "blink.cmp": { "branch": "main", "commit": "cb5e346d9e0efa7a3eee7fd4da0b690c48d2a98e" }, + "blink-copilot": { "branch": "main", "commit": "5d35fd07fcc148be20442da1bdd2407e03263d7d" }, + "blink.cmp": { "branch": "main", "commit": "327fff91fe6af358e990be7be1ec8b78037d2138" }, "bookmarks.nvim": { "branch": "main", "commit": "0540d52ba64d0ec7677ec1ef14b3624c95a2aaba" }, "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" }, - "catppuccin": { "branch": "main", "commit": "5b5e3aef9ad7af84f463d17b5479f06b87d5c429" }, - "conform.nvim": { "branch": "master", "commit": "eebc724d12c5579d733d1f801386e0ceb909d001" }, - "copilot.lua": { "branch": "master", "commit": "d1b6e6ced09fbe15b96741de5fa84e89479f3144" }, + "catppuccin": { "branch": "main", "commit": "e79d09fa347b367e0e7f693bfe87dba932a8cbd1" }, + "codecompanion.nvim": { "branch": "main", "commit": "946e18627271e008635d53f96a56af459ebb40da" }, + "conform.nvim": { "branch": "master", "commit": "fbcb4fa7f34bfea9be702ffff481a8e336ebf6ed" }, + "copilot.lua": { "branch": "master", "commit": "30b98a4c25d6152c14084020f703b6d56e1f1122" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, - "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" }, - "flit.nvim": { "branch": "main", "commit": "1ef72de6a02458d31b10039372c8a15ab8989e0d" }, - "fzf-lua": { "branch": "main", "commit": "47b85a25c0c0b2c20b4e75199ed01bb71e7814f5" }, - "gp.nvim": { "branch": "main", "commit": "b32327fe4ee65d24acbab0f645747c113eb935c0" }, - "grug-far.nvim": { "branch": "main", "commit": "082f97122dd59d816a9a7b676d2b2f86a8ab6ed9" }, + "flash.nvim": { "branch": "main", "commit": "b68bda044d68e4026c4e1ec6df3c5afd7eb8e341" }, + "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, + "fzf-lua": { "branch": "main", "commit": "c0c0926eee09f2e7868e5b72cb66decc0cb13aca" }, + "gp.nvim": { "branch": "main", "commit": "c37f154b97690c4925fef4e35ffdbf2c844b5f4e" }, + "grug-far.nvim": { "branch": "main", "commit": "48f9afb684de1c191af7bed96bc1db85ba33f6a4" }, "harpoon": { "branch": "harpoon2", "commit": "ed1f853847ffd04b2b61c314865665e1dadf22c7" }, - "img-clip.nvim": { "branch": "main", "commit": "08a02e14c8c0d42fa7a92c30a98fd04d6993b35d" }, - "inc-rename.nvim": { "branch": "main", "commit": "87ebe7bee0b83d3b6e4f1494c74abed21b318175" }, - "kanagawa.nvim": { "branch": "master", "commit": "cc3b68b08e6a0cb6e6bf9944932940091e49bb83" }, - "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, - "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, - "leap.nvim": { "branch": "main", "commit": "346a16ef942635a8ca5ff92e603d07e7e8be6cbe" }, - "lualine.nvim": { "branch": "master", "commit": "1ba400068bc178eb698b96ecfde82db59e7a7b8f" }, + "inc-rename.nvim": { "branch": "main", "commit": "7c79416330364976955ec8059fe3832b72ee1271" }, + "kanagawa.nvim": { "branch": "master", "commit": "27f1e119f3a7e6d11d435a59e3262e6affda1f83" }, + "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, + "lazydev.nvim": { "branch": "main", "commit": "258d2a5ef4a3e3d6d9ba9da72c9725c53e9afcbd" }, + "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" }, "luarocks.nvim": { "branch": "main", "commit": "1db9093915eb16ba2473cfb8d343ace5ee04130a" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, - "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, - "mini.ai": { "branch": "main", "commit": "e139eb1101beb0250fea322f8c07a42f0f175688" }, - "mini.comment": { "branch": "main", "commit": "fb867a9246f9b892cf51a8c84a3f8479cdf1558c" }, - "mini.diff": { "branch": "main", "commit": "7e268d0241255abaa07b8aa0ddff028f7315fe21" }, - "mini.icons": { "branch": "main", "commit": "397ed3807e96b59709ef3292f0a3e253d5c1dc0a" }, - "mini.indentscope": { "branch": "main", "commit": "8af2569a7d7fd37300dfa760e44e71efbbf322fd" }, - "mini.move": { "branch": "main", "commit": "4fe4a855fee53c66b0f3255a4b54ddc2ae6b308c" }, - "mini.pairs": { "branch": "main", "commit": "69864a2efb36c030877421634487fd90db1e4298" }, - "mini.pick": { "branch": "main", "commit": "f95dc0bb9db7124f55b225f544a8719476c64314" }, - "mini.surround": { "branch": "main", "commit": "5aab42fcdcf31fa010f012771eda5631c077840a" }, - "neo-tree.nvim": { "branch": "main", "commit": "5224467c6a49a6c77b8a8333f4d9af0abc788e10" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "6bdb14f230de0904229ec367b410fb817e59b072" }, + "mason.nvim": { "branch": "main", "commit": "ad7146aa61dcaeb54fa900144d768f040090bff0" }, + "mini.ai": { "branch": "main", "commit": "11c57180bc9084089206e211ac7aa598bedc9673" }, + "mini.comment": { "branch": "main", "commit": "c40bc46e72f41d3db265f6d86deb3dc259c0985d" }, + "mini.diff": { "branch": "main", "commit": "a2df2a9a485328c20252b7cadb11feb717020e45" }, + "mini.hues": { "branch": "main", "commit": "f1fa8ad34788eada276f0b8a41d96a15622933de" }, + "mini.icons": { "branch": "main", "commit": "284798619aed9f4c1ac1b9417b9a5e3b4b85ef3a" }, + "mini.indentscope": { "branch": "main", "commit": "e9fa0714fc753e1e737940577904e553ee340903" }, + "mini.move": { "branch": "main", "commit": "f33406ae7d95b931c6a0d3ba11e50983fe800afb" }, + "mini.pairs": { "branch": "main", "commit": "b9aada8c0e59f2b938e98fbf4eae0799eba96ad9" }, + "mini.surround": { "branch": "main", "commit": "fc6fbc319b2d686c524d71c7feda20f71af15b8e" }, + "neo-tree.nvim": { "branch": "main", "commit": "0c29e3795b9105d68390d2fdfd430409ef8c5d65" }, "nightfox.nvim": { "branch": "main", "commit": "ba47d4b4c5ec308718641ba7402c143836f35aa9" }, "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" }, - "note.nvim": { "branch": "main", "commit": "7b1089ef0b6f31daa6dc125e4f4d5b27d6e2b5b6" }, - "nui.nvim": { "branch": "main", "commit": "8d3bce9764e627b62b07424e0df77f680d47ffdb" }, - "nvim-lint": { "branch": "master", "commit": "e7b4ffa6ab763af012e38b21af2c9159f10d2d33" }, - "nvim-lspconfig": { "branch": "master", "commit": "94dda50b2d9a29d0b76562a9027029538840e2d7" }, - "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" }, - "nvim-parinfer": { "branch": "master", "commit": "5ca09287ab3f4144f78ff7977fabc27466f71044" }, - "nvim-spider": { "branch": "main", "commit": "508b3504a350fb9a93bd0b7c0d41b8b5fc732b5e" }, - "nvim-treesitter": { "branch": "master", "commit": "bfb50de9cb0673a3bff620d881f690fb7e0d1328" }, - "nvim-treesitter-context": { "branch": "master", "commit": "439789a9a8df9639ecd749bb3286b77117024a6f" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "698b5f805722254bca3c509591c1806d268b6c2f" }, - "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, + "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, + "nvim-lint": { "branch": "master", "commit": "9da1fb942dd0668d5182f9c8dee801b9c190e2bb" }, + "nvim-lspconfig": { "branch": "master", "commit": "e688b486fe9291f151eae7e5c0b5a5c4ef980847" }, + "nvim-navic": { "branch": "master", "commit": "f887d794a0f4594882814d7780980a949200a238" }, + "nvim-parinfer": { "branch": "master", "commit": "3968e669d9f02589aa311d33cb475b16b27c5fbb" }, + "nvim-spider": { "branch": "main", "commit": "220efa63c20830a9bf0593a57366b96dd5790212" }, + "nvim-treesitter": { "branch": "main", "commit": "3ab4f2d2d20be55874e2eb575145c6928d7d7d0e" }, + "nvim-treesitter-context": { "branch": "master", "commit": "41847d3dafb5004464708a3db06b14f12bde548a" }, + "nvim-treesitter-textobjects": { "branch": "main", "commit": "1b2d85d3de6114c4bcea89ffb2cd1ce9e3a19931" }, + "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f" }, - "nvim-web-devicons": { "branch": "master", "commit": "57dfa947cc88cdf1baa2c7e13ed31edddd8fb1d1" }, - "outline.nvim": { "branch": "main", "commit": "ae473fb51b7b6086de0876328c81a63f9c3ecfef" }, - "overseer.nvim": { "branch": "master", "commit": "72c68aab0358c92f451168b704c411c4a3e3410e" }, - "oxocarbon.nvim": { "branch": "main", "commit": "004777819ba294423b638a35a75c9f0c7be758ed" }, + "outline.nvim": { "branch": "main", "commit": "6b62f73a6bf317531d15a7ae1b724e85485d8148" }, + "overseer.nvim": { "branch": "master", "commit": "fe7b2f9ba263e150ab36474dfc810217b8cf7400" }, + "oxocarbon.nvim": { "branch": "main", "commit": "9f85f6090322f39b11ae04a343d4eb9d12a86897" }, "persistence.nvim": { "branch": "main", "commit": "166a79a55bfa7a4db3e26fc031b4d92af71d0b51" }, - "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, - "render-markdown.nvim": { "branch": "main", "commit": "05e6a6d119f90b99829ecb7eb85428a226c0c05f" }, - "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" }, - "sniprun": { "branch": "master", "commit": "151ada2c984aee1feb45c7e3c2abb19f597ecbd0" }, - "telescope.nvim": { "branch": "master", "commit": "a4ed82509cecc56df1c7138920a1aeaf246c0ac5" }, - "themery.nvim": { "branch": "main", "commit": "bfa58f4b279d21cb515b28023e1b68ec908584b2" }, - "themify.nvim": { "branch": "main", "commit": "092ba515e4d0d96a91494ef9cbed7d0517b2bd80" }, + "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, + "snacks.nvim": { "branch": "main", "commit": "bfe8c26dbd83f7c4fbc222787552e29b4eccfcc0" }, + "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" }, "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" }, - "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" }, - "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" }, + "tokyonight.nvim": { "branch": "main", "commit": "4d159616aee17796c2c94d2f5f87d2ee1a3f67c7" }, + "trouble.nvim": { "branch": "main", "commit": "f176232e7759c4f8abd923c21e3e5a5c76cd6837" }, "ts-comments.nvim": { "branch": "main", "commit": "1bd9d0ba1d8b336c3db50692ffd0955fe1bb9f0c" }, - "vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" }, - "vscode.nvim": { "branch": "main", "commit": "49d6014ba151fc6cc585b8d5f057ca7839077bf8" }, - "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }, - "yanky.nvim": { "branch": "main", "commit": "98b9c21d3c06d79f68fd9d471dcc28fc6d2d72ef" }, - "zen-mode.nvim": { "branch": "main", "commit": "863f150ca321b3dd8aa1a2b69b5f411a220e144f" } + "vscode.nvim": { "branch": "main", "commit": "cb9df0873c10a21d05362455ae3bb355eadcef6b" }, + "which-key.nvim": { "branch": "main", "commit": "904308e6885bbb7b60714c80ab3daf0c071c1492" }, + "yanky.nvim": { "branch": "main", "commit": "04775cc6e10ef038c397c407bc17f00a2f52b378" }, + "zen-mode.nvim": { "branch": "main", "commit": "dfcb72a2dfeedc5342b2ee3a68c83243d682ba3c" } } diff --git a/nvim/lazy-lock.json.bak b/nvim/lazy-lock.json.bak new file mode 100644 index 0000000..2c1ecee --- /dev/null +++ b/nvim/lazy-lock.json.bak @@ -0,0 +1,73 @@ +{ + "LazyVim": { "branch": "main", "commit": "3f034d0a7f58031123300309f2efd3bb0356ee21" }, + "avante.nvim": { "branch": "main", "commit": "87ea15bb94f0707a5fd154f11f5ed419c17392d1" }, + "blink-cmp-copilot": { "branch": "main", "commit": "439cff78780c033aa23cf061d7315314b347e3c1" }, + "blink-copilot": { "branch": "main", "commit": "71102fe2fa1616353f8cb315bb8b85db0812a218" }, + "blink.cmp": { "branch": "main", "commit": "cb5e346d9e0efa7a3eee7fd4da0b690c48d2a98e" }, + "bookmarks.nvim": { "branch": "main", "commit": "0540d52ba64d0ec7677ec1ef14b3624c95a2aaba" }, + "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" }, + "catppuccin": { "branch": "main", "commit": "5b5e3aef9ad7af84f463d17b5479f06b87d5c429" }, + "conform.nvim": { "branch": "master", "commit": "eebc724d12c5579d733d1f801386e0ceb909d001" }, + "copilot.lua": { "branch": "master", "commit": "1ff8ab7baae8dab4a9e078350624374cff0d5e71" }, + "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, + "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" }, + "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" }, + "fzf-lua": { "branch": "main", "commit": "13ec251a963ed5645dc8ad49e0fde13dac42ec0f" }, + "gp.nvim": { "branch": "main", "commit": "2372d5323c6feaa2e9c19f7ccb537c615d878e18" }, + "grug-far.nvim": { "branch": "main", "commit": "082f97122dd59d816a9a7b676d2b2f86a8ab6ed9" }, + "harpoon": { "branch": "harpoon2", "commit": "ed1f853847ffd04b2b61c314865665e1dadf22c7" }, + "img-clip.nvim": { "branch": "main", "commit": "08a02e14c8c0d42fa7a92c30a98fd04d6993b35d" }, + "inc-rename.nvim": { "branch": "main", "commit": "87ebe7bee0b83d3b6e4f1494c74abed21b318175" }, + "kanagawa.nvim": { "branch": "master", "commit": "cc3b68b08e6a0cb6e6bf9944932940091e49bb83" }, + "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, + "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, + "lualine.nvim": { "branch": "master", "commit": "834a5817f7e2be22a7062620032d49c600c35fab" }, + "luarocks.nvim": { "branch": "main", "commit": "1db9093915eb16ba2473cfb8d343ace5ee04130a" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, + "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, + "mini.ai": { "branch": "main", "commit": "e139eb1101beb0250fea322f8c07a42f0f175688" }, + "mini.comment": { "branch": "main", "commit": "fb867a9246f9b892cf51a8c84a3f8479cdf1558c" }, + "mini.diff": { "branch": "main", "commit": "7e268d0241255abaa07b8aa0ddff028f7315fe21" }, + "mini.icons": { "branch": "main", "commit": "397ed3807e96b59709ef3292f0a3e253d5c1dc0a" }, + "mini.indentscope": { "branch": "main", "commit": "8af2569a7d7fd37300dfa760e44e71efbbf322fd" }, + "mini.move": { "branch": "main", "commit": "4fe4a855fee53c66b0f3255a4b54ddc2ae6b308c" }, + "mini.pairs": { "branch": "main", "commit": "69864a2efb36c030877421634487fd90db1e4298" }, + "mini.pick": { "branch": "main", "commit": "f95dc0bb9db7124f55b225f544a8719476c64314" }, + "mini.surround": { "branch": "main", "commit": "5aab42fcdcf31fa010f012771eda5631c077840a" }, + "neo-tree.nvim": { "branch": "main", "commit": "73d63376352ac731379892e27ac7b3d9449148e3" }, + "nightfox.nvim": { "branch": "main", "commit": "ba47d4b4c5ec308718641ba7402c143836f35aa9" }, + "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" }, + "note.nvim": { "branch": "main", "commit": "7b1089ef0b6f31daa6dc125e4f4d5b27d6e2b5b6" }, + "nui.nvim": { "branch": "main", "commit": "8d3bce9764e627b62b07424e0df77f680d47ffdb" }, + "nvim-lint": { "branch": "master", "commit": "e7b4ffa6ab763af012e38b21af2c9159f10d2d33" }, + "nvim-lspconfig": { "branch": "master", "commit": "9ae789e7450995e4c06ed9f8f74629992d5d28a6" }, + "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" }, + "nvim-parinfer": { "branch": "master", "commit": "5ca09287ab3f4144f78ff7977fabc27466f71044" }, + "nvim-spider": { "branch": "main", "commit": "4bd3221d165da334e57c8e9f38978e0c6f3a1742" }, + "nvim-treesitter": { "branch": "master", "commit": "0e21ee8df6235511c02bab4a5b391d18e165a58d" }, + "nvim-treesitter-context": { "branch": "master", "commit": "93b29a32d5f4be10e39226c6b796f28d68a8b483" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "698b5f805722254bca3c509591c1806d268b6c2f" }, + "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, + "nvim-ts-context-commentstring": { "branch": "main", "commit": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f" }, + "nvim-web-devicons": { "branch": "master", "commit": "57dfa947cc88cdf1baa2c7e13ed31edddd8fb1d1" }, + "outline.nvim": { "branch": "main", "commit": "ae473fb51b7b6086de0876328c81a63f9c3ecfef" }, + "overseer.nvim": { "branch": "master", "commit": "72c68aab0358c92f451168b704c411c4a3e3410e" }, + "oxocarbon.nvim": { "branch": "main", "commit": "004777819ba294423b638a35a75c9f0c7be758ed" }, + "persistence.nvim": { "branch": "main", "commit": "166a79a55bfa7a4db3e26fc031b4d92af71d0b51" }, + "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, + "render-markdown.nvim": { "branch": "main", "commit": "d7462eb34ff55106707ea6c4005256dcac57a556" }, + "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" }, + "sniprun": { "branch": "master", "commit": "151ada2c984aee1feb45c7e3c2abb19f597ecbd0" }, + "telescope.nvim": { "branch": "master", "commit": "a4ed82509cecc56df1c7138920a1aeaf246c0ac5" }, + "themery.nvim": { "branch": "main", "commit": "bfa58f4b279d21cb515b28023e1b68ec908584b2" }, + "themify.nvim": { "branch": "main", "commit": "092ba515e4d0d96a91494ef9cbed7d0517b2bd80" }, + "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, + "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" }, + "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" }, + "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" }, + "ts-comments.nvim": { "branch": "main", "commit": "1bd9d0ba1d8b336c3db50692ffd0955fe1bb9f0c" }, + "vscode.nvim": { "branch": "main", "commit": "49d6014ba151fc6cc585b8d5f057ca7839077bf8" }, + "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }, + "yanky.nvim": { "branch": "main", "commit": "98b9c21d3c06d79f68fd9d471dcc28fc6d2d72ef" }, + "zen-mode.nvim": { "branch": "main", "commit": "863f150ca321b3dd8aa1a2b69b5f411a220e144f" } +} diff --git a/nvim/lazyvim.json b/nvim/lazyvim.json index 12d2115..83a91cb 100644 --- a/nvim/lazyvim.json +++ b/nvim/lazyvim.json @@ -1,9 +1,10 @@ { "extras": [ + ], "install_version": 7, "news": { - "NEWS.md": "10960" + "NEWS.md": "11866" }, "version": 8 } diff --git a/nvim/lua/config/autocmds.lua b/nvim/lua/config/autocmds.lua index 6c21a80..12d9ef6 100644 --- a/nvim/lua/config/autocmds.lua +++ b/nvim/lua/config/autocmds.lua @@ -2,173 +2,6 @@ -- Default autocmds that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/autocmds.lua -- Add any additional autocmds here -- --- vim.api.nvim_create_autocmd("copyref", { --- callback = function() --- print("asd") --- end, --- }) --- -local function find_available_port() - local tcp = vim.uv.new_tcp() - if tcp:bind("127.0.0.1", 0) then - local port = tcp:getsockname().port - tcp:close() - - return port - end -end - -local function start_refactorex(port, bufnr) - -- vim.lsp.start({ - -- name = "refactorex", - -- cmd = vim.lsp.rpc.connect("127.0.0.1", port), - -- - -- local port = (spawned and vim.fn.system("pgrep -fla refactorex"):match("beam%.smp.*--port (%d+)")) - -- or find_available_port() - -- - -- if not spawned then - -- vim.uv.spawn("/Users/kacper.marzecki@schibsted.com/installs/refactorex/bin/start", { args = { "--port", port } }) - -- end - -- - -- vim.defer_fn(function() - -- start_refactorex(port, args.buf) - -- end, 3000) - -- end - -- }) -end - --- Function to insert TODO comment with task number -function insert_todo_comment() - -- Get the current branch name - local handle = io.popen("git branch --show-current 2>/dev/null") - local branch - if handle then - branch = handle:read("*a"):match("%S+") - handle:close() - end - - -- Extract the task number (e.g., HS-4798) from the branch name - local task_number = branch and branch:match("HS%-%d+") - - -- If a task number is found, insert the TODO comment - if task_number then - local todo_comment = "# TODO: " .. task_number - vim.api.nvim_put({ todo_comment }, "l", true, true) - else - print("Task number not found in branch name!") - end -end - --- Keybind for inserting TODO comment -vim.api.nvim_set_keymap("n", "t", "lua insert_todo_comment()", { noremap = true, silent = true }) - --- Function to open the notes file in a floating window -function open_notes() - local notes_file = "/Users/kacper.marzecki@schibsted.com/git/notes/todo.md" -- Path to your notes file - - -- -- Read the file content - -- local file_content = {} - -- for line in io.lines(vim.fn.expand(notes_file)) do - -- table.insert(file_content, line) - -- end - -- - -- -- Create a floating window - -- local buf = vim.api.nvim_create_buf(false, true) -- Create a buffer - -- vim.api.nvim_buf_set_lines(buf, 0, -1, false, file_content) -- Set buffer content - -- - -- Check if the file exists, create it if not - if vim.fn.filereadable(notes_file) == 0 then - vim.fn.writefile({}, notes_file) -- Create an empty file - end - - -- Create a buffer linked to the notes file - local buf = vim.fn.bufadd(notes_file) - vim.fn.bufload(buf) - - -- Configure floating window size and position - local width = math.floor(vim.o.columns * 0.8) -- 80% of the screen width - local height = math.floor(vim.o.lines * 0.8) -- 80% of the screen height - local row = math.floor((vim.o.lines - height) / 2) -- Center the window vertically - local col = math.floor((vim.o.columns - width) / 2) -- Center the window horizontally - - -- Create the window - local win = vim.api.nvim_open_win(buf, true, { - relative = "editor", - width = width, - height = height, - row = row, - col = col, - style = "minimal", - border = "rounded", - }) - - -- Enable saving and other standard buffer options - vim.api.nvim_buf_set_option(buf, "modifiable", true) - vim.api.nvim_buf_set_option(buf, "buftype", "") - vim.api.nvim_buf_set_option(buf, "filetype", "markdown") - -- vim.api.nvim_buf_set_option(buf, "fil", "text") - -- Scroll to the end of the file - local last_line = vim.api.nvim_buf_line_count(buf) - vim.api.nvim_win_set_cursor(win, { last_line, 0 }) - - -- Close the popup with 'q' - vim.api.nvim_buf_set_keymap( - buf, - "n", - "q", - "lua vim.api.nvim_win_close(" .. win .. ", true)", - { noremap = true, silent = true } - ) -end - --- Keybind for opening the notes file in a floating window -vim.api.nvim_set_keymap("n", "n", "lua open_notes()", { noremap = true, silent = true }) - --- Define the function to start the timer -function start_timer(duration) - local timer = vim.loop.new_timer() - timer:start( - duration * 60000, - 0, - vim.schedule_wrap(function() - vim.api.nvim_out_write("Time's up!\n") - - os.execute('osascript -e "display notification \\"Times up\\" with title \\"Timer"" ') - end) - ) -end - --- -- Define the function to prompt the user for the desired time --- function choose_timer() --- local times = { 1, 3, 5, 10 } --- local choices = table.concat(times, ", ") --- local choice = vim.fn.input("Choose timer duration (minutes): [" .. choices .. "] ") --- local duration = tonumber(choice) --- if duration and vim.tbl_contains(times, duration) then --- start_timer(duration) --- else --- vim.api.nvim_out_write("Invalid choice. Please choose from: " .. choices .. "\n") --- end --- end --- --- --- Define the function to prompt the user for the desired time using fzf-lua -function choose_timer() - local times = { 1, 3, 5, 10 } - require("fzf-lua").fzf_exec(times, { - prompt = "Choose timer duration (minutes): ", - actions = { - ["default"] = function(selected) - local duration = tonumber(selected[1]) - if duration then - start_timer(duration) - else - vim.api.nvim_out_write("Invalid choice. Please choose a valid duration.\n") - end - end, - }, - }) -end -- Set the keybind to choose the timer duration vim.api.nvim_set_keymap("n", "T", "lua choose_timer()", { noremap = true, silent = true }) diff --git a/nvim/lua/config/keymaps.lua b/nvim/lua/config/keymaps.lua index ed1bfa7..3f73c2b 100644 --- a/nvim/lua/config/keymaps.lua +++ b/nvim/lua/config/keymaps.lua @@ -8,27 +8,11 @@ vim.keymap.set({ "n", "o", "x" }, "w", "lua require('spider').motion('w')lua require('spider').motion('e')", { desc = "Spider-e" }) vim.keymap.set({ "n", "o", "x" }, "b", "lua require('spider').motion('b')", { desc = "Spider-b" }) vim.keymap.set({ "n", "o", "x" }, "C-D", "", { desc = "page down" }) --- :SnipRun lua require’sniprun’.run() SnipRun --- (normal node) lua require’sniprun’.run(‘n’) SnipRunOperator --- :’<,’>SnipRun (visual mode) lua require’sniprun’.run(‘v’) SnipRun --- :SnipInfo lua require’sniprun’.info() SnipInfo --- :SnipReset lua require’sniprun’.reset() SnipReset --- :SnipReplMemoryClean lua require’sniprun’.clear_repl() SnipReplMemoryClean --- :SnipClose lua require’sniprun.display’.close_all() SnipClose --- :SnipLive lua require’sniprun.live_mode’.toggle() SnipLive --- vim.keymap.set({ "n", "x" }, "r", "SnipRun", { desc = "SnipRun" }) --- vim.keymap.set({ "v" }, "r", "'<,'>SnipRun", { desc = "SnipRun v" }) vim.api.nvim_set_keymap("v", "r", "SnipRun", { silent = true }) vim.api.nvim_set_keymap("n", "r", "SnipRun", { silent = true }) vim.api.nvim_set_keymap("n", "f", "SnipRunOperator", { silent = true }) --- AI - --- vim.keymap.set({ "n", "o", "x" }, "ac", "GpChatToggle split", { desc = "toggle GP chat" }) --- vim.keymap.set({ "n", "o", "x" }, "aa", "GpAppend", { desc = "Add with Copilot" }) --- vim.keymap.set("n", "ap", ":GpPrepend", { noremap = true, silent = true, desc = "Prepend with copilot" }) --- vim.keymap.set({ "v" }, "ar", "'<,'>GpRewrite", { desc = "replace with Copilot" }) local bm = require("bookmarks") local map = vim.keymap.set map("n", "mm", bm.bookmark_toggle, { desc = "Toggle bookmark" }) @@ -53,39 +37,11 @@ map("n", "ff", "FzfLua", { desc = "FZF commands" }) map("i", "", function() require("copilot.suggestion").accept() end, { desc = "Accept Copilot suggestion" }) --- map("i", "M-m", "LLMSuggestion", { desc = "LLM Suggestion" }) --- map("n", "mm", bm.bookmark_toggle) -- add or remove bookmark at current line --- map("n", "mi", bm.bookmark_ann) -- add or edit mark annotation at current line --- map("n", "mc", bm.bookmark_clean) -- clean all marks in local buffer --- map("n", "mn", bm.bookmark_next) -- jump to next mark in local buffer --- map("n", "mp", bm.bookmark_prev) -- jump to previous mark in local buffer --- map("n", "ml", "Telescope bookmarks list") -- show marked file list in quickfix window --- map("n", "mx", bm.bookmark_clear_all) -- removes all bookmarks --- -- floating terminal --- map("n", "fT", function() Snacks.terminal() end, { desc = "Terminal (cwd)" }) --- map("n", "ft", function() Snacks.terminal(nil, { cwd = LazyVim.root() }) end, { desc = "Terminal (Root Dir)" }) --- map("n", "", function() Snacks.terminal(nil, { cwd = LazyVim.root() }) end, { desc = "Terminal (Root Dir)" }) --- map("n", "", function() Snacks.terminal(nil, { cwd = LazyVim.root() }) end, { desc = "which_key_ignore" }) --- -- -- Terminal Mappings -- map("t", "", "close", { desc = "Hide Terminal" }) -- map("t", "", "close", { desc = "which_key_ignore" }) map("n", "qw", "wq", { desc = "save & quit" }) --- local td_cli = require("toggleterm.terminal").Terminal:new({ --- cmd = "node /home/omnissiah/git/td/dist/cli.js", --- direction = "float", --- close_on_exit = false, --- hidden = true, --- on_open = function(term) --- vim.api.nvim_buf_set_keymap(term.bufnr, "n", "q", "close", { noremap = true, silent = true }) --- vim.api.nvim_buf_set_keymap(term.bufnr, "t", "", ":close", { noremap = true, silent = true }) --- vim.api.nvim_buf_set_keymap(term.bufnr, "t", "", "close", { noremap = true, silent = true }) --- end, --- }) --- vim.keymap.set("t", "\\", function() --- td_cli:toggle() --- end, { desc = "Toggle TD CLI floating terminal" }) vim.keymap.set("n", "\\", function() vim.cmd("!tmux-td") end, { desc = "Toggle TD CLI floating terminal and run tmux-td" }) @@ -116,7 +72,6 @@ local function command(cmd) end end --- Key maps require("which-key").add({ -- { "g", group = "Git" }, { "gvf", diffOpenFileHistory, desc = "Open DiffView on Files" }, @@ -154,5 +109,135 @@ map("n", "agr", "GpChatRespond", { desc = "gp chat respond" }) -- JSON FORMAT map("n", "cjf", "%!jq .", { desc = "Json Format" }) --- map s to / -map("n", "s", "/") +local function jump_to_file_line() + local line = vim.api.nvim_get_current_line() + local file, linenum = string.match(line, "([^:%s]+):(%d+)") + if file and linenum then + vim.cmd("edit " .. file) + vim.cmd(linenum) + else + print("No valid file:line pattern found on the current line.") + end +end + +-- Map it to j (typically \j) +vim.keymap.set("n", "j", jump_to_file_line, { noremap = true, silent = true, desc = "Jump to file:line" }) + +-- Function to insert TODO comment with task number +function insert_todo_comment() + -- Get the current branch name + local handle = io.popen("git branch --show-current 2>/dev/null") + local branch + if handle then + branch = handle:read("*a"):match("%S+") + handle:close() + end + + -- Extract the task number (e.g., HS-4798) from the branch name + local task_number = branch and branch:match("HS%-%d+") + + -- If a task number is found, insert the TODO comment + if task_number then + local todo_comment = "# TODO: " .. task_number + vim.api.nvim_put({ todo_comment }, "l", true, true) + else + print("Task number not found in branch name!") + end +end + +-- Keybind for inserting TODO comment +vim.api.nvim_set_keymap("n", "t", "lua insert_todo_comment()", { noremap = true, silent = true }) + +-- Function to open the notes file in a floating window +function open_notes() + local notes_file = "/Users/kacper.marzecki@m10s.io/git/notes/todo.md" -- Path to your notes file + + -- -- Read the file content + -- local file_content = {} + -- for line in io.lines(vim.fn.expand(notes_file)) do + -- table.insert(file_content, line) + -- end + -- + -- -- Create a floating window + -- local buf = vim.api.nvim_create_buf(false, true) -- Create a buffer + -- vim.api.nvim_buf_set_lines(buf, 0, -1, false, file_content) -- Set buffer content + -- + -- Check if the file exists, create it if not + if vim.fn.filereadable(notes_file) == 0 then + vim.fn.writefile({}, notes_file) -- Create an empty file + end + + -- Create a buffer linked to the notes file + local buf = vim.fn.bufadd(notes_file) + vim.fn.bufload(buf) + + -- Configure floating window size and position + local width = math.floor(vim.o.columns * 0.8) -- 80% of the screen width + local height = math.floor(vim.o.lines * 0.8) -- 80% of the screen height + local row = math.floor((vim.o.lines - height) / 2) -- Center the window vertically + local col = math.floor((vim.o.columns - width) / 2) -- Center the window horizontally + + -- Create the window + local win = vim.api.nvim_open_win(buf, true, { + relative = "editor", + width = width, + height = height, + row = row, + col = col, + style = "minimal", + border = "rounded", + }) + + -- Enable saving and other standard buffer options + vim.api.nvim_buf_set_option(buf, "modifiable", true) + vim.api.nvim_buf_set_option(buf, "buftype", "") + vim.api.nvim_buf_set_option(buf, "filetype", "markdown") + -- vim.api.nvim_buf_set_option(buf, "fil", "text") + -- Scroll to the end of the file + local last_line = vim.api.nvim_buf_line_count(buf) + vim.api.nvim_win_set_cursor(win, { last_line, 0 }) + + -- Close the popup with 'q' + vim.api.nvim_buf_set_keymap( + buf, + "n", + "q", + "lua vim.api.nvim_win_close(" .. win .. ", true)", + { noremap = true, silent = true } + ) +end + +-- Keybind for opening the notes file in a floating window +vim.api.nvim_set_keymap("n", "n", "lua open_notes()", { noremap = false, silent = true }) + +-- Define the function to start the timer +function start_timer(duration) + local timer = vim.loop.new_timer() + timer:start( + duration * 60000, + 0, + vim.schedule_wrap(function() + vim.api.nvim_out_write("Time's up!\n") + + os.execute('osascript -e "display notification \\"Times up\\" with title \\"Timer"" ') + end) + ) +end + +-- Define the function to prompt the user for the desired time using fzf-lua +function choose_timer() + local times = { 1, 3, 5, 10 } + require("fzf-lua").fzf_exec(times, { + prompt = "Choose timer duration (minutes): ", + actions = { + ["default"] = function(selected) + local duration = tonumber(selected[1]) + if duration then + start_timer(duration) + else + vim.api.nvim_out_write("Invalid choice. Please choose a valid duration.\n") + end + end, + }, + }) +end diff --git a/nvim/lua/config/lazy.lua b/nvim/lua/config/lazy.lua index d4361a1..19be25d 100644 --- a/nvim/lua/config/lazy.lua +++ b/nvim/lua/config/lazy.lua @@ -16,30 +16,28 @@ vim.opt.rtp:prepend(lazypath) local spec = { -- add LazyVim and import its plugins { "LazyVim/LazyVim", import = "lazyvim.plugins" }, - -- { import = "lazyvim.plugins.extras.ui.edgy" }, - { import = "lazyvim.plugins.extras.vscode" }, { import = "lazyvim.plugins.extras.coding.yanky" }, - { import = "lazyvim.plugins.extras.coding.mini-comment" }, { import = "lazyvim.plugins.extras.editor.fzf" }, { import = "lazyvim.plugins.extras.editor.harpoon2" }, - { import = "lazyvim.plugins.extras.ui.mini-indentscope" }, { import = "lazyvim.plugins.extras.ui.treesitter-context" }, { import = "lazyvim.plugins.extras.lang.elixir" }, - { import = "lazyvim.plugins.extras.editor.inc-rename" }, - { import = "lazyvim.plugins.extras.editor.leap" }, + -- show diffs in the sign column { import = "lazyvim.plugins.extras.editor.mini-diff" }, + { import = "lazyvim.plugins.extras.coding.mini-comment" }, + { import = "lazyvim.plugins.extras.ui.mini-indentscope" }, + -- move chunks of code up and down { import = "lazyvim.plugins.extras.editor.mini-move" }, + -- where am i in the code structure ? { import = "lazyvim.plugins.extras.editor.navic" }, + -- outline view for symbols { import = "lazyvim.plugins.extras.editor.outline" }, + -- task runner { import = "lazyvim.plugins.extras.editor.overseer" }, { import = "lazyvim.plugins.extras.coding.mini-surround" }, - { import = "lazyvim.plugins.extras.ai.copilot" }, + -- { import = "lazyvim.plugins.extras.ai.copilot" }, -- { import = "lazyvim.plugins.extras.test.core" }, -- import/override with your plugins } -if vim.loop.os_uname().sysname == "Darwin" then - table.insert(spec, { import = "lazyvim.plugins.extras.ai.copilot" }) -end table.insert(spec, { import = "plugins" }) require("lazy").setup({ spec = spec, @@ -52,7 +50,7 @@ require("lazy").setup({ version = false, -- always use the latest git commit -- version = "*", -- try installing the latest stable version for plugins that support semver }, - install = { colorscheme = { "tokyonight", "habamax" } }, + install = { colorscheme = {} }, checker = { enabled = true, -- check for plugin updates periodically notify = false, -- notify on update diff --git a/nvim/lua/plugins/ai.lua b/nvim/lua/plugins/ai.lua index b90fd5d..f5f1801 100644 --- a/nvim/lua/plugins/ai.lua +++ b/nvim/lua/plugins/ai.lua @@ -1,95 +1,14 @@ return { - -- { - -- "olimorris/codecompanion.nvim", - -- dependencies = { - -- "nvim-lua/plenary.nvim", - -- "nvim-treesitter/nvim-treesitter", - -- }, - -- config = true, - -- }, - -- { - -- "Jacob411/Ollama-Copilot", - -- opts = { - -- model_name = "deepseek-coder:base", - -- stream_suggestion = false, - -- python_command = "python3", - -- filetypes = { "python", "lua", "vim", "markdown" }, - -- ollama_model_opts = { - -- num_predict = 40, - -- temperature = 0.1, - -- }, - -- keymaps = { - -- suggestion = "os", - -- reject = "or", - -- insert_accept = "", - -- }, - -- }, - -- }, - -- { - -- "TabbyML/vim-tabby", - -- lazy = false, - -- dependencies = { - -- "neovim/nvim-lspconfig", - -- }, - -- init = function() - -- vim.g.tabby_agent_start_command = { "npx", "tabby-agent", "--stdio" } - -- vim.g.tabby_inline_completion_trigger = "auto" - -- end, - -- }, - -- { - -- "Saghen/blink.cmp", - -- config = function(_, opts) - -- local additions = { - -- keymap = { - -- -- Manually invoke minuet completion. - -- [""] = require("minuet").make_blink_map(), - -- }, - -- sources = { - -- -- Enable minuet for autocomplete - -- default = { "lsp", "path", "buffer", "snippets", "minuet" }, - -- -- For manual completion only, remove 'minuet' from default - -- providers = { - -- minuet = { - -- name = "minuet", - -- module = "minuet.blink", - -- score_offset = 8, -- Gives minuet higher priority among suggestions - -- }, - -- }, - -- }, - -- -- Recommended to avoid unnecessary request - -- completion = { trigger = { prefetch_on_insert = false } }, - -- } - -- -- TODO merge with users config - -- local merged_with_opts = vim.tbl_deep_extend(opts, additions) - -- require("blink-cmp").setup(merged_with_opts) - -- end, - -- }, - -- { - -- "Davidyz/VectorCode", - -- enabled = vim.loop.os_uname().sysname == "Darwin", - -- version = "*", -- optional, depending on whether you're on nightly or release - -- build = "pipx upgrade vectorcode", -- optional but recommended if you set `version = "*"` - -- dependencies = { "nvim-lua/plenary.nvim" }, - -- }, - -- { - -- "huggingface/llm.nvim", - -- opts = { - -- backend = "ollama", - -- model = "codellama:7b-instruct", - -- url = "http://localhost:11434", -- llm-ls uses "/api/generate" - -- -- cf https://github.com/ollama/ollama/blob/main/docs/api.md#parameters - -- request_body = { - -- -- Modelfile options for the model you use - -- options = { - -- temperature = 0.2, - -- top_p = 0.95, - -- }, - -- }, - -- }, - -- }, + { + "olimorris/codecompanion.nvim", + opts = {}, + dependencies = { + "nvim-lua/plenary.nvim", + }, + }, { "zbirenbaum/copilot.lua", - optional = true, + optional = false, opts = function() require("copilot.api").status = require("copilot.status") return { @@ -103,17 +22,17 @@ return { dismiss = "", }, }, - panel = { - enabled = false, - auto_refresh = true, - keymap = { - jump_next = "", - jump_prev = "", - accept = "", - refresh = "r", - open = "", - }, - }, + -- panel = { + -- enabled = false, + -- auto_refresh = true, + -- keymap = { + -- jump_next = "", + -- jump_prev = "", + -- accept = "", + -- refresh = "r", + -- open = "", + -- }, + -- }, } end, }, diff --git a/nvim/lua/plugins/lsp.lua b/nvim/lua/plugins/lsp.lua new file mode 100644 index 0000000..8ee93fe --- /dev/null +++ b/nvim/lua/plugins/lsp.lua @@ -0,0 +1,24 @@ +-- vim.lsp.config("expert", { +-- cmd = { "expert" }, +-- root_markers = { "mix.exs", ".git" }, +-- filetypes = { "elixir", "eelixir", "heex" }, +-- }) + +-- vim.lsp.enable("expert") +vim.lsp.config["elixir-ls"] = { + cmd = { "elixir-ls" }, + filetypes = { "elixir", "eelixir", "heex" }, + root_markers = { "mix.exs", ".git" }, + -- Specific settings to send to the server. The schema is server-defined. + -- Example: https://raw.githubusercontent.com/LuaLS/vscode-lua/master/setting/schema.json + -- settings = { + -- Lua = { + -- runtime = { + -- version = 'LuaJIT', + -- } + -- } + -- } +} + +vim.lsp.enable("elixir-ls") +return {} diff --git a/nvim/lua/plugins/plugins.lua b/nvim/lua/plugins/plugins.lua index 5e72d47..1b4a53d 100644 --- a/nvim/lua/plugins/plugins.lua +++ b/nvim/lua/plugins/plugins.lua @@ -38,27 +38,6 @@ return { }, }, }, - { - "gsuuon/note.nvim", - lazy = false, - opts = { - -- opts.spaces are note workspace parent directories. - -- These directories contain a `notes` directory which will be created if missing. - -- `/notes` acts as the note root, so for space '~' the note root is `~/notes`. - -- Defaults to { '~' }. - spaces = { - "~/git", - }, - - -- Set keymap = false to disable keymapping - keymap = { - prefix = "n", - }, - }, - cmd = "Note", - ft = "note", - }, - -- { "nvim-neotest/nvim-nio" }, { "nvim-lualine/lualine.nvim" }, -- { -- "nvim-neotest/neotest", @@ -81,18 +60,6 @@ return { }, }, { "chrisgrieser/nvim-spider", lazy = true }, - -- { - -- "hrsh7th/nvim-cmp", - -- opts = { - -- sources = { - -- { name = "copilot", group_index = 2 }, - -- -- Other Sources - -- { name = "nvim_lsp", group_index = 2 }, - -- { name = "path", group_index = 2 }, - -- { name = "luasnip", group_index = 2 }, - -- }, - -- }, - -- }, { "ibhagwan/fzf-lua", opts = { @@ -141,10 +108,6 @@ return { -- indent = { enabled = false }, }, }, - { - "rafamadriz/friendly-snippets", - enabled = false, - }, { "folke/zen-mode.nvim", keys = { @@ -249,49 +212,6 @@ return { { "gpanders/nvim-parinfer", }, - { - "zaldih/themery.nvim", - lazy = false, - opts = { - themes = { - -- "nightfox", - -- "carbonfox", - -- "terafox", - -- "nordfox", - -- "duskfox", - -- "dawnfox", - -- "dayfox", - -- "blue", - -- "darkblue", - -- "blue", - -- "delek", - -- "desert", - -- "elflord", - -- "evening", - -- "industry", - -- "koehler", - -- "morning", - -- "murphy", - -- "pablo", - "peachpuff", - "kanagawa-wave", - "kanagawa-dragon", - "kanagawa-lotus", - -- "ron", - -- "shine", - -- "slate", - -- "torte", - -- "zellner", - "tokyonight", - "tokyonight-night", - "tokyonight-storm", - "tokyonight-day", - "tokyonight-moon", - "oxocarbon", - "vscode", - }, - }, - }, { "EdenEast/nightfox.nvim", opts = { colorblind = { enable = true, @@ -308,19 +228,6 @@ return { }, }, }, - { - "michaelb/sniprun", - branch = "master", - build = "sh install.sh", - config = function() - require("sniprun").setup({ - repl_enable = { "Elixir_original", "elixir" }, - display = { - "TerminalWithCode", - }, - }) - end, - }, { "robitx/gp.nvim", opts = { @@ -356,21 +263,6 @@ return { }, }, }, - { - "lmantw/themify.nvim", - - lazy = false, - priority = 999, - - opts = { - "folke/tokyonight.nvim", - "Yazeed1s/minimal.nvim", - masterBranch("sho-87/kanagawa-paper.nvim"), - masterBranch("ray-x/starry.nvim"), - masterBranch("sainnhe/everforest"), - "default", - }, - }, { "vhyrro/luarocks.nvim", priority = 1000, @@ -380,92 +272,6 @@ return { }, }, }, - -- { - -- "stevearc/oil.nvim", - -- ---@module 'oil' - -- ---@type oil.SetupOpts - -- opts = {}, - -- -- Optional dependencies - -- dependencies = { { "echasnovski/mini.icons", opts = {} } }, - -- -- dependencies = { "nvim-tree/nvim-web-devicons" }, -- use if you prefer nvim-web-devicons - -- -- Lazy loading is not recommended because it is very tricky to make it work correctly in all situations. - -- lazy = false, - -- }, - { - "yetone/avante.nvim", - event = "VeryLazy", - version = false, - -- for macos - opts = { - provider = "copilot", - copilot = { - -- endpoint = "https://api.githubcopilot.com/chat/completions", - model = "claude-3.7-sonnet", - -- timeout = 30000, -- timeout in milliseconds - -- temperature = 0, -- adjust if needed - -- max_tokens = 4096, - -- reasoning_effort = "high" -- only supported for reasoning models (o1, etc.) - }, - }, - -- for linux - -- or { - -- provider = "openai", - -- -- - -- openai = { - -- model = "gpt-4o", - -- }, - -- -- behaviour = { - -- -- --- ... existing behaviours - -- -- enable_cursor_planning_mode = true, -- enable cursor planning mode! - -- -- }, - -- provider = "ollama", - -- ollama = { - -- endpoint = "http://127.0.0.1:11434", -- Note that there is no /v1 at the end. - -- model = "codellama:7b-instruct", - -- }, - -- }, - -- if you want to build from source then do `make BUILD_FROM_SOURCE=true` - build = "make", - -- build = "powershell -ExecutionPolicy Bypass -File Build.ps1 -BuildFromSource false" -- for windows - dependencies = { - "nvim-treesitter/nvim-treesitter", - "stevearc/dressing.nvim", - "nvim-lua/plenary.nvim", - "MunifTanjim/nui.nvim", - --- The below dependencies are optional, - "echasnovski/mini.pick", -- for file_selector provider mini.pick - "nvim-telescope/telescope.nvim", -- for file_selector provider telescope - "hrsh7th/nvim-cmp", -- autocompletion for avante commands and mentions - "ibhagwan/fzf-lua", -- for file_selector provider fzf - "nvim-tree/nvim-web-devicons", -- or echasnovski/mini.icons - "zbirenbaum/copilot.lua", -- for providers='copilot' - { - -- support for image pasting - "HakonHarnes/img-clip.nvim", - event = "VeryLazy", - opts = { - -- recommended settings - default = { - embed_image_as_base64 = false, - prompt_for_file_name = false, - drag_and_drop = { - insert_mode = true, - }, - -- required for Windows users - use_absolute_path = true, - }, - }, - }, - { - -- Make sure to set this up properly if you have lazy=true - "MeanderingProgrammer/render-markdown.nvim", - opts = { - file_types = { "markdown", "Avante" }, - }, - ft = { "markdown", "Avante" }, - }, - }, - }, { "akinsho/toggleterm.nvim", version = "*", config = true }, { "ThePrimeagen/harpoon", diff --git a/nvim/lua/plugins/themes.lua b/nvim/lua/plugins/themes.lua index 03ef60f..f579deb 100644 --- a/nvim/lua/plugins/themes.lua +++ b/nvim/lua/plugins/themes.lua @@ -23,11 +23,25 @@ return { }, }, }, - -- Configure default theme + -- -- Configure default theme + -- { + -- "LazyVim/LazyVim", + -- opts = { + -- colorscheme = "kanagawa-lotus", + -- }, + -- }, + "Mofiqul/vscode.nvim", { - "LazyVim/LazyVim", - opts = { - colorscheme = "kanagawa-lotus", - }, + "nvim-mini/mini.hues", + version = "*", + config = function() + -- the theme I like + require("mini.hues").setup({ background = "#002923", foreground = "#c0c9c7", n_hues = 2 }) + -- ^ the above doesnt load on startup, lets make a toggle function and keymap + local function toggle_hues() + require("mini.hues").setup({ background = "#002923", foreground = "#c0c9c7", accent = "green", n_hues = 2 }) + end + vim.keymap.set("n", "ux", toggle_hues, { desc = "Toggle Hues Theme" }) + end, }, }