diff --git a/flake.lock b/flake.lock index df71274..565b3c3 100644 --- a/flake.lock +++ b/flake.lock @@ -13,11 +13,11 @@ ] }, "locked": { - "lastModified": 1715699772, - "narHash": "sha256-sKhqIgucN5sI/7UQgBwsonzR4fONjfMr9OcHK/vPits=", + "lastModified": 1718194053, + "narHash": "sha256-FaGrf7qwZ99ehPJCAwgvNY5sLCqQ3GDiE/6uLhxxwSY=", "owner": "serokell", "repo": "deploy-rs", - "rev": "b3ea6f333f9057b77efd9091119ba67089399ced", + "rev": "3867348fa92bc892eba5d9ddb2d7a97b9e127a8a", "type": "github" }, "original": { @@ -35,11 +35,11 @@ ] }, "locked": { - "lastModified": 1713532798, - "narHash": "sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc=", + "lastModified": 1717408969, + "narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=", "owner": "numtide", "repo": "devshell", - "rev": "12e914740a25ea1891ec619bb53cf5e6ca922e40", + "rev": "1ebbe68d57457c8cae98145410b164b5477761f4", "type": "github" }, "original": { @@ -55,11 +55,11 @@ ] }, "locked": { - "lastModified": 1716431128, - "narHash": "sha256-t3T8HlX3udO6f4ilLcN+j5eC3m2gqsouzSGiriKK6vk=", + "lastModified": 1718242063, + "narHash": "sha256-n3AWItJ4a94GT0cray/eUV7tt3mulQ52L+lWJN9d1E8=", "owner": "nix-community", "repo": "disko", - "rev": "7ffc4354dfeb37c8c725ae1465f04a9b45ec8606", + "rev": "832a9f2c81ff3485404bd63952eadc17bf7ccef2", "type": "github" }, "original": { @@ -107,11 +107,11 @@ ] }, "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "lastModified": 1717285511, + "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", "type": "github" }, "original": { @@ -156,21 +156,30 @@ "type": "github" } }, - "flake-utils_3": { + "git-hooks": { "inputs": { - "systems": "systems_3" + "flake-compat": "flake-compat_2", + "gitignore": "gitignore", + "nixpkgs": [ + "nixvim", + "nixpkgs" + ], + "nixpkgs-stable": [ + "nixvim", + "nixpkgs" + ] }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "lastModified": 1717664902, + "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", "type": "github" }, "original": { - "owner": "numtide", - "repo": "flake-utils", + "owner": "cachix", + "repo": "git-hooks.nix", "type": "github" } }, @@ -178,7 +187,7 @@ "inputs": { "nixpkgs": [ "nixvim", - "pre-commit-hooks", + "git-hooks", "nixpkgs" ] }, @@ -203,11 +212,11 @@ ] }, "locked": { - "lastModified": 1713801874, - "narHash": "sha256-bRcvw+arBwpRzqpZQxyB1pCaq1TJXhnx4f294hMXkm4=", + "lastModified": 1718243258, + "narHash": "sha256-abBpj2VU8p6qlRzTU8o22q68MmOaZ4v8zZ4UlYl5YRU=", "owner": "nix-community", "repo": "home-manager", - "rev": "1451d2866d9ef3739c20f964c9c8bd6db39cc373", + "rev": "8d5e27b4807d25308dfe369d5a923d87e7dbfda3", "type": "github" }, "original": { @@ -224,11 +233,11 @@ ] }, "locked": { - "lastModified": 1713543876, - "narHash": "sha256-olEWxacm1xZhAtpq+ZkEyQgR4zgfE7ddpNtZNvubi3g=", + "lastModified": 1717976995, + "narHash": "sha256-u3HBinyIyUvL1+N816bODpJmSQdgn0Mbb8BprFw7kqo=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "9e7c20ffd056e406ddd0276ee9d89f09c5e5f4ed", + "rev": "315aa649ba307704db0b16c92f097a08a65ec955", "type": "github" }, "original": { @@ -240,10 +249,10 @@ "nix-secrets": { "flake": false, "locked": { - "lastModified": 1717631148, - "narHash": "sha256-smVpy+sIKFUwBcRHjdLWVlrYqUqpfg2TJXuGqZJBXJM=", + "lastModified": 1718304587, + "narHash": "sha256-cwD0U0kIzCPta5WPnpWBWHLknQOz8YTjK2eyRn3d7jQ=", "ref": "refs/heads/main", - "rev": "631c6dbe7d5ea9589a7d20734a8b81a0bb872818", + "rev": "6ae6ce3f7de63c99b0657f8195775c2352cd9eae", "shallow": true, "type": "git", "url": "ssh://git@git.venberg.xyz:7920/Gabe/nix-secrets.git" @@ -267,11 +276,11 @@ ] }, "locked": { - "lastModified": 1715612368, - "narHash": "sha256-rpXM1gGZY1KacCvKLx5Hnzxp+iLRVVVrt70KiMKvalo=", + "lastModified": 1717976391, + "narHash": "sha256-STKlWaiiFKDybexvQCg5U1+DSLRaxT93NwVaiBSEvTI=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "0802ef2739396a18d56c2fd088b95006671f6f48", + "rev": "e3f215e518d52f6f2e68cf713cefe773284e1aa6", "type": "github" }, "original": { @@ -283,11 +292,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1713714899, - "narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=", + "lastModified": 1718160348, + "narHash": "sha256-9YrUjdztqi4Gz8n3mBuqvCkMo4ojrA6nASwyIKWMpus=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6143fc5eeb9c4f00163267708e26191d1e918932", + "rev": "57d6973abba7ea108bac64ae7629e7431e0199b6", "type": "github" }, "original": { @@ -299,11 +308,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1716655032, - "narHash": "sha256-kQ25DAiCGigsNR/Quxm3v+JGXAEXZ8I7RAF4U94bGzE=", + "lastModified": 1717880976, + "narHash": "sha256-BRvSCsKtDUr83NEtbGfHLUOdDK0Cgbezj2PtcHnz+sQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "59a450646ec8ee0397f5fa54a08573e8240eb91f", + "rev": "4913a7c3d8b8d00cb9476a6bd730ff57777f740c", "type": "github" }, "original": { @@ -320,6 +329,7 @@ "flake-compat" ], "flake-parts": "flake-parts", + "git-hooks": "git-hooks", "home-manager": [ "home-manager" ], @@ -327,14 +337,14 @@ "nixpkgs": [ "nixpkgs" ], - "pre-commit-hooks": "pre-commit-hooks" + "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1713794074, - "narHash": "sha256-v1Bf4bMriI3ZIui8XwA9kkyspn+zPDOa/C5VN022Bk0=", + "lastModified": 1718290136, + "narHash": "sha256-BQFspZqwA56LOIQ0ypw54Nal/BLFUpnZTqoXxeiSTNE=", "owner": "nix-community", "repo": "nixvim", - "rev": "6f7b236f65d1751788c4ab50b78fdae7dd20ef49", + "rev": "80c03843e7ad7fc7deb0dce6d1f6fc45593ed91d", "type": "github" }, "original": { @@ -343,34 +353,6 @@ "type": "github" } }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_3", - "gitignore": "gitignore", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ], - "nixpkgs-stable": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1713775815, - "narHash": "sha256-Wu9cdYTnGQQwtT20QQMg7jzkANKQjwBD9iccfGKkfls=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "2ac4dcbf55ed43f3be0bae15e181f08a57af24a4", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, "root": { "inputs": { "deploy-rs": "deploy-rs", @@ -393,11 +375,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1716692524, - "narHash": "sha256-sALodaA7Zkp/JD6ehgwc0UCBrSBfB4cX66uFGTsqeFU=", + "lastModified": 1718137936, + "narHash": "sha256-psA+1Q5fPaK6yI3vzlLINNtb6EeXj111zQWnZYyJS9c=", "owner": "mic92", "repo": "sops-nix", - "rev": "962797a8d7f15ed7033031731d0bb77244839960", + "rev": "c279dec105dd53df13a5e57525da97905cc0f0d6", "type": "github" }, "original": { @@ -436,18 +418,24 @@ "type": "github" } }, - "systems_3": { + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "nixvim", + "nixpkgs" + ] + }, "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "lastModified": 1718139168, + "narHash": "sha256-1TZQcdETNdJMcfwwoshVeCjwWfrPtkSQ8y8wFX3it7k=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "1cb529bffa880746a1d0ec4e0f5076876af931f1", "type": "github" }, "original": { - "owner": "nix-systems", - "repo": "default", + "owner": "numtide", + "repo": "treefmt-nix", "type": "github" } } diff --git a/modules/home-manager/nvim/lsp/default.nix b/modules/home-manager/nvim/lsp/default.nix index 5720d07..ebbf439 100644 --- a/modules/home-manager/nvim/lsp/default.nix +++ b/modules/home-manager/nvim/lsp/default.nix @@ -10,15 +10,15 @@ lib.mkIf (config.user.nvim.enable-lsp && config.user.nvim.enable) { user.nvim.enable-completions = true; - programs.nixvim = { + programs.nixvim = {helpers, ...}: { plugins.lsp = { enable = true; servers = { bashls.enable = true; clangd.enable = true; lua-ls.enable = true; - nil_ls.enable = true; - nil_ls.settings.formatting.command = ["alejandra"]; + nil-ls.enable = true; + nil-ls.settings.formatting.command = ["alejandra"]; nushell.enable = true; pyright.enable = true; ruff-lsp.enable = true; @@ -39,9 +39,8 @@ }; keymaps = [ { - action = "vim.lsp.buf.declaration"; + action = helpers.mkRaw "vim.lsp.buf.declaration"; key = "lc"; - lua = true; mode = "n"; options = { silent = true; @@ -49,9 +48,8 @@ }; } { - action = "vim.lsp.buf.definition"; + action = helpers.mkRaw "vim.lsp.buf.definition"; key = "ld"; - lua = true; mode = "n"; options = { silent = true; @@ -59,9 +57,8 @@ }; } { - action = "vim.lsp.buf.hover"; + action = helpers.mkRaw "vim.lsp.buf.hover"; key = "lh"; - lua = true; mode = "n"; options = { silent = true; @@ -69,9 +66,8 @@ }; } { - action = "vim.lsp.buf.implementation"; + action = helpers.mkRaw "vim.lsp.buf.implementation"; key = "li"; - lua = true; mode = "n"; options = { silent = true; @@ -79,9 +75,8 @@ }; } { - action = "vim.lsp.buf.signature_help"; + action = helpers.mkRaw "vim.lsp.buf.signature_help"; key = "ls"; - lua = true; mode = "n"; options = { silent = true; @@ -89,9 +84,8 @@ }; } { - action = "vim.lsp.buf.add_workspace_folder"; + action = helpers.mkRaw "vim.lsp.buf.add_workspace_folder"; key = "lwa"; - lua = true; mode = "n"; options = { silent = true; @@ -99,9 +93,8 @@ }; } { - action = "vim.lsp.buf.remove_workspace_folder"; + action = helpers.mkRaw "vim.lsp.buf.remove_workspace_folder"; key = "lwr"; - lua = true; mode = "n"; options = { silent = true; @@ -109,9 +102,8 @@ }; } { - action = "vim.lsp.buf.list_workspace_folders"; + action = helpers.mkRaw "vim.lsp.buf.list_workspace_folders"; key = "lw"; - lua = true; mode = "n"; options = { silent = true; @@ -119,9 +111,8 @@ }; } { - action = "vim.lsp.buf.rename"; + action = helpers.mkRaw "vim.lsp.buf.rename"; key = "lr"; - lua = true; mode = "n"; options = { silent = true; @@ -129,9 +120,8 @@ }; } { - action = "vim.lsp.buf.code_action"; + action = helpers.mkRaw "vim.lsp.buf.code_action"; key = "la"; - lua = true; mode = "n"; options = { silent = true; @@ -139,9 +129,8 @@ }; } { - action = "vim.lsp.buf.references"; + action = helpers.mkRaw "vim.lsp.buf.references"; key = "le"; - lua = true; mode = "n"; options = { silent = true; @@ -149,9 +138,8 @@ }; } { - action = "function() vim.lsp.buf.format{async=true} end"; + action = helpers.mkRaw "function() vim.lsp.buf.format{async=true} end"; key = "lm"; - lua = true; mode = "n"; options = { silent = true; @@ -159,9 +147,8 @@ }; } { - action = "vim.diagnostic.open_float"; + action = helpers.mkRaw "vim.diagnostic.open_float"; key = "lo"; - lua = true; mode = "n"; options = { silent = true; @@ -169,9 +156,8 @@ }; } { - action = "vim.diagnostic.goto_next"; + action = helpers.mkRaw "vim.diagnostic.goto_next"; key = "]d"; - lua = true; mode = "n"; options = { silent = true; @@ -179,9 +165,8 @@ }; } { - action = "vim.diagnostic.goto_prev"; + action = helpers.mkRaw "vim.diagnostic.goto_prev"; key = "[d"; - lua = true; mode = "n"; options = { silent = true; diff --git a/modules/home-manager/nvim/toggleterm.nix b/modules/home-manager/nvim/toggleterm.nix index 676497d..4e671e6 100644 --- a/modules/home-manager/nvim/toggleterm.nix +++ b/modules/home-manager/nvim/toggleterm.nix @@ -5,7 +5,7 @@ ... }: { config = lib.mkIf config.user.nvim.enable { - programs.nixvim = { + programs.nixvim = {helpers, ...}: { plugins.toggleterm = { enable = true; settings = { @@ -17,9 +17,8 @@ }; keymaps = [ { - action = "function() Floatingterm:toggle() end"; + action = helpers.mkRaw "function() Floatingterm:toggle() end"; key = "s"; - lua = true; mode = "n"; options = { silent = true;