1 files changed, 27 insertions, 24 deletions

diff --git a/flake.nix b/flake.nix
index ce2ce0a..1ad7ecb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -125,8 +125,10 @@
     impermanence,
     wl-togglescreens,
     sops-nix,
+    flake-utils,
     ...
   } @ attrs: let
+    utils = flake-utils.lib;
     system = "x86_64-linux";
     pkgs = import nixpkgs {
       inherit system;
@@ -147,36 +149,37 @@
         };
       }
     ];
-  in {
-    nixosConfigurations = {
-      thinklappi = nixpkgs.lib.nixosSystem {
-        inherit system;
-        specialArgs = attrs;
-        modules =
-          [
-            ./hosts/thinklappi
-          ]
-          ++ defaultModules;
-      };
-      thinklappi-bootstrap = nixpkgs.lib.nixosSystem {
-        inherit system;
-        specialArgs = attrs;
-        modules = [
-          ./hosts/thinklappi-bootstrap
-          lanzaboote.nixosModules.lanzaboote
-        ];
+  in
+    {
+      nixosConfigurations = {
+        thinklappi = nixpkgs.lib.nixosSystem {
+          inherit system;
+          specialArgs = attrs;
+          modules =
+            [
+              ./hosts/thinklappi
+            ]
+            ++ defaultModules;
+        };
+        thinklappi-bootstrap = nixpkgs.lib.nixosSystem {
+          inherit system;
+          specialArgs = attrs;
+          modules = [
+            ./hosts/thinklappi-bootstrap
+            lanzaboote.nixosModules.lanzaboote
+          ];
+        };
       };
-    };
-    devShells."${system}" = {
-      default = pkgs.mkShell {
+    }
+    // utils.eachDefaultSystem (system: {
+      devShell = pkgs.mkShell {
         packages = with pkgs; [
           nil
           statix
           alejandra
         ];
       };
-    };
 
-    formatter."${system}" = pkgs.alejandra;
-  };
+      formatter = pkgs.alejandra;
+    });
 }