Major rework in progress

home/packages/flake.nix

@@ -2,7 +2,6 @@
   description = "Nathan user packages";
 
   inputs = {
-    nixpkgs-old.url = "github:nixos/nixpkgs/nixos-23.11";
     nixpkgs-us.url = "github:nixos/nixpkgs/nixos-unstable";
 
     scripts.url = "./scripts";
@@ -14,103 +13,14 @@
   outputs = { self, ... }@inputs: let 
     system = "x86_64-linux";
 
-    pkgs-old = import inputs.nixpkgs-old { 
-      inherit system;
-      config.allowUnfree = true;
-    };
-
     pkgs-us = import inputs.nixpkgs-us {
       inherit system;
       config.allowUnfree = true;
     };
 
-  in {
+    in {
 
-    hmModule = { config, lib, pkgs, ... }: {
-
-        imports = [ 
-	  inputs.scripts.hmModule
-	  inputs.external.hmModule
-	];
-
-	nixpkgs.config.allowUnfree = true;
-
-	home.packages = with pkgs; let
-	  pypkgs = ps: with ps; [
-            numpy
-            pandas
-            torch
-            torchvision
-            torchaudio
-            transformers
-            datasets
-            pyaudio
-            faster-whisper
-            pyusb
-	  ];
-
-	in [
-
-          cava 
-          gcc
-          android-tools
-
-          (pkgs.python311.withPackages pypkgs)
-          
-          brightnessctl
-          libdbusmenu-gtk3
-	  zulu
-          lmms
-          killall
-	  youtube-music
-          #unfree {
-          geogebra
-          #}
-          blueberry
-	  wl-clipboard
-          firefox-wayland
-          swaylock-effects
-
-          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
-
-	  #school?
-	  #pkgs-us.digital
-
-          #3D modeling/printing
-          kicad
-          blender
-	  freecad
-          cura
-
-          #productivity
-          libreoffice
-	  super-productivity
-
-	  #games
-	  prismlauncher
-	];
+        hmModule = import ./. { inherit pkgs-us self; };  
 
     };
-
-  };
 }