diff --git a/flake.lock b/flake.lock index 54b95bc..8d72be9 100644 --- a/flake.lock +++ b/flake.lock @@ -281,19 +281,17 @@ }, "devshell_2": { "inputs": { + "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" - ], - "systems": [ - "systems" ] }, "locked": { - "lastModified": 1701787589, - "narHash": "sha256-ce+oQR4Zq9VOsLoh9bZT8Ip9PaMLcjjBUHVPzW5d7Cw=", + "lastModified": 1704648272, + "narHash": "sha256-zCDhWGl3bVpBKpDZ0p3NuGksZVg69BAChsY5W4KARL4=", "owner": "numtide", "repo": "devshell", - "rev": "44ddedcbcfc2d52a76b64fb6122f209881bd3e1e", + "rev": "f54745fd4aae92443817ddc566ce06572b178b5a", "type": "github" }, "original": { @@ -308,7 +306,7 @@ "nixos-extra-modules", "nixpkgs" ], - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1701787589, @@ -331,11 +329,11 @@ ] }, "locked": { - "lastModified": 1703532766, - "narHash": "sha256-ojjW3cuNmqL5uqDWohwLoO8dYpheM5+AfgsNmGIMwG8=", + "lastModified": 1704741201, + "narHash": "sha256-Y420NeqPWRSpxHpXsxhKILfTxT5exjtTgCgDwSpcEfU=", "owner": "nix-community", "repo": "disko", - "rev": "1b191113874dee97796749bb21eac3d84735c70a", + "rev": "f0a3425a7b173701922e7959d8bfb136ef53aa54", "type": "github" }, "original": { @@ -498,7 +496,46 @@ "type": "github" } }, + "flake-parts_3": { + "inputs": { + "nixpkgs-lib": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1704152458, + "narHash": "sha256-DS+dGw7SKygIWf9w4eNBUZsK+4Ug27NwEWmn2tnbycg=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "88a2cd8166694ba0b6cb374700799cec53aef527", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { "inputs": { "systems": [ "systems" @@ -518,9 +555,9 @@ "type": "github" } }, - "flake-utils_2": { + "flake-utils_3": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1681202837, @@ -536,24 +573,6 @@ "type": "github" } }, - "flake-utils_3": { - "inputs": { - "systems": "systems_5" - }, - "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "flake-utils_4": { "inputs": { "systems": "systems_6" @@ -576,24 +595,6 @@ "inputs": { "systems": "systems_7" }, - "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_6": { - "inputs": { - "systems": "systems_8" - }, "locked": { "lastModified": 1701680307, "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", @@ -608,9 +609,9 @@ "type": "github" } }, - "flake-utils_7": { + "flake-utils_6": { "inputs": { - "systems": "systems_9" + "systems": "systems_8" }, "locked": { "lastModified": 1685518550, @@ -626,9 +627,9 @@ "type": "github" } }, - "flake-utils_8": { + "flake-utils_7": { "inputs": { - "systems": "systems_10" + "systems": "systems_9" }, "locked": { "lastModified": 1685518550, @@ -792,11 +793,11 @@ ] }, "locked": { - "lastModified": 1703527373, - "narHash": "sha256-AjypRssRtS6F3xkf7rE3/bXkIF2WJOZLbTIspjcE1zM=", + "lastModified": 1704809957, + "narHash": "sha256-Z8sBeoeeY2O+BNqh5C+4Z1h1F1wQ2mij7yPZ2GY397M=", "owner": "nix-community", "repo": "home-manager", - "rev": "80679ea5074ab7190c4cce478c600057cfb5edae", + "rev": "e13aa9e287b3365473e5897e3667ea80a899cdfb", "type": "github" }, "original": { @@ -806,6 +807,27 @@ } }, "home-manager_2": { + "inputs": { + "nixpkgs": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1704498488, + "narHash": "sha256-yINKdShHrtjdiJhov+q0s3Y3B830ujRoSbHduUNyKag=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "51e44a13acea71b36245e8bd8c7db53e0a3e61ee", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_3": { "inputs": { "nixpkgs": [ "stylix", @@ -828,11 +850,11 @@ }, "impermanence": { "locked": { - "lastModified": 1703562375, - "narHash": "sha256-T46GgRVnSUo0DrCVAHreLNMgeCYmFvo469qj1Z6dYDQ=", + "lastModified": 1703656108, + "narHash": "sha256-hCSUqdFJKHHbER8Cenf5JRzjMlBjIdwdftGQsO0xoJs=", "owner": "nix-community", "repo": "impermanence", - "rev": "8d16ac97980b3641078dd7c11337bfaa77b45789", + "rev": "033643a45a4a920660ef91caa391fbffb14da466", "type": "github" }, "original": { @@ -846,7 +868,7 @@ "crane": "crane", "flake-compat": "flake-compat_2", "flake-parts": "flake-parts", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "nixpkgs": [ "nixpkgs" ], @@ -870,15 +892,15 @@ }, "lib-aggregate": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_5", "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1703419730, - "narHash": "sha256-ZRqj/irxTzRoGne2eWmuNaSO1/rz22S1EGj+MJXINeo=", + "lastModified": 1704629345, + "narHash": "sha256-cWrno5kSY2cCaWIl97Ae4/iZ9rnMLlm0VrwRqdzIESk=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "7deb8249793fd2e9244c4e652c18d95351eb1111", + "rev": "3e408e7391e9d778f48861bb9da08ac54e01441a", "type": "github" }, "original": { @@ -887,6 +909,27 @@ "type": "github" } }, + "nix-darwin": { + "inputs": { + "nixpkgs": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1704277720, + "narHash": "sha256-meAKNgmh3goankLGWqqpw73pm9IvXjEENJloF0coskE=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "0dd382b70c351f528561f71a0a7df82c9d2be9a4", + "type": "github" + }, + "original": { + "owner": "lnl7", + "repo": "nix-darwin", + "type": "github" + } + }, "nix-eval-jobs": { "inputs": { "flake-parts": "flake-parts_2", @@ -937,11 +980,11 @@ ] }, "locked": { - "lastModified": 1703387252, - "narHash": "sha256-XKJqGj0BaEn/zyctEnkgVIh6Ba1rgTRc+UBi9EU8Y54=", + "lastModified": 1704596958, + "narHash": "sha256-BK3Ohsz7m8X6qVKFxDtr8KVcHipfr5hYE9PDIJevHbQ=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "f4340c1a42c38d79293ba69bfd839fbd6268a538", + "rev": "f46800ac5a6e9f892fe36e50821c5d85794ecc62", "type": "github" }, "original": { @@ -968,18 +1011,18 @@ "nixos-extra-modules": { "inputs": { "devshell": "devshell_3", - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "nixpkgs": [ "nixpkgs" ], "pre-commit-hooks": "pre-commit-hooks_2" }, "locked": { - "lastModified": 1703537346, - "narHash": "sha256-uHS8w7HzkPyPh4K2L0U13A0IUeSI9yugYXgK8xz+CyA=", + "lastModified": 1704474098, + "narHash": "sha256-qeSqlbSQAhvtcBsn0SUpAiGwAqVLMbxOkm6NX+NHNPI=", "owner": "oddlama", "repo": "nixos-extra-modules", - "rev": "4daf3ffd02f7cfb1c9a3c8c95bec21dd078ab26f", + "rev": "7013e9116ddfde2e39a16b6ae8c26d869e2dbe98", "type": "github" }, "original": { @@ -1011,11 +1054,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1703545041, - "narHash": "sha256-nvQA+k1rSszrf4kA4eK2i/SGbzoXyoKHzzyzq/Jca1w=", + "lastModified": 1704786394, + "narHash": "sha256-aJM0ln9fMGWw1+tjyl5JZWZ3ahxAA2gw2ZpZY/hkEMs=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "a15b6e525f5737a47b4ce28445c836996fb2ea8c", + "rev": "b34a6075e9e298c4124e35c3ccaf2210c1f3a43b", "type": "github" }, "original": { @@ -1026,11 +1069,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1703255338, - "narHash": "sha256-Z6wfYJQKmDN9xciTwU3cOiOk+NElxdZwy/FiHctCzjU=", + "lastModified": 1704722960, + "narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6df37dc6a77654682fe9f071c62b4242b5342e04", + "rev": "317484b1ead87b9c1b8ac5261a8d2dd748a0492d", "type": "github" }, "original": { @@ -1042,11 +1085,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1703378839, - "narHash": "sha256-wJDrJji9XNMgAsO+Ah34BaraG8bAw9GF7poJQPE0TqU=", + "lastModified": 1704588527, + "narHash": "sha256-YECXW8P0bqFM5e65Mu2fL4wZlonNWCuNEk7UQPsuJZ0=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "9b3a550ca7d42f5ceb3acc13f95dae1a69e6de56", + "rev": "be8e58791dcfa2b98b512c2a1bdf3bd94a38790b", "type": "github" }, "original": { @@ -1119,22 +1162,6 @@ "type": "github" } }, - "nixpkgs-stable_5": { - "locked": { - "lastModified": 1685801374, - "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c37ca420157f4abc31e26f436c1145f8951ff373", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-wayland": { "inputs": { "flake-compat": "flake-compat_4", @@ -1145,11 +1172,11 @@ ] }, "locked": { - "lastModified": 1703502790, - "narHash": "sha256-BMwU2OD7PB0ikWABs58c6kRkzxznIF/G8tacr9pENmE=", + "lastModified": 1704684968, + "narHash": "sha256-h+lSV/cfnfE5//dHefL154mgvaEmTz13ehI7eb/Hph0=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "95c67444c1886ed3cddd54da947237682c211c39", + "rev": "17d7827cd61e7e6bdc732c4817ea4da26ab0b47b", "type": "github" }, "original": { @@ -1175,22 +1202,6 @@ } }, "nixpkgs_3": { - "locked": { - "lastModified": 1686277352, - "narHash": "sha256-quryYLnntwZZrwJ4Vsx24hiCkwiYZAEttiOu983akGg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a9fa8f8450a2ae296f152a9b3d52df68d24b7cfc", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 1686020360, "narHash": "sha256-Wee7lIlZ6DIZHHLiNxU5KdYZQl0iprENXa/czzI6Cj4=", @@ -1206,7 +1217,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1700856099, "narHash": "sha256-RnEA7iJ36Ay9jI0WwP+/y4zjEhmeN6Cjs9VOFBH7eVQ=", @@ -1222,39 +1233,22 @@ "type": "github" } }, - "nixseparatedebuginfod": { - "inputs": { - "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_3" - }, - "locked": { - "lastModified": 1703073600, - "narHash": "sha256-XSEHNoc3h21foVeR28KgfiBTRHyUh+GJ52LMD2xFHfA=", - "owner": "symphorien", - "repo": "nixseparatedebuginfod", - "rev": "c64424332b6198ed1411917232a2b0e3794dd09b", - "type": "github" - }, - "original": { - "owner": "symphorien", - "repo": "nixseparatedebuginfod", - "type": "github" - } - }, "nixvim": { "inputs": { - "flake-utils": "flake-utils_6", + "flake-parts": "flake-parts_3", + "home-manager": "home-manager_2", + "nix-darwin": "nix-darwin", "nixpkgs": [ "nixpkgs" ], "pre-commit-hooks": "pre-commit-hooks_3" }, "locked": { - "lastModified": 1703435563, - "narHash": "sha256-BDnoVc9Kvc9wo9lt8GC0kkqwLedP7lnBBdh1UHl4cPw=", + "lastModified": 1704812275, + "narHash": "sha256-uRe8BdZhuSiupXOxohaVP8LzJtBRG+ETP9PgzR60orI=", "owner": "nix-community", "repo": "nixvim", - "rev": "c11158c73e9a488d803356127a54af8101fc0051", + "rev": "b4ddb322889e2daf41333b4dbca2555da2e8bb7e", "type": "github" }, "original": { @@ -1353,20 +1347,23 @@ "pre-commit-hooks_3": { "inputs": { "flake-compat": "flake-compat_5", - "flake-utils": "flake-utils_7", + "flake-utils": "flake-utils_6", "gitignore": "gitignore_4", "nixpkgs": [ "nixvim", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_4" + "nixpkgs-stable": [ + "nixvim", + "nixpkgs" + ] }, "locked": { - "lastModified": 1702456155, - "narHash": "sha256-I2XhXGAecdGlqi6hPWYT83AQtMgL+aa3ulA85RAEgOk=", + "lastModified": 1704668415, + "narHash": "sha256-BMzNHFod53iiU4lkR5WHwqQCFmaCLq85sUCskXneXlA=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "007a45d064c1c32d04e1b8a0de5ef00984c419bc", + "rev": "44493e2b3c3ebcd39a9947e9ed9f2c2af164ec4c", "type": "github" }, "original": { @@ -1385,14 +1382,14 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_5" + "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1703426812, - "narHash": "sha256-aODSOH8Og8ne4JylPJn+hZ6lyv6K7vE5jFo4KAGIebM=", + "lastModified": 1704725188, + "narHash": "sha256-qq8NbkhRZF1vVYQFt1s8Mbgo8knj+83+QlL5LBnYGpI=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "7f35ec30d16b38fe0eed8005933f418d1a4693ee", + "rev": "ea96f0c05924341c551a797aaba8126334c505d2", "type": "github" }, "original": { @@ -1407,7 +1404,7 @@ "agenix-rekey": "agenix-rekey", "devshell": "devshell_2", "disko": "disko", - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "home-manager": "home-manager", "impermanence": "impermanence", "lanzaboote": "lanzaboote", @@ -1417,12 +1414,11 @@ "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "nixpkgs-wayland": "nixpkgs-wayland", - "nixseparatedebuginfod": "nixseparatedebuginfod", "nixvim": "nixvim", "pre-commit-hooks": "pre-commit-hooks_4", "spicetify-nix": "spicetify-nix", "stylix": "stylix", - "systems": "systems_11", + "systems": "systems_10", "templates": "templates", "wired-notify": "wired-notify" } @@ -1454,15 +1450,15 @@ }, "spicetify-nix": { "inputs": { - "flake-utils": "flake-utils_8", - "nixpkgs": "nixpkgs_4" + "flake-utils": "flake-utils_7", + "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1699986787, - "narHash": "sha256-eYlLWibKtHN/uWJQLzOMRXpoTbO6VcFTfVY4dpgdJcQ=", + "lastModified": 1704167711, + "narHash": "sha256-kFDq+kf/Di/P8bq5sUP8pVwRkrSVrABksBjMPmLic3s=", "owner": "the-argus", "repo": "spicetify-nix", - "rev": "3c702af1f717b7876fac08809201b1368d0d956c", + "rev": "1325416f951d6a82cfddb1289864ad782e2b87c4", "type": "github" }, "original": { @@ -1482,15 +1478,15 @@ "base16-tmux": "base16-tmux", "base16-vim": "base16-vim", "flake-compat": "flake-compat_7", - "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_5" + "home-manager": "home-manager_3", + "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1703528325, - "narHash": "sha256-ajoMmEPbLhp9xsReDDQFaY7xX+ayIqwfMlZNg8YxHnw=", + "lastModified": 1704308480, + "narHash": "sha256-88ICCdJyYYtsolRnPhI9IF+bhUIVUyhJ7nrKcKPgf6M=", "owner": "danth", "repo": "stylix", - "rev": "7ccd1293a48f01eace7d0ce8d82af51919105b76", + "rev": "9bc1900b6888efdda39c2e02c7c8666911b72608", "type": "github" }, "original": { @@ -1529,21 +1525,6 @@ "type": "github" } }, - "systems_11": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "systems_2": { "locked": { "lastModified": 1681028828, diff --git a/flake.nix b/flake.nix index d3d3086..22a87cd 100644 --- a/flake.nix +++ b/flake.nix @@ -65,15 +65,12 @@ devshell = { url = "github:numtide/devshell"; inputs.nixpkgs.follows = "nixpkgs"; - inputs.systems.follows = "systems"; }; nix-index-database = { url = "github:nix-community/nix-index-database"; inputs.nixpkgs.follows = "nixpkgs"; }; - nixseparatedebuginfod.url = "github:symphorien/nixseparatedebuginfod"; - lanzaboote = { url = "github:nix-community/lanzaboote/v0.3.0"; diff --git a/modules/config/default.nix b/modules/config/default.nix index fb59239..50337fd 100644 --- a/modules/config/default.nix +++ b/modules/config/default.nix @@ -30,7 +30,6 @@ inputs.agenix.nixosModules.default inputs.agenix-rekey.nixosModules.default inputs.disko.nixosModules.disko - inputs.nixseparatedebuginfod.nixosModules.default inputs.lanzaboote.nixosModules.lanzaboote inputs.nixvim.nixosModules.nixvim inputs.nixos-extra-modules.nixosModules.default diff --git a/pkgs/deploy.nix b/pkgs/deploy.nix index 7d1d484..6518bcc 100644 --- a/pkgs/deploy.nix +++ b/pkgs/deploy.nix @@ -1,6 +1,7 @@ { symlinkJoin, writeShellApplication, + nix-output-monitor, }: let deploy = writeShellApplication { name = "deploy"; @@ -158,7 +159,7 @@ echo -e "Building toplevels for \033[0;32m''${#HOSTS[*]} hosts\033[0m" - nix build --print-out-paths --no-link "''${OPTIONS[@]}" "''${NIXOS_CONFIGS[@]}" \ + ${nix-output-monitor}/bin/nom build --print-out-paths --no-link "''${OPTIONS[@]}" "''${NIXOS_CONFIGS[@]}" \ || die "Failed building derivations" '';