From 6656be88fbc5ed5bd1e2f85f5aaa28462ebe70ff Mon Sep 17 00:00:00 2001
From: "info@data-pro.nu" <info@data-pro.nu>
Date: Thu, 19 Mar 2026 07:02:18 +0000
Subject: [PATCH] Working on reshuffling

---
 Droidnix/README.org                        | 53 +++++++++++++---------
 Droidnix/generated/modules/apps/thunar.nix | 53 +++++++++++++---------
 2 files changed, 62 insertions(+), 44 deletions(-)

diff --git a/Droidnix/README.org b/Droidnix/README.org
index 016bdc9a6..85e2397aa 100644
--- a/Droidnix/README.org
+++ b/Droidnix/README.org
@@ -1205,35 +1205,44 @@ 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
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
+{ lib, pkgs, ... }:
 
 let
   username = "henrov"; # vervang door je echte gebruikersnaam
 in
 {
-  home-manager.users.${username} = {
+  flake.nixosModules.thunar = { config, pkgs, lib, ... }:
 
-       # Thunar and plugins
-    home.packages = with pkgs; [
-      thunar
-      thunar-volman
-      thunar-archive-plugin
-      thunar-media-tags-plugin
-      tumbler
-      ffmpegthumbnailer
-      gvfs
-      xdg-utils
-    ];
+  {
+    options.mySystem.apps.thunar.enable =
+      lib.mkEnableOption "Enable Thunar file manager";
 
-    # Default file manager
-    xdg.mimeApps = {
-      defaultApplications = {
-        "inode/directory" = "Thunar.desktop";
+    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
+          thunar-archive-plugin
+          thunar-media-tags-plugin
+          tumbler
+          ffmpegthumbnailer
+          gvfs
+          xdg-utils
+        ];
+
+        # --- Default file manager ---
+        xdg.mimeApps = {
+          defaultApplications = {
+            "inode/directory" = "Thunar.desktop";
+          };
+        };
       };
     };
   };
diff --git a/Droidnix/generated/modules/apps/thunar.nix b/Droidnix/generated/modules/apps/thunar.nix
index ec67db88b..9863e8adb 100644
--- a/Droidnix/generated/modules/apps/thunar.nix
+++ b/Droidnix/generated/modules/apps/thunar.nix
@@ -1,32 +1,41 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
+{ lib, pkgs, ... }:
 
 let
   username = "henrov"; # vervang door je echte gebruikersnaam
 in
 {
-  home-manager.users.${username} = {
+  flake.nixosModules.thunar = { config, pkgs, lib, ... }:
 
-       # Thunar and plugins
-    home.packages = with pkgs; [
-      thunar
-      thunar-volman
-      thunar-archive-plugin
-      thunar-media-tags-plugin
-      tumbler
-      ffmpegthumbnailer
-      gvfs
-      xdg-utils
-    ];
+  {
+    options.mySystem.apps.thunar.enable =
+      lib.mkEnableOption "Enable Thunar file manager";
 
-    # Default file manager
-    xdg.mimeApps = {
-      defaultApplications = {
-        "inode/directory" = "Thunar.desktop";
+    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
+          thunar-archive-plugin
+          thunar-media-tags-plugin
+          tumbler
+          ffmpegthumbnailer
+          gvfs
+          xdg-utils
+        ];
+
+        # --- Default file manager ---
+        xdg.mimeApps = {
+          defaultApplications = {
+            "inode/directory" = "Thunar.desktop";
+          };
+        };
       };
     };
   };