Regenerated

Droidnix/README.org

@@ -46,7 +46,7 @@ The =generated/= directory contains all generated configurations, divided into t
 ** First Setup
 1. Clone this repository.
 2. Run the setup script: =./setup_droid=.
-3. Edit =.assets/system/conf/base.conf= to choose your window manager (=wm = "hyprland"= or =wm = "mangowc"=).
+3. Edit =.assets/traveldroid/conf/base.conf= to choose your window manager (=wm = "hyprland"= or =wm = "mangowc"=).
 4. Tangle this Org file to generate Nix configurations: =C-c C-v t= in Emacs or use this: =emacs README.org --batch -f org-babel-tangle && emacs --batch --eval "(setq org-html-htmlize-output-type nil)" README.org -f org-html-export-to-html=
 5. Build and switch: =sudo nixos-rebuild switch --flake .#<hostname>=.
 
@@ -683,19 +683,15 @@ let
   username   = config.defaultUser or "henrov";
   moduleName = "stylix";
 
-  # Path to stylix assets
   assetPath = "${flakeRoot}/assets/traveldroid/conf/${moduleName}";
-
-  # Read all files in the asset directory
   assetFiles = builtins.attrNames (builtins.readDir assetPath);
 
-  # Convert files to Home Manager entries (same pattern as hyprland)
+  # Same pattern as hyprland
   stylixFiles = lib.genAttrs assetFiles (f: {
     name = ".config/${moduleName}/${f}";
     value = { source = "${assetPath}/${f}"; };
   });
 
-  # Optional stylix.conf
   stylixConfFile = "${assetPath}/stylix.conf";
   stylixConf =
     if builtins.pathExists stylixConfFile
@@ -707,7 +703,7 @@ let
 in
 {
   #################################
-  # IMPORTANT: Enable Stylix module
+  # Enable Stylix module
   #################################
   imports = [
     stylix.nixosModules.stylix
@@ -722,7 +718,7 @@ in
   ];
 
   #################################
-  # Stylix system configuration
+  # Stylix system config
   #################################
   stylix = {
     enable = true;
@@ -732,7 +728,7 @@ in
 
     targets = {
       gtk.enable = true;
-      qt.enable = true;   # optional but recommended
+      qt.enable = true;
     };
 
     cursor = {
@@ -742,15 +738,16 @@ in
   };
 
   #################################
-  # Home Manager user-level config
+  # Home Manager (safe merge)
   #################################
   _module.args.hmUsers = {
     "${username}" = {
-      home.file = lib.mkMerge (
+      home.file = lib.mkMerge [
-        stylixFiles // {
+        stylixFiles
+        {
           "${moduleName}/stylix.conf".text = stylixConf;
         }
-      );
+      ];
 
       home.sessionVariables = {
         STYLIX_CONF      = "$HOME/.config/stylix/stylix.conf";
@@ -759,6 +756,9 @@ in
         HYPRCURSOR_THEME = cursorName;
         HYPRCURSOR_SIZE  = toString cursorSize;
       };
+
+      # Prevent GTK conflicts with your gtk.nix
+      gtk.theme.name = lib.mkDefault "adw-gtk3";
     };
   };
 }

Droidnix/generated/modules/traveldroid/desktop/stylix.nix

@@ -4,19 +4,15 @@ let
   username   = config.defaultUser or "henrov";
   moduleName = "stylix";
 
-  # Path to stylix assets
   assetPath = "${flakeRoot}/assets/traveldroid/conf/${moduleName}";
-
-  # Read all files in the asset directory
   assetFiles = builtins.attrNames (builtins.readDir assetPath);
 
-  # Convert files to Home Manager entries (same pattern as hyprland)
+  # Same pattern as hyprland
   stylixFiles = lib.genAttrs assetFiles (f: {
     name = ".config/${moduleName}/${f}";
     value = { source = "${assetPath}/${f}"; };
   });
 
-  # Optional stylix.conf
   stylixConfFile = "${assetPath}/stylix.conf";
   stylixConf =
     if builtins.pathExists stylixConfFile
@@ -28,7 +24,7 @@ let
 in
 {
   #################################
-  # IMPORTANT: Enable Stylix module
+  # Enable Stylix module
   #################################
   imports = [
     stylix.nixosModules.stylix
@@ -43,7 +39,7 @@ in
   ];
 
   #################################
-  # Stylix system configuration
+  # Stylix system config
   #################################
   stylix = {
     enable = true;
@@ -53,7 +49,7 @@ in
 
     targets = {
       gtk.enable = true;
-      qt.enable = true;   # optional but recommended
+      qt.enable = true;
     };
 
     cursor = {
@@ -63,15 +59,16 @@ in
   };
 
   #################################
-  # Home Manager user-level config
+  # Home Manager (safe merge)
   #################################
   _module.args.hmUsers = {
     "${username}" = {
-      home.file = lib.mkMerge (
+      home.file = lib.mkMerge [
-        stylixFiles // {
+        stylixFiles
+        {
           "${moduleName}/stylix.conf".text = stylixConf;
         }
-      );
+      ];
 
       home.sessionVariables = {
         STYLIX_CONF      = "$HOME/.config/stylix/stylix.conf";
@@ -80,6 +77,9 @@ in
         HYPRCURSOR_THEME = cursorName;
         HYPRCURSOR_SIZE  = toString cursorSize;
       };
+
+      # Prevent GTK conflicts with your gtk.nix
+      gtk.theme.name = lib.mkDefault "adw-gtk3";
     };
   };
 }