Working on reshuffling

Droidnix/README.org

@@ -1351,12 +1351,12 @@ This sets up the zsh in the terminal
 { lib, ... }:
 
 let
-  # --- Program-specific values ---
+  # --- Program-specific paths/assets ---
   programName = "zsh";
-  zshAssets = ../../../assets/system/conf/${programName};
-  zshFiles = builtins.readDir zshAssets;
-  files = lib.genAttrs (builtins.attrNames zshFiles) (name: {
-    src = "${zshAssets}/${name}";
+  programAssets = ../../../assets/system/conf/${programName};
+  programFiles = builtins.readDir programAssets;
+  files = lib.genAttrs (builtins.attrNames programFiles) (name: {
+    src = "${programAssets}/${name}";
   });
 in
 {
@@ -1364,16 +1364,16 @@ in
   options.enableZsh =
     lib.mkEnableOption "Enable Zsh terminal with Oh-My-Zsh";
 
-  # Wrap everything in config only if enabled
+  # Wrap everything in config if enabled
   config = lib.mkIf (config.enableZsh or false) (let
-    # Safe reference to defaultUser inside the mkIf
+    # Safe reference to defaultUser inside mkIf
     username = config.defaultUser or "henrov";
   in
   {
     myApps = {
       zsh = {
         enable = true;
-        assetsDir = zshAssets;
+        assetsDir = programAssets;
         files = files;
         user = username;
 
@@ -1422,7 +1422,7 @@ in
         '';
       };
     };
-  ));
+  });
 }
 #+END_SRC