diff --git a/flake.lock b/flake.lock index 079315d..7d254e2 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1759772810, - "narHash": "sha256-8/sO67+Q6yNfFD39W5SXQHDbf/tQUHWFhCdxgRRGVCQ=", + "lastModified": 1757952092, + "narHash": "sha256-BcfTLFCU7elUJ2dwyt0iTjxsz/XLh+8ZygDcFwy6xPE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2b78ecc45e163d655c08c9a4cffb4a91c66d0493", + "rev": "fd76dc9e7c68ac7c3941ba2af2bedcd79c5cf4ed", "type": "github" }, "original": { @@ -34,11 +34,11 @@ "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": { "flake": false, "locked": { - "lastModified": 1759715887, - "narHash": "sha256-9wXyswKnUenlZyO/aIy0gr1hF0IhuEJ0UOwvqjDSGjA=", + "lastModified": 1757950300, + "narHash": "sha256-IQTP3jOmFNc2nphV9jdFbJXkmAN5Wj+/PIGmaZ8gP24=", "owner": "CopilotC-Nvim", "repo": "CopilotChat.nvim", - "rev": "92f269971c33a6e2f405da8b14f01cd109b9a3a3", + "rev": "87615648ff4dc852d1cf7ec099f0a7c37b1b2c87", "type": "github" }, "original": { @@ -66,11 +66,11 @@ "nvim_plugin-L3MON4D3/LuaSnip": { "flake": false, "locked": { - "lastModified": 1759157591, - "narHash": "sha256-sicE0/Vgc03X+Qxqlu5CM7NGd+6FE9RGx6OjZUa6Umw=", + "lastModified": 1756990415, + "narHash": "sha256-5FsUVPy8pAiwBh3c+bPDMtypFEHj6qIwGQIo3hjqV4M=", "owner": "L3MON4D3", "repo": "LuaSnip", - "rev": "73813308abc2eaeff2bc0d3f2f79270c491be9d7", + "rev": "21f74f7ba8c49f95f9d7c8293b147c2901dd2d3a", "type": "github" }, "original": { @@ -82,11 +82,11 @@ "nvim_plugin-MeanderingProgrammer/render-markdown.nvim": { "flake": false, "locked": { - "lastModified": 1759424904, - "narHash": "sha256-Smt9v6/XyHUdUiIPyCPQSRvWCeMMhYITSZWd9M7Jlvs=", + "lastModified": 1757910669, + "narHash": "sha256-PWbFcGRbTMRhDJrj+kx73HLduMLOSrAhZTLL2YgrAjQ=", "owner": "MeanderingProgrammer", "repo": "render-markdown.nvim", - "rev": "7e6af36c846017122e07e68803bbf95f3c729ca3", + "rev": "2c6cf127c577712bd29d38f6391b3045c5f0180a", "type": "github" }, "original": { @@ -146,11 +146,11 @@ "nvim_plugin-aznhe21/actions-preview.nvim": { "flake": false, "locked": { - "lastModified": 1759462626, - "narHash": "sha256-YUeWBXxxeurfWBi0PjUi6izqYAvUw9DHmvsuPXm7ohw=", + "lastModified": 1745779150, + "narHash": "sha256-rQjwlu5gQcOvxF72lr9ugPRl0W78wCWGWPhpN1oOMbs=", "owner": "aznhe21", "repo": "actions-preview.nvim", - "rev": "cb938c25edaac38d362555f19244a9cb85d561e8", + "rev": "36513ad213855d497b7dd3391a24d1d75d58e36f", "type": "github" }, "original": { @@ -162,11 +162,11 @@ "nvim_plugin-b0o/schemastore.nvim": { "flake": false, "locked": { - "lastModified": 1759454886, - "narHash": "sha256-T6mWvScsU0IsB3wFre5+TrNIbpQCA0flf7BNrGQIb+M=", + "lastModified": 1757653237, + "narHash": "sha256-94NKAVWPV2sLkGWWL9G07QxA90Ise6tNWaYyKBcS/vI=", "owner": "b0o", "repo": "schemastore.nvim", - "rev": "8e17e50b519ba360bcfd5dfb5843ccac9be500ba", + "rev": "3146720ee3a0c6e2446eedd492fb519d16f2e467", "type": "github" }, "original": { @@ -178,11 +178,11 @@ "nvim_plugin-catppuccin/nvim": { "flake": false, "locked": { - "lastModified": 1759668198, - "narHash": "sha256-WmWGygttH78KajAaIvlwRW47G7UGJuPV0YIfEZkse6I=", + "lastModified": 1755621274, + "narHash": "sha256-o8VLMPriOh4+Ay5Ff0cWQYXjmihdr3x9131bKHHTsQE=", "owner": "catppuccin", "repo": "nvim", - "rev": "e79d09fa347b367e0e7f693bfe87dba932a8cbd1", + "rev": "30fa4d122d9b22ad8b2e0ab1b533c8c26c4dde86", "type": "github" }, "original": { @@ -226,11 +226,11 @@ "nvim_plugin-folke/lazy.nvim": { "flake": false, "locked": { - "lastModified": 1759439283, - "narHash": "sha256-FjQ2rj3BvC8fh60IT0ExrBOmdDLdXFexffef6iKcPFQ=", + "lastModified": 1740511197, + "narHash": "sha256-nQ8PR9DTdzg6Z2rViuVD6Pswc2VvDQwS3uMNgyDh5ls=", "owner": "folke", "repo": "lazy.nvim", - "rev": "59334064f8604ca073791c25dcc5c9698865406e", + "rev": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a", "type": "github" }, "original": { @@ -258,11 +258,11 @@ "nvim_plugin-folke/which-key.nvim": { "flake": false, "locked": { - "lastModified": 1758639622, - "narHash": "sha256-JNkjlv6QpnuaYCAFcBPjV7IavVLzj8QEX/Zi3sbdyrU=", + "lastModified": 1740233407, + "narHash": "sha256-uvMcSduMr7Kd2oUmIOYzvWF4FIl6bZxIYm9FSw/3pCo=", "owner": "folke", "repo": "which-key.nvim", - "rev": "904308e6885bbb7b60714c80ab3daf0c071c1492", + "rev": "370ec46f710e058c9c1646273e6b225acf47cbed", "type": "github" }, "original": { @@ -338,11 +338,11 @@ "nvim_plugin-j-hui/fidget.nvim": { "flake": false, "locked": { - "lastModified": 1758578970, - "narHash": "sha256-ieY3zaQAydzadpPiW1/IYakVHhp+wyEOpCQntgDOObs=", + "lastModified": 1755700851, + "narHash": "sha256-KRlUqUdcliKpLnEJqyA2OAWto73F6iGTbMrsiAdc24M=", "owner": "j-hui", "repo": "fidget.nvim", - "rev": "3f5475949679953af6d78654db29b944fa826e6a", + "rev": "4d5858bd4c471c895060e1b9f3575f1551184dc5", "type": "github" }, "original": { @@ -370,11 +370,11 @@ "nvim_plugin-lewis6991/gitsigns.nvim": { "flake": false, "locked": { - "lastModified": 1759324477, - "narHash": "sha256-GDK9I3SNRyZe59+GsnDC0L2KjGr150dWo4S3DUwhT7U=", + "lastModified": 1757668552, + "narHash": "sha256-L5WbNiFUn014hThvGfb5r858O6iLOBhOQHfVUdIlFI4=", "owner": "lewis6991", "repo": "gitsigns.nvim", - "rev": "1ee5c1fd068c81f9dd06483e639c2aa4587dc197", + "rev": "f780609807eca1f783a36a8a31c30a48fbe150c5", "type": "github" }, "original": { @@ -434,11 +434,11 @@ "nvim_plugin-mbbill/undotree": { "flake": false, "locked": { - "lastModified": 1759186837, - "narHash": "sha256-EWOH08KAWyoT9m45/B1d5aKQQJtd3k4orJbagVsxe08=", + "lastModified": 1756538456, + "narHash": "sha256-tudR+46nd63jY1VTCNEfZ2CofxCODXaHos0+NdFI6wU=", "owner": "mbbill", "repo": "undotree", - "rev": "0f1c9816975b5d7f87d5003a19c53c6fd2ff6f7f", + "rev": "fe9a9d0645f0f5532360b5e5f5c550d7bb4f1869", "type": "github" }, "original": { @@ -450,11 +450,11 @@ "nvim_plugin-mfussenegger/nvim-lint": { "flake": false, "locked": { - "lastModified": 1758714671, - "narHash": "sha256-POnQfsZAv93+0uCbKFcNgyQxn3u8nNqgnx0uTqCkCq8=", + "lastModified": 1757878177, + "narHash": "sha256-8X9z0pRWx9xg9nQhhQtuOu3TunObg2CIgnlPXZtx86A=", "owner": "mfussenegger", "repo": "nvim-lint", - "rev": "335a6044be16d7701001059cba9baa36fbeef422", + "rev": "0864f81c681e15d9bdc1156fe3a17bd07db5a3ed", "type": "github" }, "original": { @@ -466,11 +466,11 @@ "nvim_plugin-mrcjkb/rustaceanvim": { "flake": false, "locked": { - "lastModified": 1759623626, - "narHash": "sha256-Cz4LDzz7v3kBS1mbxZjprogqHFghYr5xMfSN3us2Ltk=", + "lastModified": 1757809469, + "narHash": "sha256-bijgDZozBNmHW3cASmOrQlaSE80d8V3XRxi1BNmfzRI=", "owner": "mrcjkb", "repo": "rustaceanvim", - "rev": "96a4f5efc7705f613ddd47fb5d1445c172acb213", + "rev": "370b85298e5afdfd8b5d3da0c60c04e3873499a4", "type": "github" }, "original": { @@ -482,11 +482,11 @@ "nvim_plugin-neovim/nvim-lspconfig": { "flake": false, "locked": { - "lastModified": 1759548517, - "narHash": "sha256-K56vjTUkQ/NdA6vq5942zUknPiCUbMByiEW540dR8R0=", + "lastModified": 1757886255, + "narHash": "sha256-lIlFgHkesAK7fRcoEEQO84/0BpE29dBgNzBnCv/0Tf0=", "owner": "neovim", "repo": "nvim-lspconfig", - "rev": "e688b486fe9291f151eae7e5c0b5a5c4ef980847", + "rev": "d9879110d0422a566fa01d732556f4d5515e1738", "type": "github" }, "original": { @@ -498,11 +498,11 @@ "nvim_plugin-nosduco/remote-sshfs.nvim": { "flake": false, "locked": { - "lastModified": 1759193354, - "narHash": "sha256-FfUxpRfqrf0r56/gi76N2ZooWnXWO0aRtaQBS7m+SvY=", + "lastModified": 1755703322, + "narHash": "sha256-xy+50CsRd0LfRyDtNNMI8KhzvjH2nt8ogwiXf7H3fYY=", "owner": "nosduco", "repo": "remote-sshfs.nvim", - "rev": "45502b3892774811153aeab5f7f9b0033c82005c", + "rev": "8b0974c0e23ef086f5598ebbb1980257171dc370", "type": "github" }, "original": { @@ -626,11 +626,11 @@ "nvim_plugin-nvim-tree/nvim-tree.lua": { "flake": false, "locked": { - "lastModified": 1759222332, - "narHash": "sha256-TmQd8Xx9xw3G9PfPH+DZeSECfiUoO7XKCUSyQ4O0hMk=", + "lastModified": 1757312802, + "narHash": "sha256-Km+PWXJJLl8zsBjwIGL//qT/eUEZna4yYRPsWXMXG1E=", "owner": "nvim-tree", "repo": "nvim-tree.lua", - "rev": "87d096a39cb2d5d43e6771563575ff042a79f48b", + "rev": "e179ad2f83b5955ab0af653069a493a1828c2697", "type": "github" }, "original": { @@ -642,11 +642,11 @@ "nvim_plugin-nvim-tree/nvim-web-devicons": { "flake": false, "locked": { - "lastModified": 1759188261, - "narHash": "sha256-lVrakFrpIP9lp7sMfMb33KeMPIkcn1qBFVytJzKCfuE=", + "lastModified": 1756936794, + "narHash": "sha256-2Q6ZZQj5HFXTw1YwX3ibdGOTwfbfPUBbcPOsuBUpSjc=", "owner": "nvim-tree", "repo": "nvim-web-devicons", - "rev": "b8221e42cf7287c4dcde81f232f58d7b947c210d", + "rev": "6e51ca170563330e063720449c21f43e27ca0bc1", "type": "github" }, "original": { @@ -706,11 +706,11 @@ "nvim_plugin-rmagatti/auto-session": { "flake": false, "locked": { - "lastModified": 1759618137, - "narHash": "sha256-+RYQi685tyV73WNXpgr/Q5p3o21dSUkQmSoif+EPBVM=", + "lastModified": 1757864222, + "narHash": "sha256-FbN36vVLX3DUXwefTbi6511R6KTHqLiNHeAR0kXiarg=", "owner": "rmagatti", "repo": "auto-session", - "rev": "0385a9ad378d70608c2e6e4c14b3b126ce30fc51", + "rev": "5a269bb5bec50b8b60564aa00f6454d9e82fbe8d", "type": "github" }, "original": { @@ -770,11 +770,11 @@ "nvim_plugin-stevearc/conform.nvim": { "flake": false, "locked": { - "lastModified": 1759554032, - "narHash": "sha256-JX+vFs+8n4PS7Xwq68MW2mjlDaLlUx6CxMqhf9ArfXQ=", + "lastModified": 1756334700, + "narHash": "sha256-j9TOSx2L19AHABdg9pLtmEUtPOCIUSo0qe2YUPBlZ5g=", "owner": "stevearc", "repo": "conform.nvim", - "rev": "9d859cbfbde7a1bd1770e7c97aef30ec5a237a71", + "rev": "b4aab989db276993ea5dcb78872be494ce546521", "type": "github" }, "original": { @@ -882,11 +882,11 @@ "nvim_plugin-zbirenbaum/copilot.lua": { "flake": false, "locked": { - "lastModified": 1759697885, - "narHash": "sha256-PwqJ7/FCfK4AqFgguZ2Tac5RWhehSEfI1N6ySSuTbZc=", + "lastModified": 1757884406, + "narHash": "sha256-sXobILIsV4nnk9//PbFT4L1BsHP1xSJiuibVbGwYXJ8=", "owner": "zbirenbaum", "repo": "copilot.lua", - "rev": "30b98a4c25d6152c14084020f703b6d56e1f1122", + "rev": "8aebaa3a102125fedf08c98773a0a8def92fff37", "type": "github" }, "original": { @@ -963,11 +963,11 @@ ] }, "locked": { - "lastModified": 1759718104, - "narHash": "sha256-TbkLsgdnXHUXR4gOQBmhxkEE9ne+eHmX1chZHWRogy0=", + "lastModified": 1757930296, + "narHash": "sha256-Z9u5VszKs8rfEvg2AsFucWEjl7wMtAln9l1b78cfBh4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "edea9f33f9a03f615ad3609a40fbcefe0ec835ca", + "rev": "09442765a05c2ca617c20ed68d9613da92a2d96b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 448c668..97300cc 100644 --- a/flake.nix +++ b/flake.nix @@ -219,7 +219,7 @@ } ({ storePath = "${./.}"; - nodejs_24_path = "${pkgs.nodejs_24}"; + nodejs_20_path = "${pkgs.nodejs_20}"; # This will look at all inputs and grab any prefixed with `nvim_plugin-` pluginPaths = builtins.foldl' (dirs: name: { "${name}" = inputs.${name}.outPath; } // dirs) nixPkgsPlugins diff --git a/lua/plugins/cmp_autocompletion.lua b/lua/plugins/cmp_autocompletion.lua index 3d677ea..030c9fb 100644 --- a/lua/plugins/cmp_autocompletion.lua +++ b/lua/plugins/cmp_autocompletion.lua @@ -23,7 +23,7 @@ return { cmd = "Copilot", event = "InsertEnter", opts = { - copilot_node_command = NIX.nodejs_24_path and (NIX.nodejs_24_path .. "/bin/node") or "node", + copilot_node_command = NIX.nodejs_20_path and (NIX.nodejs_20_path .. "/bin/node") or "node", }, main = "copilot", }, diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 2b40566..6be4950 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -214,7 +214,7 @@ return { local lsp_servers = vim.tbl_keys(servers or {}) for _, server_name in ipairs(lsp_servers) do local server_opts = servers[server_name] or {} - vim.lsp[server_name] = server_opts + require("lspconfig")[server_name].setup(server_opts) end else -- TODO test this out on a non nix setup... @@ -230,7 +230,7 @@ return { local server = servers[server_name] or {} server.capabilities = vim.tbl_deep_extend("force", {}, capabilities, server.capabilities or {}) - vim.lsp[server_name] = server + require("lspconfig")[server_name].setup(server) end, }, }) diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua index cda1219..d775bbb 100644 --- a/lua/plugins/telescope.lua +++ b/lua/plugins/telescope.lua @@ -30,19 +30,20 @@ return { }, defaults = { file_ignore_patterns = { - "^dist/", - "^build/", - "target/", - "node_modules/", + "node_modules", "package-lock.json", - ".git/", - ".direnv/", - ".aider/", + "target", + ".git", + ".direnv", ".pytest_cache", "__pycache__", ".venv", - "venv$", + "venv", ".mypy_cache", + "dist", + "build", + "poackage-lock.json", + ".aider*", }, mappings = { i = { @@ -121,7 +122,6 @@ return { "ff", function() require("telescope.builtin").find_files({ - cwd = vim.fn.getcwd(), hidden = true, follow = true, no_ignore = true, @@ -134,7 +134,6 @@ return { "fg", function() require("telescope.builtin").git_files({ - cwd = vim.fn.getcwd(), hidden = true, }) end, @@ -146,7 +145,6 @@ return { U.cmd_executable("rg", { function() require("telescope.builtin").live_grep({ - cwd = vim.fn.getcwd(), hidden = true, follow = true, no_ignore = true,