another another installer attempt

home/dotfiles/default.nix

@@ -4,71 +4,68 @@
 
         (lib.mkIf config.homeconfig.ags.enable {   
             home.file = let 
-                files = [
-                    "ags/bluetooth.js"
-                    "ags/brightness.js"
-                    "ags/clock.js"
-                    "ags/config.js"
-                    "ags/media.js"
-                    "ags/notif.js"
-                    "ags/notification.js"
-                    "ags/power.js"
-                    "ags/settings.js"
-                    "ags/systemtray.js"
-                    "ags/wifi.js"
-                    "ags/workspaces.js"
-                ];
-            in builtins.mapAttrs (n: v: { source = v; target = n; }) (builtins.listToAttrs (builtins.map (_name: { name = ".config/${_name}"; value = ./${_name}; }) files)); 
-        })
-
-         (lib.mkIf config.homeconfig.hyprland.enable {
-            home.file = let 
-                files = [
-                    "Wallpaper/sao.gif"
-                    "Wallpaper/sao.png"
-                    "Wallpaper/ngnl.jpg"
-                    "Wallpaper/llenn.png"
-                    "Wallpaper/sinon.gif"
-                    "Wallpaper/galaxy.jpg"
-                    "Wallpaper/kurisu.gif"
-                    "Wallpaper/kurisu.jpg"
-                    "Wallpaper/rezero.gif"
-                    "Wallpaper/megumin.png"
-                    "Wallpaper/megumin1.gif"
-                    "Wallpaper/megumin2.gif"
-                    "Wallpaper/bluescape.jpg"
-                    "Wallpaper/orangescape.jpg"
-                ];  
-            in builtins.mapAttrs (n: v: { source = v; target = n; }) (builtins.listToAttrs (builtins.map (_name: { name = "Pictures/${_name}"; value = ./${_name}; }) files)); 
+                dir = "ags";
+            in builtins.mapAttrs (
+                n: v: { source = v.value; target = v.name; }) (
+                    builtins.mapAttrs (
+                        _name: _value: {
+                            name = ".config/${dir}/${_name}"; value = ./${dir}/${_name}; 
+                        }
+                    ) (builtins.readDir ./${dir})
+                );
+            
         })
 
         (lib.mkIf config.homeconfig.hyprland.enable {
             home.file = let 
-                files = [
-                    "hypr/otf.conf"
-                    "hypr/pyprland.toml"
-                    "hypr/main.conf"
-                ];  
-            in builtins.mapAttrs (n: v: { source = v; target = n; }) (builtins.listToAttrs (builtins.map (_name: { name = ".config/${_name}"; value = ./${_name}; }) files)); 
+                dir = "Wallpaper";
+            in builtins.mapAttrs (
+                n: v: { source = v.value; target = v.name; }) (
+                    builtins.mapAttrs (
+                        _name: _value: {
+                            name = ".config/${dir}/${_name}"; value = ./${dir}/${_name}; 
+                        }
+                    ) (builtins.readDir ./${dir})
+                );
+        })
+
+        (lib.mkIf config.homeconfig.hyprland.enable {
+            home.file = let 
+                dir = "Wallpaper";
+            in builtins.mapAttrs (
+                n: v: { source = v.value; target = v.name; }) (
+                    builtins.mapAttrs (
+                        _name: _value: {
+                            name = ".config/${dir}/${_name}"; value = ./${dir}/${_name}; 
+                        }
+                    ) (builtins.readDir ./${dir})
+                );
         })
         
         (lib.mkIf config.homeconfig.swaylock.enable {
             home.file = let 
-                files = [
-                    "swaylock/config"
-                ]; 
-            in builtins.mapAttrs (n: v: { source = v; target = n; }) (builtins.listToAttrs (builtins.map (_name: { name = ".config/${_name}"; value = ./${_name}; }) files)); 
+                dir = "swaylock";
+            in builtins.mapAttrs (
+                n: v: { source = v.value; target = v.name; }) (
+                    builtins.mapAttrs (
+                        _name: _value: {
+                            name = ".config/${dir}/${_name}"; value = ./${dir}/${_name}; 
+                        }
+                    ) (builtins.readDir ./${dir})
+                );
         })
         
         (lib.mkIf config.homeconfig.wal.enable {
             home.file = let 
-                files = [
-                    "wal/templates/cava_config"
-                    "wal/templates/colors-ags.css"
-                    "wal/templates/colors-discord.css"
-                    "wal/templates/colors-hypr.conf"
-                ]; 
-            in builtins.mapAttrs (n: v: { source = v; target = n; }) (builtins.listToAttrs (builtins.map (_name: { name = ".config/${_name}"; value = ./${_name}; }) files)); 
+                dir = "wal";
+            in builtins.mapAttrs (
+                n: v: { source = v.value; target = v.name; }) (
+                    builtins.mapAttrs (
+                        _name: _value: {
+                            name = ".config/${dir}/${_name}"; value = ./${dir}/${_name}; 
+                        }
+                    ) (builtins.readDir ./${dir})
+                );
         })
     ];
 }

