diff --git a/configuration.nix b/configuration.nix
index 86041e0..a41f14a 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -1,8 +1,7 @@
-{ pkgs, hyper, inputs, ... }:
+{ pkgs, ... }@all: with all;
 {
   imports = [
     inputs.sops-nix.nixosModules.sops
-    inputs.nixpkgs.nixosModules.readOnlyPkgs
 
     ./system-modules/adb.nix
     ./system-modules/auto-mount.nix
@@ -119,8 +118,6 @@
     dmidecode
     file
     parallel
-  # ]) ++ (with pkgs-unstable; [
-  # # sendme
   ]);
 
   environment.variables = {
@@ -140,7 +137,7 @@
 
   system.stateVersion = pkgs.version;
 
-  nixpkgs.pkgs = pkgs;
+  # nixpkgs.pkgs = pkgs;
 
   nix = {
     settings = {
diff --git a/flake.lock b/flake.lock
index 114ad5b..baf2f50 100644
--- a/flake.lock
+++ b/flake.lock
@@ -200,27 +200,6 @@
         "type": "github"
       }
     },
-    "home-manager_2": {
-      "inputs": {
-        "nixpkgs": [
-          "nix-on-droid",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1709445365,
-        "narHash": "sha256-DVv6nd9FQBbMWbOmhq0KVqmlc3y3FMSYl49UXmMcO+0=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "4de84265d7ec7634a69ba75028696d74de9a44a7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
     "hyprcursor": {
       "inputs": {
         "hyprlang": [
@@ -557,55 +536,6 @@
         "type": "github"
       }
     },
-    "nix-formatter-pack": {
-      "inputs": {
-        "nixpkgs": [
-          "nix-on-droid",
-          "nixpkgs"
-        ],
-        "nmd": "nmd",
-        "nmt": "nmt"
-      },
-      "locked": {
-        "lastModified": 1705252799,
-        "narHash": "sha256-HgSTREh7VoXjGgNDwKQUYcYo13rPkltW7IitHrTPA5c=",
-        "owner": "Gerschtli",
-        "repo": "nix-formatter-pack",
-        "rev": "2de39dedd79aab14c01b9e2934842051a160ffa5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Gerschtli",
-        "repo": "nix-formatter-pack",
-        "type": "github"
-      }
-    },
-    "nix-on-droid": {
-      "inputs": {
-        "home-manager": "home-manager_2",
-        "nix-formatter-pack": "nix-formatter-pack",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "nixpkgs-docs": "nixpkgs-docs",
-        "nixpkgs-for-bootstrap": "nixpkgs-for-bootstrap",
-        "nmd": "nmd_2"
-      },
-      "locked": {
-        "lastModified": 1720396533,
-        "narHash": "sha256-UFzk/hZWO1VkciIO5UPaSpJN8s765wsngUSvtJM6d5Q=",
-        "owner": "nix-community",
-        "repo": "nix-on-droid",
-        "rev": "f3d3b8294039f2f9a8fb7ea82c320f29c6b0fe25",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "ref": "release-24.05",
-        "repo": "nix-on-droid",
-        "type": "github"
-      }
-    },
     "nixos-wsl": {
       "inputs": {
         "flake-compat": "flake-compat_3",
@@ -642,38 +572,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-docs": {
-      "locked": {
-        "lastModified": 1705957679,
-        "narHash": "sha256-Q8LJaVZGJ9wo33wBafvZSzapYsjOaNjP/pOnSiKVGHY=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "9a333eaa80901efe01df07eade2c16d183761fa3",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "release-23.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-for-bootstrap": {
-      "locked": {
-        "lastModified": 1720244366,
-        "narHash": "sha256-WrDV0FPMVd2Sq9hkR5LNHudS3OSMmUrs90JUTN+MXpA=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40",
-        "type": "github"
-      }
-    },
     "nixpkgs-latest": {
       "locked": {
         "lastModified": 1750014763,
@@ -784,60 +682,6 @@
         "type": "github"
       }
     },
-    "nmd": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1666190571,
-        "narHash": "sha256-Z1hc7M9X6L+H83o9vOprijpzhTfOBjd0KmUTnpHAVjA=",
-        "owner": "rycee",
-        "repo": "nmd",
-        "rev": "b75d312b4f33bd3294cd8ae5c2ca8c6da2afc169",
-        "type": "gitlab"
-      },
-      "original": {
-        "owner": "rycee",
-        "repo": "nmd",
-        "type": "gitlab"
-      }
-    },
-    "nmd_2": {
-      "inputs": {
-        "nixpkgs": [
-          "nix-on-droid",
-          "nixpkgs-docs"
-        ],
-        "scss-reset": "scss-reset"
-      },
-      "locked": {
-        "lastModified": 1705050560,
-        "narHash": "sha256-x3zzcdvhJpodsmdjqB4t5mkVW22V3wqHLOun0KRBzUI=",
-        "owner": "~rycee",
-        "repo": "nmd",
-        "rev": "66d9334933119c36f91a78d565c152a4fdc8d3d3",
-        "type": "sourcehut"
-      },
-      "original": {
-        "owner": "~rycee",
-        "repo": "nmd",
-        "type": "sourcehut"
-      }
-    },
-    "nmt": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1648075362,
-        "narHash": "sha256-u36WgzoA84dMVsGXzml4wZ5ckGgfnvS0ryzo/3zn/Pc=",
-        "owner": "rycee",
-        "repo": "nmt",
-        "rev": "d83601002c99b78c89ea80e5e6ba21addcfe12ae",
-        "type": "gitlab"
-      },
-      "original": {
-        "owner": "rycee",
-        "repo": "nmt",
-        "type": "gitlab"
-      }
-    },
     "pre-commit-hooks": {
       "inputs": {
         "flake-compat": "flake-compat",
@@ -895,7 +739,6 @@
         "hyprland-plugins": "hyprland-plugins",
         "hyprspace": "hyprspace",
         "lanzaboote": "lanzaboote",
-        "nix-on-droid": "nix-on-droid",
         "nixos-wsl": "nixos-wsl",
         "nixpkgs": "nixpkgs_4",
         "nixpkgs-latest": "nixpkgs-latest",
@@ -946,22 +789,6 @@
         "type": "github"
       }
     },
-    "scss-reset": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1631450058,
-        "narHash": "sha256-muDlZJPtXDIGevSEWkicPP0HQ6VtucbkMNygpGlBEUM=",
-        "owner": "andreymatin",
-        "repo": "scss-reset",
-        "rev": "0cf50e27a4e95e9bb5b1715eedf9c54dee1a5a91",
-        "type": "github"
-      },
-      "original": {
-        "owner": "andreymatin",
-        "repo": "scss-reset",
-        "type": "github"
-      }
-    },
     "sops-nix": {
       "inputs": {
         "nixpkgs": [
diff --git a/flake.nix b/flake.nix
index c89ffec..236348a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -31,13 +31,19 @@
       domain  = "nx2.site";
       home    = "/home/${user}/";
       webroot = "/var/lib/hugo/nx2site/public";
+      pkgs-version = "25.05";
     };
 
-    pkgs = (import nixpkgs { inherit system config; }) // {
-      unstable = import nixpkgs-unstable { inherit system config; };
-      latest   = import nixpkgs-latest   { inherit system config; };
-      version  = "25.05";
-    };
+    pkgs = builtins.removeAttrs (import nixpkgs {
+      inherit system config;
+      overlays = [
+        (final: prev: {
+          unstable = import nixpkgs-unstable { inherit system config; };
+          latest   = import nixpkgs-latest   { inherit system config; };
+          version  = "25.05";
+        })
+      ];
+    }) [ "hyper" "host" ]; # this removes the programs from pkgs so I can use the variable name
 
     nvidia-base = import ./flake-modules/nvidia.nix;
     secrets     = import ./git-crypt/secrets.nix;
@@ -45,16 +51,18 @@
   in {
     nixosConfigurations = let
       make-nixos-system = host: nvidia-settings: nixpkgs.lib.nixosSystem { 
+        inherit pkgs;
         modules = [ ./configuration.nix ];
         specialArgs = let
           hyper = hyper-base // { inherit host; nvidia = (nvidia-base // nvidia-settings); };
-        in { inherit pkgs inputs hyper rice secrets; };
+        in { inherit inputs hyper rice secrets; };
       };
       make-nixos-wsl-system = host: nixpkgs.lib.nixosSystem { 
+        inherit pkgs;
         modules = [ ./nixos-wsl.nix ];
         specialArgs = let
           hyper = hyper-base // { inherit host; };
-        in { inherit pkgs inputs hyper rice; };
+        in { inherit inputs hyper rice; };
       };
     in {
       NxXPS = make-nixos-system "NxXPS" { enable = true; prime = true; }; 
diff --git a/home-modules/bitwarden.nix b/home-modules/bitwarden.nix
index 5bf042d..31ee03f 100644
--- a/home-modules/bitwarden.nix
+++ b/home-modules/bitwarden.nix
@@ -1,4 +1,4 @@
-{ pkgs, hyper, ... }:
+{ pkgs, ... }@all: with all;
 {
   home.packages = with pkgs; [
     bitwarden
diff --git a/home-modules/calendar-campuszeit-fix.nix b/home-modules/calendar-campuszeit-fix.nix
index d15769f..88fd4d6 100644
--- a/home-modules/calendar-campuszeit-fix.nix
+++ b/home-modules/calendar-campuszeit-fix.nix
@@ -1,4 +1,4 @@
-{ pkgs, user, ... }:
+{ pkgs, ... }@all: with all;
 {
   home.packages = let
     u = pkgs.writers.writePython3Bin "nx_fix_campuszeit_python" {
diff --git a/home-modules/calendar.nix b/home-modules/calendar.nix
index 946e6dd..0ae3cd7 100644
--- a/home-modules/calendar.nix
+++ b/home-modules/calendar.nix
@@ -1,4 +1,4 @@
-{ pkgs, hyper, secrets, ... }: let 
+{ pkgs, ... }@all: with all; let
   calendars = with hyper; [
     {
       name = "Preservation";
@@ -85,7 +85,7 @@ in {
         userName = hyper.user; # my globally set username
       };
     };
-  in pkgs.lib.attrsets.mergeAttrsList (
+  in lib.attrsets.mergeAttrsList (
     map (calendar: { 
       "${calendar.name}" = transform_caledar_set ( default_set // calendar );
     }) calendars
@@ -93,7 +93,7 @@ in {
 
   programs.thunderbird.settings = let
     to_safe_name = name: (builtins.replaceStrings ["."] ["-"]) name;
-  in (pkgs.lib.attrsets.mergeAttrsList (
+  in (lib.attrsets.mergeAttrsList (
     map (calendar: with ( default_set // calendar ); {
       "calendar.registry.${to_safe_name calendar.name}.cache.enabled" = true;
       "calendar.registry.${to_safe_name calendar.name}.calendar-main-default" = primary;
@@ -106,7 +106,7 @@ in {
       "calendar.registry.${to_safe_name calendar.name}.readOnly" = read-only;
     }) calendars
   ) // {
-    "calendar.list.sortOrder" = pkgs.lib.fold (calendar: acc: calendar.name + " " + acc) "" calendars;
+    "calendar.list.sortOrder" = lib.fold (calendar: acc: calendar.name + " " + acc) "" calendars;
     "calendar.week.start" = 1;
   });
 }
diff --git a/home-modules/chatterino.nix b/home-modules/chatterino.nix
index b29f256..7a01b1c 100644
--- a/home-modules/chatterino.nix
+++ b/home-modules/chatterino.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, hyper, rice, secrets, ... }:
+{ pkgs, ... }@all: with all;
 let
   channels = [
     "Caedrel"
diff --git a/home-modules/clipboard.nix b/home-modules/clipboard.nix
index 494ef15..95d5a69 100644
--- a/home-modules/clipboard.nix
+++ b/home-modules/clipboard.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, ... }@all: with all;
 {
   services.clipman = {
     package = pkgs.clipman;
diff --git a/home-modules/discord.nix b/home-modules/discord.nix
index 71676eb..a7a98b9 100644
--- a/home-modules/discord.nix
+++ b/home-modules/discord.nix
@@ -1,5 +1,5 @@
-{ pkgs, hyper, ... }: 
-pkgs.lib.mkIf (hyper.host != "NxACE")
+{ pkgs, ... }@all: with all;
+lib.mkIf (hyper.host != "NxACE")
 {
   home = {
     packages = with pkgs; [
diff --git a/home-modules/email.nix b/home-modules/email.nix
index 32ca800..edc8737 100644
--- a/home-modules/email.nix
+++ b/home-modules/email.nix
@@ -1,12 +1,12 @@
-{ pkgs, hyper, rice, secrets, ... }: 
-pkgs.lib.mkIf (hyper.host != "NxACE")
+{ pkgs, ... }@all: with all;
+lib.mkIf (hyper.host != "NxACE")
 {
   home.packages = with pkgs; [
     thunderbird
   ];
 
   programs.thunderbird = let
-    inherit (pkgs.lib.generators) toJSON;
+    inherit (lib.generators) toJSON;
     extensions = toJSON {} {
       "addon@darkreader.org" = "71d6c69d-55f9-4c56-888c-abdcf6efd73d";
     };
diff --git a/home-modules/firefox.nix b/home-modules/firefox.nix
index 21e76eb..bfe0ca2 100644
--- a/home-modules/firefox.nix
+++ b/home-modules/firefox.nix
@@ -1,4 +1,4 @@
-{ pkgs, hyper, rice, ... }:
+{ pkgs, ... }@all: with all;
 # browser.tabs.allow_transparent_browser
 # https://www.reddit.com/r/FirefoxCSS/comments/1dqws4b/firefox_128_will_allow_the_main_browser_content/
 {
diff --git a/home-modules/fish.nix b/home-modules/fish.nix
index 3266405..266c45c 100644
--- a/home-modules/fish.nix
+++ b/home-modules/fish.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }: 
+{ pkgs, ... }@all: with all;
 {
   home.packages = with pkgs; [
     fish
diff --git a/home-modules/games.nix b/home-modules/games.nix
index 1f58b16..4417350 100644
--- a/home-modules/games.nix
+++ b/home-modules/games.nix
@@ -1,5 +1,5 @@
-{ pkgs, hyper, ... }:
-pkgs.lib.mkIf (hyper.host == "NxNORTH")
+{ pkgs, ... }@all: with all;
+lib.mkIf (hyper.host == "NxNORTH")
 {
   home = {
     packages = (with pkgs.unstable; [
diff --git a/home-modules/gestures.nix b/home-modules/gestures.nix
index c025d97..5c61b49 100644
--- a/home-modules/gestures.nix
+++ b/home-modules/gestures.nix
@@ -1,5 +1,5 @@
-{ pkgs, hyper, ... }: 
-pkgs.lib.mkIf (hyper.host == "NxXPS")
+{ pkgs, ... }@all: with all;
+lib.mkIf (hyper.host == "NxXPS")
 {
   home.packages = with pkgs; [
     libinput-gestures
diff --git a/home-modules/ghostty.nix b/home-modules/ghostty.nix
index c28f9e3..19d2e44 100644
--- a/home-modules/ghostty.nix
+++ b/home-modules/ghostty.nix
@@ -1,4 +1,4 @@
-{ pkgs, rice, ... }:
+{ pkgs, ... }@all: with all;
 {
   programs.ghostty = {
     enable = true;
diff --git a/home-modules/gimp.nix b/home-modules/gimp.nix
index 666c41d..d9eee52 100644
--- a/home-modules/gimp.nix
+++ b/home-modules/gimp.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, ... }@all: with all;
 {
   home.packages = with pkgs; [
     # (gimp-with-plugins.override {
diff --git a/home-modules/git.nix b/home-modules/git.nix
index 33920f4..1f96907 100644
--- a/home-modules/git.nix
+++ b/home-modules/git.nix
@@ -1,4 +1,4 @@
-{ pkgs, hyper, rice, ... }: 
+{ pkgs, ... }@all: with all;
 {
   home.packages = with pkgs; [
     delta
@@ -21,10 +21,10 @@
     };
     extraConfig = {
       credential = {
-        "https://git.da.dicos.de".username = pkgs.lib.mkIf (hyper.host =="NxWSL") "lkurzweg";
-        "https://git.da.dicos.de".password = pkgs.lib.mkIf (hyper.host =="NxWSL") "Test";
+        "https://git.da.dicos.de".username = lib.mkIf (hyper.host =="NxWSL") "lkurzweg";
+        "https://git.da.dicos.de".password = lib.mkIf (hyper.host =="NxWSL") "Test";
       };
-      url."ssh://git@git.da.dicos.de/".insteadOf = pkgs.lib.mkIf (hyper.host =="NxWSL") "https://git.da.dicos.de/";
+      url."ssh://git@git.da.dicos.de/".insteadOf = lib.mkIf (hyper.host =="NxWSL") "https://git.da.dicos.de/";
       pull.rebase = false; # true
     };
   };
diff --git a/home-modules/gpg.nix b/home-modules/gpg.nix
index 7a9878f..ddababd 100644
--- a/home-modules/gpg.nix
+++ b/home-modules/gpg.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, ... }@all: with all;
 {
   # there also is a system module
   home.packages = with pkgs; [
diff --git a/home-modules/gtk.nix b/home-modules/gtk.nix
index 078c535..ad88aea 100644
--- a/home-modules/gtk.nix
+++ b/home-modules/gtk.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, rice, ... }:
+{ pkgs, ... }@all: with all;
 let
   # theme-name = "Colloid-Pink-Dark-Compact";
   # theme-package = pkgs.colloid-gtk-theme.override {
diff --git a/home-modules/helix.nix b/home-modules/helix.nix
index 06656a3..237b2fe 100644
--- a/home-modules/helix.nix
+++ b/home-modules/helix.nix
@@ -1,4 +1,4 @@
-{ pkgs, hyper, rice, ... }:
+{ pkgs, ... }@all: with all;
 {
   home = {
     packages = with pkgs; [
@@ -271,7 +271,7 @@
           command = "nixd";
         };
         "style-check" = {
-          command = pkgs.lib.getExe pkgs.vale-ls; 
+          command = lib.getExe pkgs.vale-ls; 
         };
         "language-tool" = {
           command = "${pkgs.ltex-ls}/bin/ltex-ls";
@@ -287,7 +287,7 @@
           ];
         };
         "llm" = {
-          command = pkgs.lib.getExe pkgs.helix-gpt; 
+          command = lib.getExe pkgs.helix-gpt; 
           args = [
             "--handler"
             "ollama"
diff --git a/home-modules/hyprland-autoname-workspaces.nix b/home-modules/hyprland-autoname-workspaces.nix
index 5367515..c0d1abf 100644
--- a/home-modules/hyprland-autoname-workspaces.nix
+++ b/home-modules/hyprland-autoname-workspaces.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }: 
+{ pkgs, ... }@all: with all;
 {
   home = {
     packages = with pkgs; [ hyprland-autoname-workspaces ];
diff --git a/home-modules/hyprland.nix b/home-modules/hyprland.nix
index 3103afb..2b253fa 100644
--- a/home-modules/hyprland.nix
+++ b/home-modules/hyprland.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, hyper, inputs, rice, ... }:
+{ pkgs, ... }@all: with all;
 let
   animation-speed = "5";
   transparency = builtins.toString rice.transparency;
diff --git a/home-modules/latex.nix b/home-modules/latex.nix
index a40c574..6511849 100644
--- a/home-modules/latex.nix
+++ b/home-modules/latex.nix
@@ -1,5 +1,5 @@
-{ pkgs, hyper, ... }:
-pkgs.lib.mkIf (hyper.host != "NxACE")
+{ pkgs, ... }@all: with all;
+lib.mkIf (hyper.host != "NxACE")
 {
   home.packages = with pkgs; [
     texlab # LSP
diff --git a/home-modules/mako.nix b/home-modules/mako.nix
index 298516e..f7eb6d0 100644
--- a/home-modules/mako.nix
+++ b/home-modules/mako.nix
@@ -1,4 +1,4 @@
-{ pkgs, rice, ... }:
+{ pkgs, ... }@all: with all;
 {
   home.packages = with pkgs; [ libnotify ];
   services.mako = with rice; {
diff --git a/home-modules/matrix.nix b/home-modules/matrix.nix
index 0968292..937fe9b 100644
--- a/home-modules/matrix.nix
+++ b/home-modules/matrix.nix
@@ -1,4 +1,4 @@
-{ pkgs, hyper, ... }:
+{ pkgs, ... }@all: with all;
 {
   home.packages = with pkgs; [
     # cinny-desktop
diff --git a/home-modules/nh.nix b/home-modules/nh.nix
index 07db55c..eb90a85 100644
--- a/home-modules/nh.nix
+++ b/home-modules/nh.nix
@@ -1,4 +1,4 @@
-{ pkgs, hyper, ... }:
+{ pkgs, ... }@all: with all;
 {
   home = {
     packages = with pkgs; [
diff --git a/home-modules/nixd.nix b/home-modules/nixd.nix
index f2ac5e3..ffd8f9f 100644
--- a/home-modules/nixd.nix
+++ b/home-modules/nixd.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, ... }@all: with all;
 {
 	home.packages = with pkgs; [
     nixd
diff --git a/home-modules/nvidia.nix b/home-modules/nvidia.nix
index fb75673..7ed2531 100644
--- a/home-modules/nvidia.nix
+++ b/home-modules/nvidia.nix
@@ -1,5 +1,5 @@
-{ pkgs, hyper, ... }:
-pkgs.lib.mkIf (hyper.nvidia.enable == true)
+{ pkgs, ... }@all: with all;
+lib.mkIf (hyper.nvidia.enable == true)
 {
   home = {
     packages = with pkgs; [
diff --git a/home-modules/nx-gcal-event.nix b/home-modules/nx-gcal-event.nix
index ac84f96..5c14580 100644
--- a/home-modules/nx-gcal-event.nix
+++ b/home-modules/nx-gcal-event.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, secrets, ... }: let
+{ pkgs, ... }@all: with all;
   sep = " ";
 in {
   home = {
diff --git a/home-modules/nx2site-backup.nix b/home-modules/nx2site-backup.nix
index c744914..faff1fc 100644
--- a/home-modules/nx2site-backup.nix
+++ b/home-modules/nx2site-backup.nix
@@ -1,4 +1,4 @@
-{ pkgs, hyper, ... }:
+{ pkgs, ... }@all: with all;
 {
   home.packages = [
     (pkgs.writeShellApplication {
diff --git a/home-modules/nx2site.nix b/home-modules/nx2site.nix
index 821d1a0..6188172 100644
--- a/home-modules/nx2site.nix
+++ b/home-modules/nx2site.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, ... }@all: with all;
 {
   home.packages = with pkgs; [
     (writeShellApplication {
diff --git a/home-modules/nxgs.nix b/home-modules/nxgs.nix
index 3a79a2d..0f2df4e 100644
--- a/home-modules/nxgs.nix
+++ b/home-modules/nxgs.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, ... }@all: with all;
 {
 	home.packages = with pkgs; [
     ghostscript
diff --git a/home-modules/obs.nix b/home-modules/obs.nix
index eea25f6..5c5861a 100644
--- a/home-modules/obs.nix
+++ b/home-modules/obs.nix
@@ -1,5 +1,5 @@
-{ pkgs, hyper, ... }:
-pkgs.lib.mkIf (hyper.host != "NxACE")
+{ pkgs, ... }@all: with all;
+lib.mkIf (hyper.host != "NxACE")
 {
   #  home.packages = with pkgs; [
   #   obs-studio
diff --git a/home-modules/office.nix b/home-modules/office.nix
index cc9b604..7165c14 100644
--- a/home-modules/office.nix
+++ b/home-modules/office.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, ... }@all: with all;
 {
   home.packages = with pkgs; [
     libreoffice
diff --git a/home-modules/ollama.nix b/home-modules/ollama.nix
index 2be8876..6cc20f9 100644
--- a/home-modules/ollama.nix
+++ b/home-modules/ollama.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, ... }@all: with all;
 {
   home.packages = with pkgs; [
     ollama
diff --git a/home-modules/pandoc.nix b/home-modules/pandoc.nix
index 4ac751e..b2dce0d 100644
--- a/home-modules/pandoc.nix
+++ b/home-modules/pandoc.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }@all: with all;
 {
   home.packages = with pkgs; [
     pandoc
diff --git a/home-modules/pkgs-list/shell.nix b/home-modules/pkgs-list/shell.nix
index 77774ab..f446d54 100644
--- a/home-modules/pkgs-list/shell.nix
+++ b/home-modules/pkgs-list/shell.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, ... }@all: with all;
 {
   home.packages = with pkgs; [
     bat
diff --git a/home-modules/pnx.nix b/home-modules/pnx.nix
index ea976f5..cc4ad74 100644
--- a/home-modules/pnx.nix
+++ b/home-modules/pnx.nix
@@ -1,5 +1,5 @@
-{ pkgs, hyper, secrets, ... }: 
-pkgs.lib.mkIf (hyper.host != "NxACE")
+{ pkgs, ... }@all: with all;
+lib.mkIf (hyper.host != "NxACE")
 {
   home.packages = [
     pkgs.remmina
diff --git a/home-modules/programming/c.nix b/home-modules/programming/c.nix
index fbf33a0..b85aec0 100644
--- a/home-modules/programming/c.nix
+++ b/home-modules/programming/c.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, ... }@all: with all;
 {
   home = {
     packages = with pkgs; [
diff --git a/home-modules/programming/gleam.nix b/home-modules/programming/gleam.nix
index f4a826c..93b1594 100644
--- a/home-modules/programming/gleam.nix
+++ b/home-modules/programming/gleam.nix
@@ -1,5 +1,5 @@
-{ pkgs, hyper, ... }:
-pkgs.lib.mkIf (hyper.host != "NxACE")
+{ pkgs, ... }@all: with all;
+lib.mkIf (hyper.host != "NxACE")
 {
   home.packages = with pkgs; [
     erlang
diff --git a/home-modules/programming/go.nix b/home-modules/programming/go.nix
index c1bd295..40892d5 100644
--- a/home-modules/programming/go.nix
+++ b/home-modules/programming/go.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, ... }@all: with all;
 {
   home = {
     packages = with pkgs; [
diff --git a/home-modules/programming/java.nix b/home-modules/programming/java.nix
index 412d03f..3b3a4eb 100644
--- a/home-modules/programming/java.nix
+++ b/home-modules/programming/java.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, ... }@all: with all;
 {
   home = {
     packages = with pkgs; [
diff --git a/home-modules/programming/js.nix b/home-modules/programming/js.nix
index 668a083..9e12d70 100644
--- a/home-modules/programming/js.nix
+++ b/home-modules/programming/js.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, ... }@all: with all;
 {
   home.packages = with pkgs; [
     nodejs
diff --git a/home-modules/programming/python.nix b/home-modules/programming/python.nix
index da29ebd..0254d79 100644
--- a/home-modules/programming/python.nix
+++ b/home-modules/programming/python.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, ... }@all: with all;
 {
   home = let 
     python-with-packages = pkgs.python3.withPackages (pp: with pp; [
diff --git a/home-modules/rofi.nix b/home-modules/rofi.nix
index 880b5e2..6a1ed01 100644
--- a/home-modules/rofi.nix
+++ b/home-modules/rofi.nix
@@ -1,4 +1,5 @@
-{ pkgs, rice, ... }: {
+{ pkgs, ... }@all: with all;
+{
   home.packages = with pkgs; [
     rofi-wayland
   ];
diff --git a/home-modules/scanning.nix b/home-modules/scanning.nix
index e131d7b..8099241 100644
--- a/home-modules/scanning.nix
+++ b/home-modules/scanning.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, ... }@all: with all;
 {
 	home.packages = with pkgs; [
 		xsane
diff --git a/home-modules/sent.nix b/home-modules/sent.nix
index ec9d731..76172fa 100644
--- a/home-modules/sent.nix
+++ b/home-modules/sent.nix
@@ -1,4 +1,4 @@
-{ pkgs, rice, ... }:
+{ pkgs, ... }@all: with all;
 let 
   my-sent = pkgs.sent.override {
     patches = [
diff --git a/home-modules/sops.nix b/home-modules/sops.nix
index d39bf63..0f730dd 100644
--- a/home-modules/sops.nix
+++ b/home-modules/sops.nix
@@ -1,12 +1,12 @@
-{ pkgs, hyper, inputs, ... }:
+{ pkgs, ... }@all: with all;
 {
   imports = [
     inputs.sops-nix.homeManagerModules.sops
   ];
   
   sops = {
-    age.keyFile = pkgs.lib.mkIf (hyper.host == "NxACE") "${hyper.home}.age_nx2_key_13.txt";
-    gnupg.home = pkgs.lib.mkIf (hyper.host != "NxACE") "${hyper.home}.gnupg";
+    age.keyFile = lib.mkIf (hyper.host == "NxACE") "${hyper.home}.age_nx2_key_13.txt";
+    gnupg.home = lib.mkIf (hyper.host != "NxACE") "${hyper.home}.gnupg";
     defaultSopsFile = ../sops-secrets.yaml;
 
     # %r is $XDG_RUNTIME_DIR
diff --git a/home-modules/ssh.nix b/home-modules/ssh.nix
index f4936ed..cf71ccd 100644
--- a/home-modules/ssh.nix
+++ b/home-modules/ssh.nix
@@ -1,4 +1,4 @@
-{ pkgs, hyper, ... }:
+{ pkgs, ... }@all: with all;
 {
   home = {
     packages = with pkgs; [ sshfs ];
diff --git a/home-modules/starship.nix b/home-modules/starship.nix
index 46c23b5..f8f3943 100644
--- a/home-modules/starship.nix
+++ b/home-modules/starship.nix
@@ -1,4 +1,4 @@
-{ pkgs, rice, ... }: 
+{ pkgs, ... }@all: with all;
 {
   programs.starship = {
     enable = true;
@@ -7,7 +7,7 @@
     enableFishIntegration = true;
     settings = with rice.color; {
       add_newline = false;
-      format = pkgs.lib.strings.concatMapStrings (x: "$" + x) [
+      format = lib.strings.concatMapStrings (x: "$" + x) [
         "jobs"
         "battery"
         "username"
diff --git a/home-modules/tts.nix b/home-modules/tts.nix
index a454241..0f093b6 100644
--- a/home-modules/tts.nix
+++ b/home-modules/tts.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }: 
+{ pkgs, ... }@all: with all;
 {
   home.packages = with pkgs; [
     (writeShellApplication {
diff --git a/home-modules/vale.nix b/home-modules/vale.nix
index 6ec16f7..3c1ea84 100644
--- a/home-modules/vale.nix
+++ b/home-modules/vale.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }: let 
+{ pkgs, ... }@all: with all; let
   vws = pkgs.vale.withStyles (s: [ s.alex s.google ]); 
 in {
   home = {
diff --git a/home-modules/virt-manager.nix b/home-modules/virt-manager.nix
index 882b953..c71a9c2 100644
--- a/home-modules/virt-manager.nix
+++ b/home-modules/virt-manager.nix
@@ -1,5 +1,5 @@
-{ pkgs, hyper, ... }:
-pkgs.lib.mkIf (hyper.host == "NxNORTH")
+{ pkgs, ... }@all: with all;
+lib.mkIf (hyper.host == "NxNORTH")
 {
   home.packages = with pkgs; [
     virt-manager
diff --git a/home-modules/vscode.nix b/home-modules/vscode.nix
index abef521..7aa9608 100644
--- a/home-modules/vscode.nix
+++ b/home-modules/vscode.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, hyper, rice, ... }:
+{ pkgs, ... }@all: with all;
 {
-  config = pkgs.lib.mkIf (hyper.host != "NxACE") {
+  config = lib.mkIf (hyper.host != "NxACE") {
     home.packages = [
       pkgs.vscodium
       pkgs.nixpkgs-fmt
@@ -92,13 +92,13 @@
   #       url = "https://gist.githubusercontent.com/piousdeer/b29c272eaeba398b864da6abf6cb5daa/raw/41e569ba110eb6ebbb463a6b1f5d9fe4f9e82375/mutability.nix";
   #       sha256 = "4b5ca670c1ac865927e98ac5bf5c131eca46cc20abf0bd0612db955bfc979de8";
   #     })
-  #     { inherit config pkgs; lib = pkgs.lib; })
+  #     { inherit config pkgs; lib = lib; })
 
   #   (import
   #     (builtins.fetchurl {
   #       url = "https://gist.githubusercontent.com/piousdeer/b29c272eaeba398b864da6abf6cb5daa/raw/41e569ba110eb6ebbb463a6b1f5d9fe4f9e82375/vscode.nix";
   #       sha256 = "fed877fa1eefd94bc4806641cea87138df78a47af89c7818ac5e76ebacbd025f";
   #     })
-  #     { inherit config pkgs; lib = pkgs.lib; })
+  #     { inherit config pkgs; lib = lib; })
   # ] else [];
 }
diff --git a/home-modules/wallpaper-to-colors.nix b/home-modules/wallpaper-to-colors.nix
index 98744dd..d787178 100644
--- a/home-modules/wallpaper-to-colors.nix
+++ b/home-modules/wallpaper-to-colors.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, ... }@all: with all;
 {
   home.packages = with pkgs; [
     (writers.writePython3Bin "change_colors_json" {
diff --git a/home-modules/waybar.nix b/home-modules/waybar.nix
index ab3b8b9..0827cac 100644
--- a/home-modules/waybar.nix
+++ b/home-modules/waybar.nix
@@ -1,4 +1,4 @@
-{ pkgs, hyper, rice, ... }:
+{ pkgs, ... }@all: with all;
 let
   sep = " ";
 in {
diff --git a/home-modules/wlogout.nix b/home-modules/wlogout.nix
index c005efe..993800d 100644
--- a/home-modules/wlogout.nix
+++ b/home-modules/wlogout.nix
@@ -1,4 +1,4 @@
-{ pkgs, rice,... }:
+{ pkgs, ... }@all: with all;
 {
   home = {
     packages = with pkgs; [ wlogout ];
diff --git a/home-modules/yazi.nix b/home-modules/yazi.nix
index cc081da..5e19436 100644
--- a/home-modules/yazi.nix
+++ b/home-modules/yazi.nix
@@ -1,4 +1,4 @@
-{ pkgs, hyper, rice, inputs, ... }: 
+{ pkgs, ... }@all: with all;
 {
   home.packages = with pkgs; [
     unar
diff --git a/home.nix b/home.nix
index 586ad60..57a7a75 100644
--- a/home.nix
+++ b/home.nix
@@ -1,4 +1,4 @@
-{ pkgs, hyper, ... }:
+{ pkgs, ... }@all: with all;
 {
   imports = [
     ./home-modules/auto-mount.nix
@@ -67,7 +67,7 @@
   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.stateVersion = hyper.pkgs-version;
   home.packages = with pkgs; [
     bat
     brightnessctl
diff --git a/nix-on-droid.nix b/nix-on-droid.nix
index 11e44ca..fe30dc8 100644
--- a/nix-on-droid.nix
+++ b/nix-on-droid.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, ... }@all: with all;
 {
   # Simply install just the packages
   environment.packages = with pkgs; [
diff --git a/nixos-wsl.nix b/nixos-wsl.nix
index c4f003d..b0a9ade 100644
--- a/nixos-wsl.nix
+++ b/nixos-wsl.nix
@@ -1,4 +1,4 @@
-{ pkgs, hyper, inputs, ... }:
+{ pkgs, ... }@all: with all;
 {
   imports = [
     inputs.nixos-wsl.nixosModules.default
diff --git a/shell-only.nix b/shell-only.nix
index 1a14784..bf972ea 100644
--- a/shell-only.nix
+++ b/shell-only.nix
@@ -1,4 +1,4 @@
-{ pkgs, hyper, ... }:
+{ pkgs, ... }@all: with all;
 {
   imports = [
     ./home-modules/bash.nix
diff --git a/system-modules/adb.nix b/system-modules/adb.nix
index 39f2268..10f70b3 100644
--- a/system-modules/adb.nix
+++ b/system-modules/adb.nix
@@ -1,4 +1,4 @@
-{ pkgs, hyper, lib, ... }:
+{ pkgs, ... }@all: with all;
 lib.mkIf (hyper.host != "NxACE")
 {
 	environment.systemPackages = with pkgs; [
diff --git a/system-modules/boot.nix b/system-modules/boot.nix
index c7ed2e6..7660335 100644
--- a/system-modules/boot.nix
+++ b/system-modules/boot.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, hyper, inputs, ... }: 
+{ pkgs, ... }@all: with all;
 let 
   grub-theme-ascii-diana = (pkgs.fetchFromGitea {
     domain = "git.${hyper.domain}";
diff --git a/system-modules/calendar-dicos.nix b/system-modules/calendar-dicos.nix
index 694a8a3..0947cf5 100644
--- a/system-modules/calendar-dicos.nix
+++ b/system-modules/calendar-dicos.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, ... }@all: with all;
 {
   systemd.timers."nx_cal_dicos" = {
     enable = true;
diff --git a/system-modules/calendar-lec.nix b/system-modules/calendar-lec.nix
index 3e3998b..b00c8fc 100644
--- a/system-modules/calendar-lec.nix
+++ b/system-modules/calendar-lec.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, hyper, ... }:
+{ pkgs, ... }@all: with all;
 {
   systemd.timers."nx_cal_lec" = {
     enable = true;
diff --git a/system-modules/calendar-lr.nix b/system-modules/calendar-lr.nix
index 6605ea8..f81f5ab 100644
--- a/system-modules/calendar-lr.nix
+++ b/system-modules/calendar-lr.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, hyper, ... }:
+{ pkgs, ... }@all: with all;
 {
   systemd.timers."nx_cal_lr" = {
     enable = true;
diff --git a/system-modules/calendar-publish.nix b/system-modules/calendar-publish.nix
index 68c648e..3a752d2 100644
--- a/system-modules/calendar-publish.nix
+++ b/system-modules/calendar-publish.nix
@@ -1,4 +1,4 @@
-{ pkgs, hyper, ... }:
+{ pkgs, ... }@all: with all;
 let 
   radicale-root = "/var/lib/radicale";
   web-root = "/var/nginx/webroot";
diff --git a/system-modules/davmail.nix b/system-modules/davmail.nix
index 3960811..39e3427 100644
--- a/system-modules/davmail.nix
+++ b/system-modules/davmail.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, ... }@all: with all;
 
 {
   environment.systemPackages = with pkgs; [
diff --git a/system-modules/dm.nix b/system-modules/dm.nix
index ba22c88..21919d8 100644
--- a/system-modules/dm.nix
+++ b/system-modules/dm.nix
@@ -1,4 +1,4 @@
-{ pkgs, hyper, ... }:
+{ pkgs, ... }@all: with all;
 {
   services.greetd = {
     enable = true;
diff --git a/system-modules/docker.nix b/system-modules/docker.nix
index 7d9d8f7..7ac2530 100644
--- a/system-modules/docker.nix
+++ b/system-modules/docker.nix
@@ -1,4 +1,4 @@
-{ pkgs, hyper, ... }:
+{ pkgs, ... }@all: with all;
 
 {
   environment.systemPackages = with pkgs; [
diff --git a/system-modules/fcitx5.nix b/system-modules/fcitx5.nix
index aba40d0..7c90b01 100644
--- a/system-modules/fcitx5.nix
+++ b/system-modules/fcitx5.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, ... }@all: with all;
 {
   # i18n.inputMethod = {
   #   type = "fcitx5";
diff --git a/system-modules/fonts.nix b/system-modules/fonts.nix
index 4b237d2..5c77519 100644
--- a/system-modules/fonts.nix
+++ b/system-modules/fonts.nix
@@ -1,4 +1,4 @@
-{ pkgs, rice, ... }:
+{ pkgs, ... }@all: with all;
 {
   fonts.packages = with pkgs; [
     noto-fonts
diff --git a/system-modules/fuse.nix b/system-modules/fuse.nix
index 2cd4b24..1d32922 100644
--- a/system-modules/fuse.nix
+++ b/system-modules/fuse.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ...}:
+{ pkgs, ... }@all: with all;
 
 {
   environment = {
diff --git a/system-modules/games.nix b/system-modules/games.nix
index cee2618..5d90705 100644
--- a/system-modules/games.nix
+++ b/system-modules/games.nix
@@ -1,5 +1,5 @@
-{ pkgs, hyper, ... }:
-pkgs.lib.mkIf (hyper.host == "NxNORTH" || hyper.host == "NxACE")
+{ pkgs, ... }@all: with all;
+lib.mkIf (hyper.host == "NxNORTH" || hyper.host == "NxACE")
 {
   programs = {
     steam = {
diff --git a/system-modules/gpg.nix b/system-modules/gpg.nix
index a483e0b..ea43f82 100644
--- a/system-modules/gpg.nix
+++ b/system-modules/gpg.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, ... }@all: with all;
 {
   environment.systemPackages = with pkgs; [
     gnupg
diff --git a/system-modules/hardware-configuration.nix b/system-modules/hardware-configuration.nix
index 4217bdb..57a9a4a 100644
--- a/system-modules/hardware-configuration.nix
+++ b/system-modules/hardware-configuration.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, hyper, modulesPath, ... }:
+{ pkgs, ... }@all: with all;
 {
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
@@ -29,19 +29,19 @@
     { device = "/dev/disk/by-label/swap"; }
   ];
 
-  networking.useDHCP = pkgs.lib.mkDefault true;
+  networking.useDHCP = lib.mkDefault true;
 
-  hardware.cpu.intel.updateMicrocode = pkgs.lib.mkDefault config.hardware.enableRedistributableFirmware;
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 
   # from nixos-hardware
-  services.thermald.enable = pkgs.lib.mkDefault true;
+  services.thermald.enable = lib.mkDefault true;
   boot.extraModprobeConfig = if hyper.host == "NxXPS" then ''
     options iwlwifi 11n_disable=8
   '' else "";
   boot.initrd.kernelModules = if hyper.host == "NxXPS" then [ "i915" ] else [];
 
   environment.variables = if hyper.host == "NxXPS" then {
-    VDPAU_DRIVER = pkgs.lib.mkIf config.hardware.graphics.enable (pkgs.lib.mkDefault "va_gl");
+    VDPAU_DRIVER = lib.mkIf config.hardware.graphics.enable (lib.mkDefault "va_gl");
   } else {};
 
   hardware.graphics.extraPackages = if hyper.host == "NxXPS" then with pkgs; [
diff --git a/system-modules/health_reminder.nix b/system-modules/health_reminder.nix
index e7f0f17..68772f4 100644
--- a/system-modules/health_reminder.nix
+++ b/system-modules/health_reminder.nix
@@ -1,5 +1,5 @@
-{ pkgs, hyper, ... }:
-pkgs.lib.mkIf (hyper.host != "NxACE")
+{ pkgs, ... }@all: with all;
+lib.mkIf (hyper.host != "NxACE")
 {
   systemd.timers."health_reminder" = {
     enable = true;
diff --git a/system-modules/hsmw.nix b/system-modules/hsmw.nix
index e0255dd..18b1492 100644
--- a/system-modules/hsmw.nix
+++ b/system-modules/hsmw.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, host, secrets, ... }: 
+{ pkgs, ... }@all: with all;
 {
   environment.systemPackages = with pkgs; [
     strongswanNM
diff --git a/system-modules/hugo.nix b/system-modules/hugo.nix
index 0c1ee73..36d9e86 100644
--- a/system-modules/hugo.nix
+++ b/system-modules/hugo.nix
@@ -1,4 +1,4 @@
-{ pkgs, hyper, ... }: 
+{ pkgs, ... }@all: with all;
 let p = pkgs; in
 {
   environment.systemPackages = with p; [
diff --git a/system-modules/kanata.nix b/system-modules/kanata.nix
index 6347ff5..e6259f0 100644
--- a/system-modules/kanata.nix
+++ b/system-modules/kanata.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, ... }@all: with all;
 {
 	services.kanata = {
     enable = true;
diff --git a/system-modules/kodi.nix b/system-modules/kodi.nix
index 8b2ec09..e592fd4 100644
--- a/system-modules/kodi.nix
+++ b/system-modules/kodi.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, host, ... }:
+{ pkgs, ... }@all: with all;
 lib.mkIf (host == "NxACE")
 {}
 # {
diff --git a/system-modules/networking.nix b/system-modules/networking.nix
index 9224f26..0092696 100644
--- a/system-modules/networking.nix
+++ b/system-modules/networking.nix
@@ -1,4 +1,4 @@
-{ pkgs, hyper, secrets, ... }:
+{ pkgs, ... }@all: with all;
 {
   # sops.secrets = {
   #   "wireless-networking.env" = {};
diff --git a/system-modules/nvidia.nix b/system-modules/nvidia.nix
index bb81d13..c899f9c 100644
--- a/system-modules/nvidia.nix
+++ b/system-modules/nvidia.nix
@@ -1,5 +1,5 @@
-{ config, pkgs, hyper, ... }: 
-pkgs.lib.mkIf hyper.nvidia.enable 
+{ pkgs, ... }@all: with all;
+lib.mkIf hyper.nvidia.enable 
 {
   environment.systemPackages = with pkgs; [
     lshw
@@ -21,7 +21,7 @@ pkgs.lib.mkIf hyper.nvidia.enable
 
   hardware = {
     nvidia = {
-      prime = pkgs.lib.mkIf hyper.nvidia.prime {
+      prime = lib.mkIf hyper.nvidia.prime {
         intelBusId = "PCI:0:2:0";
         nvidiaBusId = "PCI:1:0:0";
         offload = {
diff --git a/system-modules/nx2site.nix b/system-modules/nx2site.nix
index 993c8f4..795994b 100644
--- a/system-modules/nx2site.nix
+++ b/system-modules/nx2site.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, hyper, secrets, ... }:
+{ pkgs, ... }@all: with all;
 let dns-user = "cloudflare"; in
 {
   sops.secrets = {
diff --git a/system-modules/nx2site/audiobookshelf.nix b/system-modules/nx2site/audiobookshelf.nix
index 9efedf6..5398a80 100644
--- a/system-modules/nx2site/audiobookshelf.nix
+++ b/system-modules/nx2site/audiobookshelf.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, ... }@all: with all;
 {
   services = {
     audiobookshelf = {
diff --git a/system-modules/nx2site/dyn_dns.nix b/system-modules/nx2site/dyn_dns.nix
index 4b66574..f245bab 100644
--- a/system-modules/nx2site/dyn_dns.nix
+++ b/system-modules/nx2site/dyn_dns.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, hyper, ... }: 
+{ pkgs, ... }@all: with all;
 {
   sops.secrets = {
     # "nx2site/namecheap.pw" = { };
diff --git a/system-modules/nx2site/gitea.nix b/system-modules/nx2site/gitea.nix
index 96bdb10..9afb95a 100644
--- a/system-modules/nx2site/gitea.nix
+++ b/system-modules/nx2site/gitea.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, hyper, secrets, ... }: 
+{ pkgs, ... }@all: with all;
 let git-user = "git"; in
 {
   sops.secrets = {
diff --git a/system-modules/nx2site/open-web-calendar.nix b/system-modules/nx2site/open-web-calendar.nix
index 756aa7b..2a8967f 100644
--- a/system-modules/nx2site/open-web-calendar.nix
+++ b/system-modules/nx2site/open-web-calendar.nix
@@ -1,4 +1,4 @@
-{ pkgs, hyper, ... }:
+{ pkgs, ... }@all: with all;
 {
   services = {
     open-web-calendar = {
diff --git a/system-modules/nx2site/paperless.nix b/system-modules/nx2site/paperless.nix
index 7ff6604..cf8f3f3 100644
--- a/system-modules/nx2site/paperless.nix
+++ b/system-modules/nx2site/paperless.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, hyper, secrets, ... }:
+{ pkgs, ... }@all: with all;
 let paperless-user = "paperless"; in
 {
   sops.secrets = {
diff --git a/system-modules/nx2site/proxy.nix b/system-modules/nx2site/proxy.nix
index 47c94c1..5de496c 100644
--- a/system-modules/nx2site/proxy.nix
+++ b/system-modules/nx2site/proxy.nix
@@ -44,7 +44,7 @@
     # appendConfig = '''';
     clientMaxBodySize = "20m";
     defaultHTTPListenPort = 80;
-    defaultListenAddresses = [ "0.0.0.0" ] ++ pkgs.lib.optional config.networking.enableIPv6 "[::0]";
+    defaultListenAddresses = [ "0.0.0.0" ] ++ lib.optional config.networking.enableIPv6 "[::0]";
     defaultListen = dl;
     defaultMimeTypes = "${pkgs.mailcap}/etc/nginx/mime.types";
     defaultSSLListenPort = 443;
@@ -138,7 +138,7 @@
         listen = dl;
         locations = { "/" = { proxyPass = "http://127.0.0.1:8441"; }; }; 
       };
-      "dav.${hyper.domain}" = pkgs.lib.mkIf config.services.radicale.enable (vh // {
+      "dav.${hyper.domain}" = lib.mkIf config.services.radicale.enable (vh // {
         listen = dl;
         locations = { "/" = { proxyPass = "http://127.0.0.1:5232"; }; }; 
       });
diff --git a/system-modules/nx2site/rallly.nix b/system-modules/nx2site/rallly.nix
index da4a9a5..c5a811d 100644
--- a/system-modules/nx2site/rallly.nix
+++ b/system-modules/nx2site/rallly.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, ... }@all: with all;
 {
   environment.systemPackages = [
     (pkgs.mkYarnPackage {
diff --git a/system-modules/nx2site/vaultwarden.nix b/system-modules/nx2site/vaultwarden.nix
index 8917ca6..3ef04c5 100644
--- a/system-modules/nx2site/vaultwarden.nix
+++ b/system-modules/nx2site/vaultwarden.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, hyper, secrets, ... }:
+{ pkgs, ... }@all: with all;
 {
   sops.secrets = {
     "nx2site/vaultwarden.env" = {
diff --git a/system-modules/ollama.nix b/system-modules/ollama.nix
index 3c9c9c6..9fe38d3 100644
--- a/system-modules/ollama.nix
+++ b/system-modules/ollama.nix
@@ -1,9 +1,9 @@
-{ pkgs, hyper, ... }: 
+{ pkgs, ... }@all: with all;
 {
   services.ollama = {
     package = if hyper.nvidia.enable then pkgs.ollama-cuda else pkgs.ollama;
     enable = true;
-    acceleration = pkgs.lib.mkIf hyper.nvidia.enable "cuda";
+    acceleration = lib.mkIf hyper.nvidia.enable "cuda";
     host = if hyper.host == "NxACE" then "0.0.0.0" else "127.0.0.1";
     port = 11434;
     environmentVariables = {
diff --git a/system-modules/postgres.nix b/system-modules/postgres.nix
index 39c3f15..b441bca 100644
--- a/system-modules/postgres.nix
+++ b/system-modules/postgres.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ pkgs, ... }@all: with all;
 {
 	services = {
 		postgresql = {
diff --git a/system-modules/qmk.nix b/system-modules/qmk.nix
index 136662f..12b97d3 100644
--- a/system-modules/qmk.nix
+++ b/system-modules/qmk.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, ... }@all: with all;
 {
   hardware.keyboard.qmk.enable = true;
 
diff --git a/system-modules/scanning.nix b/system-modules/scanning.nix
index ed066fa..63bcff3 100644
--- a/system-modules/scanning.nix
+++ b/system-modules/scanning.nix
@@ -3,7 +3,7 @@
 	hardware.sane = {
 		enable = true;
 	};
-  services.avahi = {
+  services.avahi.nssmdns4 = {
 	  enable = true;
 	  nssmdns = true;
 	};
diff --git a/system-modules/sops.nix b/system-modules/sops.nix
index f3271ac..14ef60e 100644
--- a/system-modules/sops.nix
+++ b/system-modules/sops.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, ... }@all: with all;
 {
   environment.systemPackages = with pkgs; [
     age
diff --git a/system-modules/sound.nix b/system-modules/sound.nix
index 762e312..29afad5 100644
--- a/system-modules/sound.nix
+++ b/system-modules/sound.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib,  ... }: 
+{ pkgs, ... }@all: with all;
 
 {
   services.pipewire = {
diff --git a/system-modules/tuda.nix b/system-modules/tuda.nix
index e4f3674..c56591f 100644
--- a/system-modules/tuda.nix
+++ b/system-modules/tuda.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, ... }@all: with all;
 {
   environment.etc = {
     "ssl/certs/tuda-eduroam-root.crt".source = "${pkgs.cacert.unbundled}/etc/ssl/certs/T-TeleSec_GlobalRoot_Class_2:1.crt";
diff --git a/system-modules/users.nix b/system-modules/users.nix
index 361d09b..22a9ab3 100644
--- a/system-modules/users.nix
+++ b/system-modules/users.nix
@@ -1,4 +1,4 @@
-{ pkgs, hyper, ... }: 
+{ pkgs, ... }@all: with all;
 {
   users.defaultUserShell = pkgs.bash; # if interactive, itll switch to fish
 
diff --git a/system-modules/virtualisation.nix b/system-modules/virtualisation.nix
index 9fa1b9e..79c4bf4 100644
--- a/system-modules/virtualisation.nix
+++ b/system-modules/virtualisation.nix
@@ -1,7 +1,7 @@
-{ pkgs, hyper, ... }:
+{ pkgs, ... }@all: with all;
 
 {
-  config = pkgs.lib.mkIf (hyper.host == "NxNORTH") {
+  config = lib.mkIf (hyper.host == "NxNORTH") {
     environment.systemPackages = with pkgs; [
       virtiofsd
     ];
diff --git a/system-modules/ydotool.nix b/system-modules/ydotool.nix
index 98d213a..a5100fb 100644
--- a/system-modules/ydotool.nix
+++ b/system-modules/ydotool.nix
@@ -1,5 +1,5 @@
-{ pkgs, hyper, ... }: 
-pkgs.lib.mkIf (hyper.host == "NxXPS")
+{ pkgs, ... }@all: with all;
+lib.mkIf (hyper.host == "NxXPS")
 {
   programs.ydotool.enable = true;
 }