New Flake Style XPS fix

home.nix

@@ -1,4 +1,4 @@
-{ pkgs, pkgs-unstable, lib, host, user, inputs, ... }:
+{ pkgs, hyper, inputs, ... }:
 {
   imports = [
     ./home-modules/auto-mount.nix
@@ -12,7 +12,6 @@
     ./home-modules/email.nix
     ./home-modules/firefox.nix
     ./home-modules/fish.nix
-    # ./home-modules/foot.nix
     ./home-modules/games.nix
     ./home-modules/gestures.nix
     ./home-modules/ghostty.nix
@@ -32,7 +31,6 @@
     ./home-modules/nixd.nix
     ./home-modules/nvidia.nix
     ./home-modules/nxgs.nix
-    # ./home-modules/nx-gcal-event.nix
     ./home-modules/obs.nix
     ./home-modules/office.nix
     ./home-modules/ollama.nix
@@ -61,12 +59,13 @@
     ./home-modules/yazi.nix
     ./home-modules/zathura.nix
     ./home-modules/zoxide.nix
-  ] ++ (if (host == "NxACE") then [ 
+  ] ++ (if (hyper.host == "NxACE") then [ 
     ./home-modules/nx2site.nix
     ./home-modules/nx2site-backup.nix
   ] else []);
-  home.username = user;
-  home.homeDirectory = "/home/${user}";
+  home.username = hyper.user;
+  # home.homeDirectory = hyper.home; # for some reason you cant use hyper.home here
+    home.homeDirectory = "/home/${hyper.user}";
   home.stateVersion = pkgs.version;
   home.packages = with pkgs; [
     bat
@@ -122,14 +121,14 @@
 
     inputs.zen-browser.packages."${system}".default
     
-  ]) ++ (if host != "NxACE" then (with pkgs; [
+  ] ++ (if hyper.host != "NxACE" then [
     signal-desktop
     obsidian
     zoom-us
     inkscape
-  ]) else (with pkgs-unstable; [
+  ] else {
     
-  ]));
+  });
 
   xdg = {
     enable = true;