home/flake.nix

@@ -32,18 +32,6 @@
 
 	        home.homeDirectory = "/home/nathan";
 
-            homeconfig = {
-                calcurse.enable = true;
-                wayvnc.enable = true;
-                rofi.enable = true;
-                mpd.enable = true;
-                wal.enable = true;
-                ags.enable = true;
-                hyprland.enable = true;
-                swaylock.enable = true;
-            };
-
-	
 	        home.pointerCursor = {
 	            gtk.enable = true;
 	            package = pkgs.bibata-cursors;
@@ -58,8 +46,6 @@
 	            iconTheme.name = "Tokyonight-Dark";
 	        };
 
-            externalPackages.enable = true;
-
 	        services.mpris-proxy.enable = true;
 
 	        programs.ssh.enable = true;

home/packages/default.nix

@@ -1,84 +1,101 @@
-{ pkgs, pkgs-us, self, ... }: {
+{ config, lib, pkgs, pkgs-us, self, ... }: {
 
     imports = [ 
 	  self.inputs.scripts.hmModule
 	  self.inputs.external.hmModule
 	];
 
-	nixpkgs.config.allowUnfree = true;
+    options.homeconfig.minimal = lib.options.mkOption {
+        type = lib.types.bool;
+        default = false;
+    };
 
-	home.packages = with pkgs; let
-	  pypkgs = ps: with ps; [
-            numpy
-            pandas
-            torch
-            torchvision
-            torchaudio
-            transformers
-            datasets
-            pyaudio
-            faster-whisper
-            pyusb
-	  ];
+    config = lib.mkMerge [
 
-	in [
+        {
+            home.packages = with pkgs; [
+                killall
+                zip    
+                unzip
+                gcc
+                zulu
+                rsync
+                lxqt.lxqt-policykit
+                blueberry
+                wl-clipboard
+                firefox-wayland
+                xfce.thunar
+                grim
+                slurp
+            ];
+        }
+        
+        (lib.mkIf (!config.homeconfig.minimal) {
 
-          cava 
-          gcc
-          android-tools
-          neovim-remote
+            nixpkgs.config.allowUnfree = true;
 
-          (pkgs.python311.withPackages pypkgs)
-          
-          brightnessctl
-          libdbusmenu-gtk3
-	  zulu
-          lmms
-          killall
-          #unfree {
-          geogebra
-          #}
-          blueberry
-	  wl-clipboard
-          firefox-wayland
+            home.packages = with pkgs; let
+                pypkgs = ps: with ps; [
+                    numpy
+                    pandas
+                    torch
+                    torchvision
+                    torchaudio
+                    transformers
+                    datasets
+                    pyaudio
+                    faster-whisper
+                    pyusb
+                ];
 
-          neofetch
-          pkgs-us.mpv
-          (ncmpcpp.override { visualizerSupport = true; clockSupport = true; })
-          playerctl
-	  mpc-cli
-          xfce.thunar
-          vlc
-          zip    
-          unzip
-          pavucontrol
-          yewtube
-          ytmdl
-          ffmpeg_5
-          lxqt.lxqt-policykit
-          rpi-imager
-          rsync
-	  grim
-	  slurp
-	  tigervnc
-	  keepassxc
-	  httplz
+            in [
 
-	  #school?
-	  #pkgs-us.digital
+                cava 
+                android-tools
+                neovim-remote
 
-          #3D modeling/printing
-          kicad
-          blender
-	  freecad
-          cura
+                (pkgs.python311.withPackages pypkgs)
 
-          #productivity
-          libreoffice
-	  super-productivity
+                brightnessctl
+                libdbusmenu-gtk3
+                lmms
+                #unfree {
+                geogebra
+                #}
 
-	  #games
-	  prismlauncher
-	];
+                neofetch
+                pkgs-us.mpv
+                (ncmpcpp.override { visualizerSupport = true; clockSupport = true; })
+                playerctl
+                mpc-cli
+                vlc
+                pavucontrol
+                yewtube
+                ytmdl
+                ffmpeg_5
+                rpi-imager
+                tigervnc
+                keepassxc
+                httplz
+
+                #school?
+                #pkgs-us.digital
+
+                #3D modeling/printing
+                kicad
+                blender
+                freecad
+                cura
+
+                #productivity
+                libreoffice
+                super-productivity
+
+                #games
+                prismlauncher
+            ];
+
+        })
+    ];
 
 }

home/packages/external/default.nix

@@ -1,13 +1,13 @@
 { config, lib, pkgs, self, ... }: {
 
     options = {
-        externalPackages.enable = lib.options.mkOption {
+        homeconfig.externalPackages.enable = lib.options.mkOption {
             type = lib.types.bool;
             default = false;
         };
     };
 
-    config = lib.mkIf config.externalPackages.enable {
+    config = lib.mkIf config.homeconfig.externalPackages.enable {
         home.packages = [
             self.packages.${pkgs.system}.digital
         ];