diff options
| -rw-r--r-- | flake.lock | 269 | ||||
| -rw-r--r-- | home/default.nix | 4 | ||||
| -rw-r--r-- | home/profiles/base/default.nix | 2 |
3 files changed, 150 insertions, 125 deletions
diff --git a/flake.lock b/flake.lock index ad44d0c..10c5067 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1711742460, - "narHash": "sha256-0O4v6e4a1toxXZ2gf5INhg4WPE5C5T+SVvsBt+45Mcc=", + "lastModified": 1717279440, + "narHash": "sha256-kH04ReTjxOpQumgWnqy40vvQLSnLGxWP6RF3nq5Esrk=", "owner": "zhaofengli", "repo": "attic", - "rev": "4dbdbee45728d8ce5788db6461aaaa89d98081f0", + "rev": "717cc95983cdc357bc347d70be20ced21f935843", "type": "github" }, "original": { @@ -53,11 +53,11 @@ ] }, "locked": { - "lastModified": 1702918879, - "narHash": "sha256-tWJqzajIvYcaRWxn+cLUB9L9Pv4dQ3Bfit/YjU5ze3g=", + "lastModified": 1717025063, + "narHash": "sha256-dIubLa56W9sNNz0e8jGxrX3CAkPXsq7snuFA/Ie6dn8=", "owner": "ipetkov", "repo": "crane", - "rev": "7195c00c272fdd92fc74e7d5a0a2844b9fadb2fb", + "rev": "480dff0be03dac0e51a8dfc26e882b0d123a450e", "type": "github" }, "original": { @@ -147,12 +147,28 @@ } }, "flake-compat_6": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_7": { "locked": { - "lastModified": 1688025799, - "narHash": "sha256-ktpB4dRtnksm9F5WawoIkEneh1nrEvuxb5lJFt1iOyw=", + "lastModified": 1717312683, + "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=", "owner": "nix-community", "repo": "flake-compat", - "rev": "8bf105319d44f6b9f0d764efa4fdef9f1cc9ba1c", + "rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea", "type": "github" }, "original": { @@ -191,11 +207,11 @@ ] }, "locked": { - "lastModified": 1714641030, - "narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=", + "lastModified": 1717285511, + "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e", + "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", "type": "github" }, "original": { @@ -230,11 +246,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1714641030, - "narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=", + "lastModified": 1717285511, + "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e", + "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", "type": "github" }, "original": { @@ -333,11 +349,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "type": "github" }, "original": { @@ -346,21 +362,52 @@ "type": "github" } }, - "flake-utils_6": { + "git-hooks": { "inputs": { - "systems": "systems_3" + "flake-compat": "flake-compat_6", + "gitignore": "gitignore", + "nixpkgs": [ + "neovim-nightly", + "nixpkgs" + ], + "nixpkgs-stable": [ + "neovim-nightly", + "nixpkgs" + ] }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "lastModified": 1716213921, + "narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0", "type": "github" }, "original": { - "owner": "numtide", - "repo": "flake-utils", + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "neovim-nightly", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", "type": "github" } }, @@ -393,11 +440,11 @@ ] }, "locked": { - "lastModified": 1715348159, - "narHash": "sha256-nP0PJZ3dR0ols1V+w+sYBki7JlSRFvFJ8J8B00Oa7BM=", + "lastModified": 1717525419, + "narHash": "sha256-5z2422pzWnPXHgq2ms8lcCfttM0dz+hg+x1pCcNkAws=", "owner": "nix-community", "repo": "home-manager", - "rev": "223743313bab8b0b44a57eaf9573de9f69082b4d", + "rev": "a7117efb3725e6197dd95424136f79147aa35e5b", "type": "github" }, "original": { @@ -412,11 +459,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1715197038, - "narHash": "sha256-FxDfQvV41sHIeIwiLNZEzncc/oKExmo4n6nsnAxU72Q=", + "lastModified": 1716479415, + "narHash": "sha256-WAJJ4UL3hsqsfZ05cHthjEwItnv7Xy84r2y6lzkBMh8=", "owner": "NixOS", "repo": "hydra", - "rev": "998df1657e7e9bd3c2d54f8106eae5a325e17e02", + "rev": "b3e0d9a8b78d55e5fea394839524f5a24d694230", "type": "github" }, "original": { @@ -442,15 +489,15 @@ }, "lib-aggregate": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_4", "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1714910950, - "narHash": "sha256-gaq5bphSsY+htEXFDkImOrH3MVCkxFTvCiwdCJj096E=", + "lastModified": 1717330178, + "narHash": "sha256-rRZjmC3xcPpHTJHnEy3T99O86Ecjao5YhakzaoNiRcs=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "26fabca301e1133abd3d9192b1bcb6fb45b30f1d", + "rev": "64d43e2bbc6eab8d1cbdfba96d90a71e15a847d7", "type": "github" }, "original": { @@ -475,46 +522,23 @@ "type": "github" } }, - "neovim-flake": { - "inputs": { - "flake-utils": "flake-utils_4", - "nixpkgs": [ - "neovim-nightly", - "nixpkgs" - ] - }, - "locked": { - "dir": "contrib", - "lastModified": 1715292729, - "narHash": "sha256-Ml5HzPmVx/fnLedNpBYQs3YG2zhSKsPga89yaCDVYlM=", - "owner": "neovim", - "repo": "neovim", - "rev": "ca735c7554701a1191e6afdac2ea4b4f94ba6d88", - "type": "github" - }, - "original": { - "dir": "contrib", - "owner": "neovim", - "repo": "neovim", - "type": "github" - } - }, "neovim-nightly": { "inputs": { "flake-compat": "flake-compat_5", "flake-parts": "flake-parts_2", + "git-hooks": "git-hooks", "hercules-ci-effects": "hercules-ci-effects", - "neovim-flake": "neovim-flake", + "neovim-src": "neovim-src", "nixpkgs": [ "unstable" ] }, "locked": { - "lastModified": 1715299512, - "narHash": "sha256-IYOsXQt04EIHfNhjwbDhSY/n3vQGhSiL/XHuMGnZnek=", + "lastModified": 1717559432, + "narHash": "sha256-UkjZp5LfrWKxidGzZLRqHs3H4/u6FQAc5yS5QsLKndw=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "2b11e4433355b57784dd002d34cf810874fa044d", + "rev": "52dd6362442d42dfc0d2f7c0176690d64ba4fc6d", "type": "github" }, "original": { @@ -523,6 +547,22 @@ "type": "github" } }, + "neovim-src": { + "flake": false, + "locked": { + "lastModified": 1717536944, + "narHash": "sha256-JzJ3xxXmI8732nl3p2Zg/qZiaLTVEWZ8pn3PfsGnvxs=", + "owner": "neovim", + "repo": "neovim", + "rev": "f69937fdbd162630c35e119e67bbbf052558c0e0", + "type": "github" + }, + "original": { + "owner": "neovim", + "repo": "neovim", + "type": "github" + } + }, "nix": { "inputs": { "flake-compat": "flake-compat_4", @@ -558,11 +598,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1715248291, - "narHash": "sha256-npC9Swu4VIlRIiEP0XFGoIukd6vOufS/M3PdHk6rQpc=", + "lastModified": 1715804156, + "narHash": "sha256-GtIHP86Cz1kD9xZO/cKbNQACHKdoT9WFbLJAq6W2EDY=", "owner": "nix-community", "repo": "nix-eval-jobs", - "rev": "63154bdfb22091041b307d17863bdc0e01a32a00", + "rev": "bb95091f6c6f38f6cfc215a1797a2dd466312c8b", "type": "github" }, "original": { @@ -579,11 +619,11 @@ ] }, "locked": { - "lastModified": 1715269120, - "narHash": "sha256-AcN0Zv7E2mPpB4JsKCFeKz7X0VQgFSCFXplsxj6oens=", + "lastModified": 1717550333, + "narHash": "sha256-QebVpP3Z0zVBTSqExNQRg3FLOi2h0bPML6urBbUPzLY=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "8960f1a63dab72f971044c217c6936cc527e679b", + "rev": "de70cdf224bd40928fe2af7fa558e1bdb7d8d619", "type": "github" }, "original": { @@ -632,11 +672,11 @@ }, "nixpkgs-2311": { "locked": { - "lastModified": 1715218190, - "narHash": "sha256-R98WOBHkk8wIi103JUVQF3ei3oui4HvoZcz9tYOAwlk=", + "lastModified": 1717343407, + "narHash": "sha256-naOOAqDrOybqIU4EwBeasD3plM9qPS4WJvVcrx9AyNc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9a9960b98418f8c385f52de3b09a63f9c561427a", + "rev": "03fca4cf6dd8838b4cdb8db35766b557e4c0fe00", "type": "github" }, "original": { @@ -648,23 +688,23 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1714640452, - "narHash": "sha256-QBx10+k6JWz6u7VsohfSw8g8hjdBZEf8CFzXH1/1Z94=", + "lastModified": 1717284937, + "narHash": "sha256-lIbdfCsf8LMFloheeE6N31+BMIeixqyQWbSr2vk79EQ=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" } }, "nixpkgs-lib_2": { "locked": { - "lastModified": 1714870069, - "narHash": "sha256-CNCqCGOHdxuiVnVkhTpp2WcqSSmSfeQjubhDOcgwGjU=", + "lastModified": 1717289404, + "narHash": "sha256-4q6ZO3BqHgdd3Aacb/xiQXB4g9TQKpQg/praTpD9vbI=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "4b620020fd73bdd5104e32c702e65b60b6869426", + "rev": "e090cb30ae82f4b4461aafdb808847c6c97b08c2", "type": "github" }, "original": { @@ -675,11 +715,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1715356907, - "narHash": "sha256-7mTHObWWhcw5E7L6QkhQvG8on2OJFks+NE+e+V008VY=", + "lastModified": 1717582690, + "narHash": "sha256-tg+BYtpzu/cCh4kC5oEkxdulCxIW1DMEXe74L2fFbL4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3a8dd0415af5429ed2fd9e9ba6924ec240bca830", + "rev": "b57526ee5cf47504b759cda0b3655a73b40e9a61", "type": "github" }, "original": { @@ -723,11 +763,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1714858427, - "narHash": "sha256-tCxeDP4C1pWe2rYY3IIhdA40Ujz32Ufd4tcrHPSKx2M=", + "lastModified": 1717265169, + "narHash": "sha256-IITcGd6xpNoyq9SZBigCkv4+qMHSqot0RDPR4xsZ2CA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b980b91038fc4b09067ef97bbe5ad07eecca1e76", + "rev": "3b1b4895b2c5f9f5544d02132896aeb9ceea77bc", "type": "github" }, "original": { @@ -739,7 +779,7 @@ }, "nixpkgs-wayland": { "inputs": { - "flake-compat": "flake-compat_6", + "flake-compat": "flake-compat_7", "lib-aggregate": "lib-aggregate", "nix-eval-jobs": "nix-eval-jobs", "nixpkgs": [ @@ -747,11 +787,11 @@ ] }, "locked": { - "lastModified": 1715332660, - "narHash": "sha256-K6TsGFwukMLe0W66JrQ7yV5Vc9LRCWm3YkvT3fHiqVs=", + "lastModified": 1717579225, + "narHash": "sha256-YxMgsjpWA2W9kC/6C/Q/fJG2TxYM+BuNVmmyck5gsIk=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "46be8bce5aaca13651966083735a891dedd9ed5f", + "rev": "405d58ceca0e1827d82ffb0d821e6622e513fd90", "type": "github" }, "original": { @@ -794,11 +834,11 @@ }, "nur": { "locked": { - "lastModified": 1715355859, - "narHash": "sha256-eFHxwiNe4HRhw3CQmqCuAcT6IlB1VqjM+gxFZhMSKmk=", + "lastModified": 1717577731, + "narHash": "sha256-ZNishOAKb9OGyR6EFobl8eEI2JqtrVDJHZvI6lczzuE=", "owner": "nix-community", "repo": "NUR", - "rev": "a5ff5dd14ef859f447f8304cd93bee52c5515280", + "rev": "b730aaff8a4645c9e063993cf2504dd60cc8abbe", "type": "github" }, "original": { @@ -865,17 +905,17 @@ }, "rust": { "inputs": { - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_5", "nixpkgs": [ "unstable" ] }, "locked": { - "lastModified": 1715307487, - "narHash": "sha256-yuDAys3JuJmhQUQGMMsl3BDQNZUYZDw0eA71OVh9FeY=", + "lastModified": 1717553884, + "narHash": "sha256-+t3XaYEvlMo5BUJ/6C6RZcEfBTWFVUdMHpNoqUU+pSE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ec7a7caf50877bc32988c82653d6b3e6952a8c3f", + "rev": "8795c817dfab19243a33387a16c98d2df4075bb3", "type": "github" }, "original": { @@ -892,11 +932,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1715244550, - "narHash": "sha256-ffOZL3eaZz5Y1nQ9muC36wBCWwS1hSRLhUzlA9hV2oI=", + "lastModified": 1717455931, + "narHash": "sha256-8Q6mKSsto8gaGczXd4G0lvawdAYLa5Dlh3/g4hl5CaM=", "owner": "Mic92", "repo": "sops-nix", - "rev": "0dc50257c00ee3c65fef3a255f6564cfbfe6eb7f", + "rev": "d4555e80d80d2fa77f0a44201ca299f9602492a0", "type": "github" }, "original": { @@ -951,21 +991,6 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -990,11 +1015,11 @@ }, "unstable": { "locked": { - "lastModified": 1715266358, - "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", + "lastModified": 1717196966, + "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f1010e0469db743d14519a1efd37e23f8513d714", + "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8", "type": "github" }, "original": { @@ -1006,11 +1031,11 @@ }, "unstable-small": { "locked": { - "lastModified": 1715348188, - "narHash": "sha256-MM2a/oqc4FrbNIcrEJgz5tTqtOvrsWiFMMz1PzC0ZZk=", + "lastModified": 1717503908, + "narHash": "sha256-hsxbTeO6Dhobc2kELDwCgRJT9J5TotL6fS8z5P+OskI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5c0c6e14926c39d5c90073f01ca7fa6d24e3671b", + "rev": "50a127f8fccd0d24712c8ab146ca251f27cc4cb0", "type": "github" }, "original": { diff --git a/home/default.nix b/home/default.nix index 169b85b..0d414f3 100644 --- a/home/default.nix +++ b/home/default.nix @@ -8,7 +8,7 @@ system = "x86_64-linux"; overlays = with inputs; [ rust.overlays.default - neovim-nightly.overlay + neovim-nightly.overlays.default nur.overlay nixpkgs-wayland.overlay ]; @@ -41,7 +41,7 @@ system = "x86_64-linux"; overlays = with inputs; [ rust.overlays.default - neovim-nightly.overlay + neovim-nightly.overlays.default nur.overlay nixpkgs-wayland.overlay # TODO: fractional scaling is broken on 1.8+ diff --git a/home/profiles/base/default.nix b/home/profiles/base/default.nix index 05eb960..5e01ca0 100644 --- a/home/profiles/base/default.nix +++ b/home/profiles/base/default.nix @@ -48,7 +48,7 @@ in pkgs.procs pkgs.sops pkgs.tree - pkgs.neovim-nightly + pkgs.neovim # Common build tools (pkgs.rust-bin.selectLatestNightlyWith (toolchain: toolchain.default.override { extensions = [ "rust-src" ]; })) |