From 3c0089c26f38738120040b137c70e74f5a746cc4 Mon Sep 17 00:00:00 2001
From: Kabbone <tobias@opel-online.de>
Date: Tue, 19 Dec 2023 16:03:43 +0100
Subject: [PATCH] hosts: rearrange order in hosts

---
 hosts/default.nix      | 50 +++++++++++++++++++++---------------------
 hosts/desktop/home.nix |  1 +
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/hosts/default.nix b/hosts/default.nix
index 85fb7ce..235eceb 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -135,31 +135,6 @@ in
     ];
   };
 
-  dmz = lib.nixosSystem {                                # Desktop profile
-    inherit system;
-    specialArgs = { inherit inputs user location nixos-hardware nur agenix nixpkgs; };
-    modules = [
-      agenix.nixosModules.default
-      nur.nixosModules.nur
-      microvm.nixosModules.host
-      ./dmz
-      ./configuration_server.nix
-      nixos-hardware.nixosModules.common-pc-ssd
-
-      home-manager.nixosModules.home-manager {
-          nixpkgs.overlays = [
-            nur.overlay
-          ];
-        home-manager.useGlobalPkgs = true;
-        home-manager.useUserPackages = true;
-        home-manager.extraSpecialArgs = { inherit user; };
-        home-manager.users.${user} = {
-        imports = [(import ./home_server.nix)] ++ [(import ./dmz/home.nix)];
-        };
-      }
-    ];
-  };
-
   nasbackup = lib.nixosSystem {                                # Desktop profile
     inherit system;
     #user = "dmz-user";
@@ -213,6 +188,31 @@ in
     ];
   };
 
+  dmz = lib.nixosSystem {                                # Desktop profile
+    inherit system;
+    specialArgs = { inherit inputs user location nixos-hardware nur agenix nixpkgs; };
+    modules = [
+      agenix.nixosModules.default
+      nur.nixosModules.nur
+      microvm.nixosModules.host
+      ./dmz
+      ./configuration_server.nix
+      nixos-hardware.nixosModules.common-pc-ssd
+
+      home-manager.nixosModules.home-manager {
+          nixpkgs.overlays = [
+            nur.overlay
+          ];
+        home-manager.useGlobalPkgs = true;
+        home-manager.useUserPackages = true;
+        home-manager.extraSpecialArgs = { inherit user; };
+        home-manager.users.${user} = {
+        imports = [(import ./home_server.nix)] ++ [(import ./dmz/home.nix)];
+        };
+      }
+    ];
+  };
+
   q920 = lib.nixosSystem {                                # Laptop profile
     inherit system;
     specialArgs = { inherit inputs user location ; };
diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix
index cc63a4b..549e107 100644
--- a/hosts/desktop/home.nix
+++ b/hosts/desktop/home.nix
@@ -35,6 +35,7 @@
       pulsemixer
       #yubioath-flutter
       nitrokey-app
+      kicad
 
       # Display
       #light                              # xorg.xbacklight not supported. Other option is just use xrandr.