From 89f997e158e651ea384b1bf9a997b4ff81c6c8ab Mon Sep 17 00:00:00 2001
From: uku <uku3lig@gmail.com>
Date: Tue, 14 Nov 2023 17:36:02 +0100
Subject: [PATCH] add mkSystem and dev.nix

---
 .envrc    |  2 +-
 dev.nix   | 14 ++++++++++++++
 flake.nix | 45 ++++++++++++++++++---------------------------
 3 files changed, 33 insertions(+), 28 deletions(-)
 create mode 100644 dev.nix

diff --git a/.envrc b/.envrc
index 005a801..59dfc5d 100644
--- a/.envrc
+++ b/.envrc
@@ -1,2 +1,2 @@
 use flake
-watch_file flake.nix
+watch_file dev.nix
diff --git a/dev.nix b/dev.nix
new file mode 100644
index 0000000..f0ec0f5
--- /dev/null
+++ b/dev.nix
@@ -0,0 +1,14 @@
+{
+  perSystem = {pkgs, ...}: {
+    devShells.default = pkgs.mkShell {
+      packages = with pkgs; [
+        alejandra
+        fzf
+        just
+        nil
+      ];
+    };
+
+    formatter = pkgs.alejandra;
+  };
+}
diff --git a/flake.nix b/flake.nix
index 60ad19f..9fa65df 100644
--- a/flake.nix
+++ b/flake.nix
@@ -41,42 +41,33 @@
     flake-parts.lib.mkFlake {inherit inputs;} {
       systems = ["x86_64-linux"];
 
+      imports = [./dev.nix];
+
       flake = let
-        mkSystem = name:
+        mkSystem = modules: name:
           nixpkgs.lib.nixosSystem {
             system = "x86_64-linux";
-            modules = [
-              ./common.nix
+            modules =
+              [
+                ./${name}
+                ./${name}/hardware-configuration.nix
 
-              ./${name}
-              ./${name}/hardware-configuration.nix
-
-              {networking.hostName = name;}
-
-              lanzaboote.nixosModules.lanzaboote
-              home-manager.nixosModules.home-manager
-            ];
+                {networking.hostName = name;}
+              ]
+              ++ modules;
             specialArgs = inputs;
           };
-      in {
-        nixosConfigurations = nixpkgs.lib.genAttrs ["fuji" "kilimandjaro"] mkSystem;
-      };
 
-      perSystem = {system, ...}: let
-        pkgs = import nixpkgs {
-          inherit system;
-        };
+        mkDesktop = mkSystem [
+          ./common.nix
+          lanzaboote.nixosModules.lanzaboote
+          home-manager.nixosModules.home-manager
+        ];
       in {
-        devShells.default = pkgs.mkShell {
-          packages = with pkgs; [
-            alejandra
-            fzf
-            just
-            nil
-          ];
+        nixosConfigurations = {
+          fuji = mkDesktop "fuji";
+          kilimandjaro = mkDesktop "kilimandjaro";
         };
-
-        formatter = pkgs.alejandra;
       };
     };
 }