all repos — nixfiles @ 04b417817fecbe833795b366ceba7de299295183

System and user configuration, managed by nix and home-manager

flake: remove flake-utils

Alan Pearce
commit

04b417817fecbe833795b366ceba7de299295183

parent

9a03dea680aeb8a886dec878b7a5c9f388e52587

1 file changed, 20 insertions(+), 12 deletions(-)

changed files
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; };