From 2a413052f7a1ca3e9d458aa91d5a776a82fcbb93 Mon Sep 17 00:00:00 2001
From: "info@data-pro.nu" <info@data-pro.nu>
Date: Fri, 6 Mar 2026 23:10:45 +0100
Subject: [PATCH] experimenting with system

---
 .../assets/flake/machines/traveldroid/top.nix |  1 -
 Droidnix/flake.nix                            | 68 ++++++++++++-------
 2 files changed, 42 insertions(+), 27 deletions(-)

diff --git a/Droidnix/assets/flake/machines/traveldroid/top.nix b/Droidnix/assets/flake/machines/traveldroid/top.nix
index 7b98170af..ce224fc33 100644
--- a/Droidnix/assets/flake/machines/traveldroid/top.nix
+++ b/Droidnix/assets/flake/machines/traveldroid/top.nix
@@ -14,7 +14,6 @@
 
   # Minimal settings that must be defined here
   networking.hostName = "traveldroid";
-  system = "x86_64-linux"; # Define the system explicitly
   wm.type = "hyprland"; # Define the window manager type here, mangowc will be made possible in the nerar future.
   # In generated/top.nix the chpice fopr a window manager will be effectuated
 }
diff --git a/Droidnix/flake.nix b/Droidnix/flake.nix
index 48d88028f..484837642 100644
--- a/Droidnix/flake.nix
+++ b/Droidnix/flake.nix
@@ -22,33 +22,49 @@
     hyprland.url = "github:hyprwm/Hyprland";
   };
 
-  outputs = inputs@{ nixpkgs, home-manager, emacs-overlay, catppuccin, zen-browser, hyprland, ... }:
-  let
-    lib = nixpkgs.lib;
-    system = lib.system.system;
-    user = import ./assets/flake/users/henrov.nix;
-    machines = ["traveldroid" "maindroid"];
-  in
-  {
-    nixosConfigurations = lib.genAttrs machines (machine: lib.nixosSystem {
-      inherit system;
-      modules = [
-        # Import machine-specific configurations
-        ./assets/flake/machines/${machine}/top.nix
-
-        # Home Manager and theme modules
-        home-manager.nixosModules.home-manager {
-          home-manager.useGlobalPkgs = true;
-          home-manager.useUserPackages = true;
-          home-manager.extraSpecialArgs = { inherit user inputs; };
-        }
-        inputs.catppuccin.nixosModules.catppuccin
+  outputs =
+    inputs@{
+      nixpkgs,
+      home-manager,
+      emacs-overlay,
+      catppuccin,
+      zen-browser,
+      hyprland,
+      ...
+    }:
+    let
+      lib = nixpkgs.lib;
+      system = "x86_64-linux"; # Define the system explicitly
+      user = import ./assets/flake/users/henrov.nix;
+      machines = [
+        "traveldroid"
+        "maindroid"
       ];
-      specialArgs = { inherit user inputs; };
-    });
+    in
+    {
+      nixosConfigurations = lib.genAttrs machines (
+        machine:
+        lib.nixosSystem {
+          inherit system;
+          modules = [
+            # Import machine-specific configurations
+            ./assets/flake/machines/${machine}/top.nix
 
-    devShells.${system}.default = import ./assets/flake/terminal_shell/devshell.nix {
-      inherit (nixpkgs) mkShell;
+            # Home Manager and theme modules
+            home-manager.nixosModules.home-manager
+            {
+              home-manager.useGlobalPkgs = true;
+              home-manager.useUserPackages = true;
+              home-manager.extraSpecialArgs = { inherit user inputs; };
+            }
+            inputs.catppuccin.nixosModules.catppuccin
+          ];
+          specialArgs = { inherit user inputs; };
+        }
+      );
+
+      devShells.${system}.default = import ./assets/flake/terminal_shell/devshell.nix {
+        inherit (nixpkgs) mkShell;
+      };
     };
-  };
 }