diff --git a/flake.nix b/flake.nix
index bfb9d9c..082e777 100644
--- a/flake.nix
+++ b/flake.nix
@@ -80,9 +80,7 @@
     nixos-hardware, nixpkgs-terraform, simple-nixos-mailserver, sops-nix, ...
   }: let
     # Functions that setup systems
-    mylib = import ./lib { inherit inputs nixpkgs nixpkgs-unstable compose2nix disko flox genebean-omp-themes
-      home-manager nix-darwin nix-flatpak nix-homebrew nixos-cosmic
-      nixos-hardware nixpkgs-terraform simple-nixos-mailserver sops-nix; };
+    mylib = import ./lib { inherit inputs; };
 
     # creates a macOS system config
     darwinHostConfig = { system, hostname, username, additionalModules, additionalSpecialArgs }: nix-darwin.lib.darwinSystem {
diff --git a/modules/home-manager/common/all-cli.nix b/modules/home-manager/common/all-cli.nix
index 5d98099..4ec847b 100644
--- a/modules/home-manager/common/all-cli.nix
+++ b/modules/home-manager/common/all-cli.nix
@@ -1,4 +1,4 @@
-{ pkgs, genebean-omp-themes, ... }: let
+{ inputs, pkgs, ... }: let
   sqlite_lib = if builtins.elem pkgs.system [
                  "aarch64-darwin"
                  "x86_64-darwin"
@@ -159,7 +159,7 @@ in {
     oh-my-posh = {
       enable = true;
       enableZshIntegration = true;
-      settings = builtins.fromJSON (builtins.unsafeDiscardStringContext (builtins.readFile (genebean-omp-themes + "/beanbag.omp.json")));
+      settings = builtins.fromJSON (builtins.unsafeDiscardStringContext (builtins.readFile (inputs.genebean-omp-themes + "/beanbag.omp.json")));
     };
     ripgrep.enable = true;
     tmux = {
diff --git a/modules/home-manager/common/all-gui.nix b/modules/home-manager/common/all-gui.nix
index 20f29ca..6ad9478 100644
--- a/modules/home-manager/common/all-gui.nix
+++ b/modules/home-manager/common/all-gui.nix
@@ -1,4 +1,4 @@
-{ pkgs, genebean-omp-themes, ... }: {
+{ pkgs, ... }: {
   home.packages = with pkgs; [
     # nothing here right now
   ];
diff --git a/modules/home-manager/common/linux-apps/xfce4-terminal.nix b/modules/home-manager/common/linux-apps/xfce4-terminal.nix
index e1b596c..6b49e4d 100644
--- a/modules/home-manager/common/linux-apps/xfce4-terminal.nix
+++ b/modules/home-manager/common/linux-apps/xfce4-terminal.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }: {
+{ ... }: {
   home.file = {
     ".config/xfce4/terminal/accels.scm".source = ../../files/xfce4/terminal/accels.scm;
   };
diff --git a/modules/home-manager/hosts/AirPuppet/gene.nix b/modules/home-manager/hosts/AirPuppet/gene.nix
index 897b11b..52c837c 100644
--- a/modules/home-manager/hosts/AirPuppet/gene.nix
+++ b/modules/home-manager/hosts/AirPuppet/gene.nix
@@ -1,4 +1,4 @@
-{ pkgs, genebean-omp-themes, sops-nix, username, ... }: {
+{ username, ... }: {
   home.stateVersion = "23.11";
   imports = [
     ../../common/all-cli.nix
diff --git a/modules/home-manager/hosts/Blue-Rock/gene.liverman.nix b/modules/home-manager/hosts/Blue-Rock/gene.liverman.nix
index 7160605..8362e01 100644
--- a/modules/home-manager/hosts/Blue-Rock/gene.liverman.nix
+++ b/modules/home-manager/hosts/Blue-Rock/gene.liverman.nix
@@ -1,4 +1,4 @@
-{ pkgs, genebean-omp-themes, sops-nix, username, ... }: {
+{ username, ... }: {
   home.stateVersion = "23.11";
   imports = [
     ../../common/all-cli.nix
diff --git a/modules/home-manager/hosts/bigboy/gene.nix b/modules/home-manager/hosts/bigboy/gene.nix
index f680c05..691a398 100644
--- a/modules/home-manager/hosts/bigboy/gene.nix
+++ b/modules/home-manager/hosts/bigboy/gene.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }: {
+{ ... }: {
   home.stateVersion = "24.05";
   imports = [
     ../../common/all-cli.nix
diff --git a/modules/home-manager/hosts/hetznix01/gene.nix b/modules/home-manager/hosts/hetznix01/gene.nix
index 1090c90..2645578 100644
--- a/modules/home-manager/hosts/hetznix01/gene.nix
+++ b/modules/home-manager/hosts/hetznix01/gene.nix
@@ -1,4 +1,4 @@
-{ pkgs, genebean-omp-themes, ... }: {
+{ ... }: {
   home.stateVersion = "24.05";
   imports = [
     ../../common/all-cli.nix
diff --git a/modules/home-manager/hosts/hetznix02/gene.nix b/modules/home-manager/hosts/hetznix02/gene.nix
index 1090c90..2645578 100644
--- a/modules/home-manager/hosts/hetznix02/gene.nix
+++ b/modules/home-manager/hosts/hetznix02/gene.nix
@@ -1,4 +1,4 @@
-{ pkgs, genebean-omp-themes, ... }: {
+{ ... }: {
   home.stateVersion = "24.05";
   imports = [
     ../../common/all-cli.nix
diff --git a/modules/home-manager/hosts/mightymac/gene.liverman.nix b/modules/home-manager/hosts/mightymac/gene.liverman.nix
index a6ee69d..346236d 100644
--- a/modules/home-manager/hosts/mightymac/gene.liverman.nix
+++ b/modules/home-manager/hosts/mightymac/gene.liverman.nix
@@ -1,4 +1,4 @@
-{ pkgs, genebean-omp-themes, sops-nix, username, ... }: {
+{ username, ... }: {
   home.stateVersion = "23.11";
   imports = [
     ../../common/all-cli.nix
diff --git a/modules/home-manager/hosts/mini-watcher/gene.nix b/modules/home-manager/hosts/mini-watcher/gene.nix
index 7cb68f2..0148f21 100644
--- a/modules/home-manager/hosts/mini-watcher/gene.nix
+++ b/modules/home-manager/hosts/mini-watcher/gene.nix
@@ -1,4 +1,4 @@
-{ pkgs, genebean-omp-themes, ... }: {
+{ ... }: {
   home.stateVersion = "23.11";
   imports = [
     ../../common/all-cli.nix
diff --git a/modules/home-manager/hosts/nixnuc/gene.nix b/modules/home-manager/hosts/nixnuc/gene.nix
index 30158a5..f90b6f7 100644
--- a/modules/home-manager/hosts/nixnuc/gene.nix
+++ b/modules/home-manager/hosts/nixnuc/gene.nix
@@ -1,4 +1,4 @@
-{ pkgs, genebean-omp-themes, ... }: {
+{ ... }: {
   home.stateVersion = "23.11";
   imports = [
     ../../common/all-cli.nix
diff --git a/modules/home-manager/hosts/rainbow-planet/gene.nix b/modules/home-manager/hosts/rainbow-planet/gene.nix
index fc2c0e1..10cde83 100644
--- a/modules/home-manager/hosts/rainbow-planet/gene.nix
+++ b/modules/home-manager/hosts/rainbow-planet/gene.nix
@@ -1,4 +1,4 @@
-{ pkgs, genebean-omp-themes, ... }: {
+{ pkgs, ... }: {
   home.stateVersion = "23.11";
   imports = [
     ../../common/all-cli.nix
diff --git a/modules/hosts/darwin/AirPuppet/default.nix b/modules/hosts/darwin/AirPuppet/default.nix
index 17b71e5..84afcb1 100644
--- a/modules/hosts/darwin/AirPuppet/default.nix
+++ b/modules/hosts/darwin/AirPuppet/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }: {
+{ ... }: {
   system.stateVersion = 4;
 
   homebrew = {
diff --git a/modules/hosts/nixos/bigboy/hardware-configuration.nix b/modules/hosts/nixos/bigboy/hardware-configuration.nix
index 57c4551..8a6fb88 100644
--- a/modules/hosts/nixos/bigboy/hardware-configuration.nix
+++ b/modules/hosts/nixos/bigboy/hardware-configuration.nix
@@ -1,7 +1,7 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{ config, lib, modulesPath, ... }:
 
 {
   imports =
diff --git a/modules/hosts/nixos/hetznix01/hardware-configuration.nix b/modules/hosts/nixos/hetznix01/hardware-configuration.nix
index f3eff9f..c2cbb3b 100644
--- a/modules/hosts/nixos/hetznix01/hardware-configuration.nix
+++ b/modules/hosts/nixos/hetznix01/hardware-configuration.nix
@@ -1,7 +1,7 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{ lib, modulesPath, ... }:
 
 {
   imports =
diff --git a/modules/hosts/nixos/hetznix02/hardware-configuration.nix b/modules/hosts/nixos/hetznix02/hardware-configuration.nix
index c6de7d0..0d6440a 100644
--- a/modules/hosts/nixos/hetznix02/hardware-configuration.nix
+++ b/modules/hosts/nixos/hetznix02/hardware-configuration.nix
@@ -1,7 +1,7 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{ lib, modulesPath, ... }:
 
 {
   imports =
diff --git a/modules/hosts/nixos/nixnas1/disk-config.nix b/modules/hosts/nixos/nixnas1/disk-config.nix
index b8bf80c..dcb9555 100644
--- a/modules/hosts/nixos/nixnas1/disk-config.nix
+++ b/modules/hosts/nixos/nixnas1/disk-config.nix
@@ -1,4 +1,4 @@
-{ lib, ... }:
+{ ... }:
 {
   disko.devices = {
     disk = {
diff --git a/modules/hosts/nixos/nixnas1/hardware-configuration.nix b/modules/hosts/nixos/nixnas1/hardware-configuration.nix
index 2b2d86a..8cce237 100644
--- a/modules/hosts/nixos/nixnas1/hardware-configuration.nix
+++ b/modules/hosts/nixos/nixnas1/hardware-configuration.nix
@@ -1,7 +1,7 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{ config, lib, modulesPath, ... }:
 
 {
   imports =
diff --git a/modules/hosts/nixos/nixnuc/default.nix b/modules/hosts/nixos/nixnuc/default.nix
index fbfd5d6..12fb394 100644
--- a/modules/hosts/nixos/nixnuc/default.nix
+++ b/modules/hosts/nixos/nixnuc/default.nix
@@ -1,4 +1,4 @@
-{ compose2nix, config, pkgs, username,  ... }: let
+{ inputs, config, pkgs, username,  ... }: let
   http_port = 80;
   https_port = 443;
   home_domain = "home.technicalissues.us";
@@ -29,7 +29,7 @@ in {
   };
 
   environment.systemPackages = with pkgs; [
-    compose2nix.packages.${pkgs.system}.default
+    inputs.compose2nix.packages.${pkgs.system}.default
     docker-compose
     intel-gpu-tools
     jellyfin
diff --git a/modules/hosts/nixos/nixnuc/hardware-configuration.nix b/modules/hosts/nixos/nixnuc/hardware-configuration.nix
index 21ca6a5..17b0c38 100644
--- a/modules/hosts/nixos/nixnuc/hardware-configuration.nix
+++ b/modules/hosts/nixos/nixnuc/hardware-configuration.nix
@@ -1,7 +1,7 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{ config, lib, modulesPath, ... }:
 
 {
   imports =
diff --git a/modules/hosts/nixos/rainbow-planet/default.nix b/modules/hosts/nixos/rainbow-planet/default.nix
index 751d4d4..85c3fb1 100644
--- a/modules/hosts/nixos/rainbow-planet/default.nix
+++ b/modules/hosts/nixos/rainbow-planet/default.nix
@@ -1,4 +1,4 @@
-{ config, inputs, pkgs, username, ... }: {
+{ inputs, config, pkgs, username, ... }: {
   imports = [
     ./hardware-configuration.nix
     ../../../system/common/linux/flatpaks.nix
diff --git a/modules/hosts/nixos/rainbow-planet/hardware-configuration.nix b/modules/hosts/nixos/rainbow-planet/hardware-configuration.nix
index e72494d..d3c51fe 100644
--- a/modules/hosts/nixos/rainbow-planet/hardware-configuration.nix
+++ b/modules/hosts/nixos/rainbow-planet/hardware-configuration.nix
@@ -1,7 +1,7 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{ config, lib, modulesPath, ... }:
 
 {
   imports =
diff --git a/modules/system/common/all-nixos.nix b/modules/system/common/all-nixos.nix
index 6e3ed11..2eb708a 100644
--- a/modules/system/common/all-nixos.nix
+++ b/modules/system/common/all-nixos.nix
@@ -1,4 +1,4 @@
-{ config, hostname, pkgs, sops-nix, username, ... }: {
+{ hostname, pkgs, username, ... }: {
   imports = [
     ./linux/internationalisation.nix
   ];
diff --git a/modules/system/common/linux/internationalisation.nix b/modules/system/common/linux/internationalisation.nix
index 9463637..5d71c99 100644
--- a/modules/system/common/linux/internationalisation.nix
+++ b/modules/system/common/linux/internationalisation.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }: {
+{ ... }: {
   # Select internationalisation properties.
   i18n = {
     defaultLocale = "en_US.UTF-8";