Working on reshuffling

Droidnix/README.org

@@ -1072,36 +1072,56 @@ This is top file of this level which contains just an import statement for all r
 { lib, pkgs, ... }:
 
 let
-  username = "henrov"; # vervang door je echte gebruikersnaam
+  programName = "thunar";
+
+  # Default user fallback
+  defaultUser = "henrov";
+
 in
 {
   flake.nixosModules.thunar = { config, pkgs, lib, ... }:
 
-  {
+  let
-    options.mySystem.apps.thunar.enable =
+    # Toggle variable pointing to the option
+    enableProgram = config.myApps.${programName}.enable or false;
+
+    # Package list for Thunar and plugins
+    thunarPkgs = with pkgs; [
+      thunar
+      thunar-volman
+      thunar-archive-plugin
+      thunar-media-tags-plugin
+      tumbler
+      ffmpegthumbnailer
+      gvfs
+      xdg-utils
+    ];
+
+  in {
+    # Top-level toggle option
+    options.myApps.${programName}.enable =
       lib.mkEnableOption "Enable Thunar file manager";
 
-    config = lib.mkIf (config.mySystem.apps.thunar.enable or false) {
+    # Wrap everything in mkIf(enable)
+    config = lib.mkIf enableProgram {
 
-      # --- Home Manager gebruiker ---
+      # myApps container
-      home-manager.users.${username} = {
+      myApps = {
+        ${programName} = {
+          enable = true;
+          packages = thunarPkgs;
+          user = config.defaultUser or defaultUser;
+        };
+      };
+
+      # Home Manager user configuration
+      home-manager.users.${config.defaultUser or defaultUser} = {
         home.stateVersion = "26.05";
-        home.username = username;
+        home.username = config.defaultUser or defaultUser;
-        home.homeDirectory = "/home/${username}";
+        home.homeDirectory = "/home/${config.defaultUser or defaultUser}";
+        home.packages = thunarPkgs;
 
-        # --- Thunar en plugins ---
+        # Default file manager
-        home.packages = with pkgs; [
-          thunar
-          thunar-volman
-          thunar-archive-plugin
-          thunar-media-tags-plugin
-          tumbler
-          ffmpegthumbnailer
-          gvfs
-          xdg-utils
-        ];
-
-        # --- Default file manager ---
         xdg.mimeApps = {
           defaultApplications = {
             "inode/directory" = "Thunar.desktop";

Droidnix/generated/modules/apps/thunar.nix

@@ -1,36 +1,56 @@
 { lib, pkgs, ... }:
 
 let
-  username = "henrov"; # vervang door je echte gebruikersnaam
+  programName = "thunar";
+
+  # Default user fallback
+  defaultUser = "henrov";
+
 in
 {
   flake.nixosModules.thunar = { config, pkgs, lib, ... }:
 
-  {
+  let
-    options.mySystem.apps.thunar.enable =
+    # Toggle variable pointing to the option
+    enableProgram = config.myApps.${programName}.enable or false;
+
+    # Package list for Thunar and plugins
+    thunarPkgs = with pkgs; [
+      thunar
+      thunar-volman
+      thunar-archive-plugin
+      thunar-media-tags-plugin
+      tumbler
+      ffmpegthumbnailer
+      gvfs
+      xdg-utils
+    ];
+
+  in {
+    # Top-level toggle option
+    options.myApps.${programName}.enable =
       lib.mkEnableOption "Enable Thunar file manager";
 
-    config = lib.mkIf (config.mySystem.apps.thunar.enable or false) {
+    # Wrap everything in mkIf(enable)
+    config = lib.mkIf enableProgram {
 
-      # --- Home Manager gebruiker ---
+      # myApps container
-      home-manager.users.${username} = {
+      myApps = {
+        ${programName} = {
+          enable = true;
+          packages = thunarPkgs;
+          user = config.defaultUser or defaultUser;
+        };
+      };
+
+      # Home Manager user configuration
+      home-manager.users.${config.defaultUser or defaultUser} = {
         home.stateVersion = "26.05";
-        home.username = username;
+        home.username = config.defaultUser or defaultUser;
-        home.homeDirectory = "/home/${username}";
+        home.homeDirectory = "/home/${config.defaultUser or defaultUser}";
+        home.packages = thunarPkgs;
 
-        # --- Thunar en plugins ---
+        # Default file manager
-        home.packages = with pkgs; [
-          thunar
-          thunar-volman
-          thunar-archive-plugin
-          thunar-media-tags-plugin
-          tumbler
-          ffmpegthumbnailer
-          gvfs
-          xdg-utils
-        ];
-
-        # --- Default file manager ---
         xdg.mimeApps = {
           defaultApplications = {
             "inode/directory" = "Thunar.desktop";