Working on reshuffling

Droidnix/README.org

@@ -1069,7 +1069,7 @@ in
 ** =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, ... }:
+{ lib, pkgs, config, ... }:
 
 let
   programName = "thunar";
@@ -1077,55 +1077,49 @@ let
   # Default user fallback
   defaultUser = "henrov";
 
-in
+  # Toggle variable pointing to the option
-{
+  enableProgram = config.myApps.${programName}.enable or false;
-  flake.nixosModules.thunar = { config, pkgs, lib, ... }:
 
-  let
+  # Package list for Thunar and plugins
-    # Toggle variable pointing to the option
+  thunarPkgs = with pkgs; [
-    enableProgram = config.myApps.${programName}.enable or false;
+    thunar
+    thunar-volman
+    thunar-archive-plugin
+    thunar-media-tags-plugin
+    tumbler
+    ffmpegthumbnailer
+    gvfs
+    xdg-utils
+  ];
 
-    # Package list for Thunar and plugins
+in {
-    thunarPkgs = with pkgs; [
+  # Top-level toggle option
-      thunar
+  options.myApps.${programName}.enable =
-      thunar-volman
+    lib.mkEnableOption "Enable Thunar file manager";
-      thunar-archive-plugin
-      thunar-media-tags-plugin
-      tumbler
-      ffmpegthumbnailer
-      gvfs
-      xdg-utils
-    ];
 
-  in {
+  # Wrap everything in mkIf(enable)
-    # Top-level toggle option
+  config = lib.mkIf enableProgram {
-    options.myApps.${programName}.enable =
-      lib.mkEnableOption "Enable Thunar file manager";
 
-    # Wrap everything in mkIf(enable)
+    # myApps container
-    config = lib.mkIf enableProgram {
+    myApps = {
-
+      ${programName} = {
-      # myApps container
+        enable = true;
-      myApps = {
+        packages = thunarPkgs;
-        ${programName} = {
+        user = config.defaultUser or defaultUser;
-          enable = true;
-          packages = thunarPkgs;
-          user = config.defaultUser or defaultUser;
-        };
       };
+    };
 
-      # Home Manager user configuration
+    # Home Manager user configuration
-      home-manager.users.${config.defaultUser or defaultUser} = {
+    home-manager.users.${config.defaultUser or defaultUser} = {
-        home.stateVersion = "26.05";
+      home.stateVersion = "26.05";
-        home.username = config.defaultUser or defaultUser;
+      home.username = config.defaultUser or defaultUser;
-        home.homeDirectory = "/home/${config.defaultUser or defaultUser}";
+      home.homeDirectory = "/home/${config.defaultUser or defaultUser}";
-        home.packages = thunarPkgs;
+      home.packages = thunarPkgs;
 
-        # Default file manager
+      # Default file manager
-        xdg.mimeApps = {
+      xdg.mimeApps = {
-          defaultApplications = {
+        defaultApplications = {
-            "inode/directory" = "Thunar.desktop";
+          "inode/directory" = "Thunar.desktop";
-          };
         };
       };
     };

Droidnix/generated/modules/apps/thunar.nix

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