Regenerated

Droidnix/README.org

@@ -624,7 +624,7 @@ in
 { lib, config, pkgs, flakeRoot, ... }:
 
 let
-  # Determine the default username from host config
+  # Default username
   username   = config.defaultUser or "henrov";
   moduleName = "stylix";
   assetPath  = "${flakeRoot}/assets/traveldroid/conf/";
@@ -635,45 +635,39 @@ let
     source = "${assetPath}/${name}";
   });
 
-  # Optional stylix.conf (kept for reference)
+  # Optional stylix.conf
   stylixConfFile = "${assetPath}/stylix.conf";
   stylixConf = if builtins.pathExists stylixConfFile then builtins.readFile stylixConfFile else "";
 
   # Cursor defaults
   cursorName = "phinger-cursors-light";
   cursorSize = 24;
-in
-{
+
+in {
   ############################
   # System-level packages
   ############################
-  environment.systemPackages = [
-    pkgs.feh
-    pkgs.st
+  environment.systemPackages = with pkgs; [
+    feh
+    st
+    stylix
   ];
 
   ############################
   # Home Manager user config
   ############################
   home-manager.users."${username}" = {
-    stylix = {
-      enable = true;
+    # Map all configuration files into ~/.config/stylix/
+    home.file = lib.genAttrs (builtins.attrNames files) (name: {
+      path = "${moduleName}/${name}";
+      source = files.${name}.source;
+    });
 
-      # Enable GTK target for this user
-      targets = {
-        gtk = {
-          enable = true;
-        };
-      };
+    # Optionally write stylix.conf if it exists
+    home.file."${moduleName}/stylix.conf".text = stylixConf;
 
-      # Map all configuration files into ~/.config/stylix/
-      xdg.configFile = lib.mapAttrs' (name: value: {
-        name = "${moduleName}/${name}";
-        value = { inherit (value) source; };
-      }) files;
-    };
-
-    # Session environment variables
+    # GTK target (enabled via config file)
+    # No need to define a `stylix` attribute directly
     home.sessionVariables = {
       STYLIX_CONF      = "$HOME/.config/stylix/stylix.conf";