Working on reshuffling

Droidnix/README.org

@@ -1003,15 +1003,22 @@ let
   enableProgram = config.enableThunar or false;
 in
 {
+  # Top-level toggle
   options.enableThunar = lib.mkEnableOption "Enable Thunar file manager";
 
+  # Config assignments
   config = lib.mkIf enableProgram {
-    myApps.thunar = {
+    # Replace myApps.thunar with programs.thunar (or your own flat container)
+    programs.thunar = {
       user = config.defaultUser or "henrov";
-      # Add extra Thunar config if needed
+      # Add extra Thunar options here
     };
 
-    packages = [ pkgs.thunar pkgs.thunar-plugins pkgs.xarchiver ];
+    environment.systemPackages = [
+      pkgs.thunar
+      pkgs.thunar-plugins
+      pkgs.xarchiver
+    ];
   };
 }
 #+END_SRC

Droidnix/generated/modules/apps/thunar.nix

@@ -4,14 +4,21 @@ let
   enableProgram = config.enableThunar or false;
 in
 {
+  # Top-level toggle
   options.enableThunar = lib.mkEnableOption "Enable Thunar file manager";
 
+  # Config assignments
   config = lib.mkIf enableProgram {
-    myApps.thunar = {
+    # Replace myApps.thunar with programs.thunar (or your own flat container)
+    programs.thunar = {
       user = config.defaultUser or "henrov";
-      # Add extra Thunar config if needed
+      # Add extra Thunar options here
     };
 
-    packages = [ pkgs.thunar pkgs.thunar-plugins pkgs.xarchiver ];
+    environment.systemPackages = [
+      pkgs.thunar
+      pkgs.thunar-plugins
+      pkgs.xarchiver
+    ];
   };
 }