Move izanagi configs to new structure

flake.nix

@@ -92,7 +92,7 @@
     };
 
     mkComputer = configurationNix: extraModules: username: inputs.nixpkgs.lib.nixosSystem {
-      specialArgs = { inherit inputs pkgs nixos-hardware extraHomeModules username; };
+      specialArgs = { inherit inputs nixos-hardware extraHomeModules username; };
 
       modules = [
         disko.nixosModules.disko
@@ -103,7 +103,7 @@
     };
 
     mkUnstableComputer = configurationNix: extraModules: username: inputs.unstable.lib.nixosSystem {
-      specialArgs = { inherit inputs upkgs nixos-hardware extraHomeModules username; };
+      specialArgs = { inherit inputs nixos-hardware extraHomeModules username; };
 
       modules = [
         disko.nixosModules.disko
@@ -145,35 +145,22 @@
       ###
       # Proxmox Remote Dev Machine
       ###
-      izanagi-minimal =
-        let
-          username = "izanagi";
-        in nixpkgs.lib.nixosSystem {
-          specialArgs = {inherit inputs outputs extraHomeModules username;};
-          modules = [
-            disko.nixosModules.disko
-            home-manager.nixosModules.home-manager
-            ./machines/izanagi-minimal
-          ];
-        };
-      izanagi =
-        let
-          username = "izanagi";
-        in nixpkgs.lib.nixosSystem {
-          specialArgs = {inherit inputs outputs extraHomeModules username;};
-          modules = [
-            disko.nixosModules.disko
-            home-manager.nixosModules.home-manager
+      izanagi-minimal = mkComputer
+        ./machines/izanagi/minimal
+        []
+        "izanagi";
+      izanagi = mkComputer
+        ./machines/izanagi/main
+        [
           sops-nix.nixosModules.sops
 
           # Applications
           inputs.copyparty.nixosModules.default
           inputs.vscode-server.nixosModules.default
 
-            ./machines/izanagi
           ./modules
-          ];
-        };
+        ]
+        "izanagi";
 
       ###
       # Omen Laptop

machines/fujin/minimal/default.nix

@@ -3,9 +3,9 @@
 {
   imports = [
     ../../minimal.nix
+
     ../hardware-configuration.nix
     ../disko-config.nix
-
   ];
 
   users.users.${username} = {

machines/izanagi/main/default.nix

@@ -91,8 +91,6 @@ in {
       # This is fujin root user ssh key, it needs to be updated if fujin is reinstalled
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDbNm8WiTyYxEv0Hb9V/E84WH3fiCwWeYG9da8sDaU0V root@nixos"
     ];
-
-    shell = pkgs.zsh;
   };
 
   environment.systemPackages = with pkgs; [

machines/izanagi/minimal/default.nix

@@ -13,8 +13,10 @@ let
 in {
   imports =
     [
-      ./hardware-configuration.nix
-      ./disko-config.nix
+      ../../minimal.nix
+
+      ../hardware-configuration.nix
+      ../disko-config.nix
     ];
 
   nixpkgs = {
@@ -85,8 +87,6 @@ in {
     openssh.authorizedKeys.keys = [
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBcGhVpjmWEw1GEw0y/ysJPa2v3+u/Rt/iES/Se2huH2 alexander0derevianko@gmail.com"
     ];
-
-    shell = pkgs.zsh;
   };
 
   environment.systemPackages = with pkgs; [