Working on reshuffling

Droidnix/README.org

@@ -1205,20 +1205,27 @@ This file sets up wayland
 ** =generated/modules/apps/thunar.nix=
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 #+BEGIN_SRC nix :tangle generated/modules/apps/thunar.nix :noweb tangle :mkdirp yes :eval never-html
-{
+{ lib, pkgs, ... }:
-  config,
-  pkgs,
-  lib,
-  ...
-}:
 
 let
   username = "henrov"; # vervang door je echte gebruikersnaam
 in
 {
-  home-manager.users.${username} = {
+  flake.nixosModules.thunar = { config, pkgs, lib, ... }:
 
-       # Thunar and plugins
+  {
+    options.mySystem.apps.thunar.enable =
+      lib.mkEnableOption "Enable Thunar file manager";
+
+    config = lib.mkIf (config.mySystem.apps.thunar.enable or false) {
+
+      # --- Home Manager gebruiker ---
+      home-manager.users.${username} = {
+        home.stateVersion = "25.11";
+        home.username = username;
+        home.homeDirectory = "/home/${username}";
+
+        # --- Thunar en plugins ---
         home.packages = with pkgs; [
           thunar
           thunar-volman
@@ -1230,13 +1237,15 @@ in
           xdg-utils
         ];
 
-    # Default file manager
+        # --- Default file manager ---
         xdg.mimeApps = {
           defaultApplications = {
             "inode/directory" = "Thunar.desktop";
           };
         };
       };
+    };
+  };
 }
 #+END_SRC
 

Droidnix/generated/modules/apps/thunar.nix

@@ -1,17 +1,24 @@
-{
+{ lib, pkgs, ... }:
-  config,
-  pkgs,
-  lib,
-  ...
-}:
 
 let
   username = "henrov"; # vervang door je echte gebruikersnaam
 in
 {
-  home-manager.users.${username} = {
+  flake.nixosModules.thunar = { config, pkgs, lib, ... }:
 
-       # Thunar and plugins
+  {
+    options.mySystem.apps.thunar.enable =
+      lib.mkEnableOption "Enable Thunar file manager";
+
+    config = lib.mkIf (config.mySystem.apps.thunar.enable or false) {
+
+      # --- Home Manager gebruiker ---
+      home-manager.users.${username} = {
+        home.stateVersion = "25.11";
+        home.username = username;
+        home.homeDirectory = "/home/${username}";
+
+        # --- Thunar en plugins ---
         home.packages = with pkgs; [
           thunar
           thunar-volman
@@ -23,11 +30,13 @@ in
           xdg-utils
         ];
 
-    # Default file manager
+        # --- Default file manager ---
         xdg.mimeApps = {
           defaultApplications = {
             "inode/directory" = "Thunar.desktop";
           };
         };
       };
+    };
+  };
 }