flake: remove flake-utils
2 files changed, 21 insertions(+), 47 deletions(-)
changed files
M flake.lock → flake.lock
@@ -741,8 +741,7 @@ "nur": "nur", "pre-commit-hooks": "pre-commit-hooks", "searchix": "searchix", "srvos": "srvos", - "treefmt-nix": "treefmt-nix_3", - "utils": "utils" + "treefmt-nix": "treefmt-nix_3" } }, "searchix": {@@ -905,21 +904,6 @@ "repo": "default", "type": "github" } }, - "systems_8": { - "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": [@@ -976,24 +960,6 @@ }, "original": { "owner": "numtide", "repo": "treefmt-nix", - "type": "github" - } - }, - "utils": { - "inputs": { - "systems": "systems_8" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", "type": "github" } },
M flake.nix → flake.nix
@@ -67,15 +67,23 @@ treefmt-nix = { url = "github:numtide/treefmt-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; - utils = { - url = "github:numtide/flake-utils"; - }; }; outputs = inputs: with inputs; let + # System types to support. + supportedSystems = [ + "x86_64-linux" + "x86_64-darwin" + "aarch64-linux" + "aarch64-darwin" + ]; + + # Helper function to generate an attrset '{ x86_64-linux = f "x86_64-linux"; ... }'. + forAllSystems = nixpkgs.lib.genAttrs supportedSystems; + readOverlays = path: let@@ -119,7 +127,7 @@ }; in { nixosConfigurations.prefect = nixpkgs.lib.nixosSystem { - system = utils.lib.system.x86_64-linux; + system = "x86_64-linux"; specialArgs = { inherit inputs; }; modules = [@@ -134,7 +142,7 @@ common-gpu-nvidia-nonprime ]); }; nixosConfigurations.nano = nixpkgs.lib.nixosSystem { - system = utils.lib.system.aarch64-linux; + system = "aarch64-linux"; specialArgs = { inherit inputs; }; modules = [ agenix.nixosModules.default@@ -145,7 +153,7 @@ ./system/nano-hardware.nix ]; }; nixosConfigurations.linde = nixpkgs.lib.nixosSystem { - system = utils.lib.system.aarch64-linux; + system = "aarch64-linux"; specialArgs = { inherit inputs; }; modules = [ {@@ -170,7 +178,7 @@ ./private/calendar.nix ]; }; darwinConfigurations.marvin = darwin.lib.darwinSystem { - system = utils.lib.system.aarch64-darwin; + system = "aarch64-darwin"; specialArgs = { inherit inputs; }; modules = [ {@@ -185,7 +193,7 @@ ./packages/modules/darwin/caddy ]; }; homeConfigurations."alan@marvin" = mkHomeConfiguration { - system = utils.lib.system.aarch64-darwin; + system = "aarch64-darwin"; modules = [ ./user/marvin.nix ./private/tabnine.nix@@ -193,7 +201,7 @@ ./private/ssh.nix ]; }; homeConfigurations."alan@prefect" = mkHomeConfiguration { - system = utils.lib.system.x86_64-linux; + system = "x86_64-linux"; modules = [ ./user/prefect.nix ./private/tabnine.nix@@ -201,19 +209,19 @@ ./private/ssh.nix ]; }; homeConfigurations."alan@nano" = mkHomeConfiguration { - system = utils.lib.system.aarch64-linux; + system = "aarch64-linux"; modules = [ ./user/nano.nix ]; }; homeConfigurations."alan@linde" = mkHomeConfiguration { - system = utils.lib.system.aarch64-linux; + system = "aarch64-linux"; modules = [ ./user/server.nix ]; }; } - // utils.lib.eachDefaultSystem ( + // forAllSystems ( system: let pkgs = import nixpkgs { inherit system; };