1 files changed, 54 insertions, 34 deletions

diff --git a/flake.nix b/flake.nix
index 68ba540..87af9f8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,7 +17,16 @@
     };
   };
 
-  outputs = { self, nixpkgs, home-manager, unstable, flake-utils, nixgl, ... }:
+  outputs =
+    {
+      self,
+      nixpkgs,
+      home-manager,
+      unstable,
+      flake-utils,
+      nixgl,
+      ...
+    }:
     let
       mkExtraArgs = system: {
         unstablePkgs = import unstable {
@@ -34,48 +43,59 @@
         };
       };
 
-      mkHostConfig = { hostname, system ? "aarch64-darwin" }: {
-        pkgs = import nixpkgs {
-          inherit system;
-	  overlays = [ nixgl.overlay ];
-          config = {
-            allowUnfree = false;
-          };
-        };
-        modules = [ ./hosts/${hostname}/home.nix ];
-        extraSpecialArgs = (mkExtraArgs system) // {
-          inherit hostname;
-          hmLib = home-manager.lib;
-        };
-      };
-    in
-    flake-utils.lib.eachDefaultSystem
-      (system:
-        let
+      mkHostConfig =
+        {
+          hostname,
+          system ? "aarch64-darwin",
+        }:
+        {
           pkgs = import nixpkgs {
             inherit system;
+            overlays = [ nixgl.overlay ];
             config = {
               allowUnfree = false;
             };
           };
-        in
-        {
-          packages = {
-            default = home-manager.packages.${system}.home-manager;
+          modules = [ ./hosts/${hostname}/home.nix ];
+          extraSpecialArgs = (mkExtraArgs system) // {
+            inherit hostname;
+            hmLib = home-manager.lib;
           };
-
-          devShells.default = pkgs.mkShell {
-            buildInputs = with pkgs; [
-              #home-manager
-              home-manager.packages.${system}.home-manager
-              nixpkgs-fmt
-            ];
+        };
+    in
+    flake-utils.lib.eachDefaultSystem (
+      system:
+      let
+        pkgs = import nixpkgs {
+          inherit system;
+          config = {
+            allowUnfree = false;
           };
-        }
-      ) // {
+        };
+      in
+      {
+        packages = {
+          default = home-manager.packages.${system}.home-manager;
+        };
+
+        devShells.default = pkgs.mkShell {
+          buildInputs = with pkgs; [
+            #home-manager
+            home-manager.packages.${system}.home-manager
+            nixpkgs-fmt
+          ];
+        };
+      }
+    )
+    // {
       homeConfigurations = {
-        mentat = home-manager.lib.homeManagerConfiguration (mkHostConfig { hostname = "mentat"; });
-        gheshki = home-manager.lib.homeManagerConfiguration (mkHostConfig { hostname = "gheshki"; system = "x86_64-linux"; });
+        mentat = home-manager.lib.homeManagerConfiguration (mkHostConfig {
+          hostname = "mentat";
+        });
+        gheshki = home-manager.lib.homeManagerConfiguration (mkHostConfig {
+          hostname = "gheshki";
+          system = "x86_64-linux";
+        });
       };
     };
 }