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,11 +1077,6 @@ let
   # Default user fallback
   defaultUser = "henrov";
 
-in
-{
-  flake.nixosModules.thunar = { config, pkgs, lib, ... }:
-
-  let
   # Toggle variable pointing to the option
   enableProgram = config.myApps.${programName}.enable or false;
 
@@ -1097,7 +1092,7 @@ in
     xdg-utils
   ];
 
-  in {
+in {
   # Top-level toggle option
   options.myApps.${programName}.enable =
     lib.mkEnableOption "Enable Thunar file manager";
@@ -1129,7 +1124,6 @@ in
       };
     };
   };
-  };
 }
 #+END_SRC
 

Droidnix/generated/modules/apps/thunar.nix

@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ lib, pkgs, config, ... }:
 
 let
   programName = "thunar";
@@ -6,11 +6,6 @@ let
   # Default user fallback
   defaultUser = "henrov";
 
-in
-{
-  flake.nixosModules.thunar = { config, pkgs, lib, ... }:
-
-  let
   # Toggle variable pointing to the option
   enableProgram = config.myApps.${programName}.enable or false;
 
@@ -26,7 +21,7 @@ in
     xdg-utils
   ];
 
-  in {
+in {
   # Top-level toggle option
   options.myApps.${programName}.enable =
     lib.mkEnableOption "Enable Thunar file manager";
@@ -58,5 +53,4 @@ in
       };
     };
   };
-  };
 }