diff --git a/home-manager/desktop/package-configs/firefox.nix b/home-manager/desktop/package-configs/firefox.nix
index 16ad709..43f4854 100644
--- a/home-manager/desktop/package-configs/firefox.nix
+++ b/home-manager/desktop/package-configs/firefox.nix
@@ -1,4 +1,8 @@
-{pkgs, ...}: {
+{
+  config,
+  pkgs,
+  ...
+}: {
   programs.firefox = {
     enable = true;
     nativeMessagingHosts = [pkgs.firefoxpwa];
diff --git a/home-manager/desktop/package-configs/foot/default.nix b/home-manager/desktop/package-configs/foot/default.nix
index f1839dc..464925f 100644
--- a/home-manager/desktop/package-configs/foot/default.nix
+++ b/home-manager/desktop/package-configs/foot/default.nix
@@ -1,4 +1,9 @@
-{...}: {
+{
+  lib,
+  pkgs,
+  inputs,
+  ...
+}: {
   programs.foot = {
     enable = true;
     catppuccin.enable = true;
diff --git a/home-manager/desktop/package-configs/konsole/default.nix b/home-manager/desktop/package-configs/konsole/default.nix
index e8d5f29..a704737 100644
--- a/home-manager/desktop/package-configs/konsole/default.nix
+++ b/home-manager/desktop/package-configs/konsole/default.nix
@@ -1,4 +1,9 @@
-{...}: {
+{
+  lib,
+  pkgs,
+  inputs,
+  ...
+}: {
   home.file = {
     "profile" = {
       source = ./Catppuccin.profile;
diff --git a/home-manager/hosts/EDI/default.nix b/home-manager/hosts/EDI/default.nix
index 2600642..c17b81a 100644
--- a/home-manager/hosts/EDI/default.nix
+++ b/home-manager/hosts/EDI/default.nix
@@ -1,4 +1,11 @@
-{...}: {
+{
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
   # You can import other home-manager modules here
   imports = [
     ./lillian.nix
diff --git a/home-manager/hosts/EDI/lillian.nix b/home-manager/hosts/EDI/lillian.nix
index f0cd853..351470d 100644
--- a/home-manager/hosts/EDI/lillian.nix
+++ b/home-manager/hosts/EDI/lillian.nix
@@ -1,6 +1,13 @@
 # This is your home-manager configuration file
 # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix)
-{pkgs, ...}: {
+{
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
   # You can import other home-manager modules here
   imports = [
     # If you want to use modules your own flake exports (from modules/home-manager):
diff --git a/home-manager/hosts/GLaDOS/default.nix b/home-manager/hosts/GLaDOS/default.nix
index 2600642..c17b81a 100644
--- a/home-manager/hosts/GLaDOS/default.nix
+++ b/home-manager/hosts/GLaDOS/default.nix
@@ -1,4 +1,11 @@
-{...}: {
+{
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
   # You can import other home-manager modules here
   imports = [
     ./lillian.nix
diff --git a/home-manager/hosts/GLaDOS/lillian.nix b/home-manager/hosts/GLaDOS/lillian.nix
index 0841ff3..ce503f7 100644
--- a/home-manager/hosts/GLaDOS/lillian.nix
+++ b/home-manager/hosts/GLaDOS/lillian.nix
@@ -1,6 +1,13 @@
 # This is your home-manager configuration file
 # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix)
-{pkgs, ...}: {
+{
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
   # You can import other home-manager modules here
   imports = [
     # If you want to use modules your own flake exports (from modules/home-manager):
diff --git a/home-manager/hosts/iso/default.nix b/home-manager/hosts/iso/default.nix
index 2600642..c17b81a 100644
--- a/home-manager/hosts/iso/default.nix
+++ b/home-manager/hosts/iso/default.nix
@@ -1,4 +1,11 @@
-{...}: {
+{
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
   # You can import other home-manager modules here
   imports = [
     ./lillian.nix
diff --git a/home-manager/hosts/iso/lillian.nix b/home-manager/hosts/iso/lillian.nix
index f0cd853..351470d 100644
--- a/home-manager/hosts/iso/lillian.nix
+++ b/home-manager/hosts/iso/lillian.nix
@@ -1,6 +1,13 @@
 # This is your home-manager configuration file
 # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix)
-{pkgs, ...}: {
+{
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
   # You can import other home-manager modules here
   imports = [
     # If you want to use modules your own flake exports (from modules/home-manager):
diff --git a/home-manager/hosts/iso_server/default.nix b/home-manager/hosts/iso_server/default.nix
index 2600642..c17b81a 100644
--- a/home-manager/hosts/iso_server/default.nix
+++ b/home-manager/hosts/iso_server/default.nix
@@ -1,4 +1,11 @@
-{...}: {
+{
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
   # You can import other home-manager modules here
   imports = [
     ./lillian.nix
diff --git a/home-manager/hosts/iso_server/lillian.nix b/home-manager/hosts/iso_server/lillian.nix
index 278806e..9acd9c2 100644
--- a/home-manager/hosts/iso_server/lillian.nix
+++ b/home-manager/hosts/iso_server/lillian.nix
@@ -1,6 +1,13 @@
 # This is your home-manager configuration file
 # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix)
-{pkgs, ...}: {
+{
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
   # You can import other home-manager modules here
   imports = [
     # If you want to use modules your own flake exports (from modules/home-manager):
diff --git a/home-manager/hosts/queen/default.nix b/home-manager/hosts/queen/default.nix
index 2600642..c17b81a 100644
--- a/home-manager/hosts/queen/default.nix
+++ b/home-manager/hosts/queen/default.nix
@@ -1,4 +1,11 @@
-{...}: {
+{
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
   # You can import other home-manager modules here
   imports = [
     ./lillian.nix
diff --git a/home-manager/hosts/queen/lillian.nix b/home-manager/hosts/queen/lillian.nix
index 5acc4b0..680ef4e 100644
--- a/home-manager/hosts/queen/lillian.nix
+++ b/home-manager/hosts/queen/lillian.nix
@@ -1,6 +1,13 @@
 # This is your home-manager configuration file
 # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix)
-{...}: {
+{
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
   # You can import other home-manager modules here
   imports = [
     # If you want to use modules your own flake exports (from modules/home-manager):
diff --git a/home-manager/hosts/shodan/default.nix b/home-manager/hosts/shodan/default.nix
index 2600642..c17b81a 100644
--- a/home-manager/hosts/shodan/default.nix
+++ b/home-manager/hosts/shodan/default.nix
@@ -1,4 +1,11 @@
-{...}: {
+{
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
   # You can import other home-manager modules here
   imports = [
     ./lillian.nix
diff --git a/home-manager/hosts/shodan/lillian.nix b/home-manager/hosts/shodan/lillian.nix
index 52f1d3d..232f5d7 100644
--- a/home-manager/hosts/shodan/lillian.nix
+++ b/home-manager/hosts/shodan/lillian.nix
@@ -1,6 +1,13 @@
 # This is your home-manager configuration file
 # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix)
-{pkgs, ...}: {
+{
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
   # You can import other home-manager modules here
   imports = [
     # If you want to use modules your own flake exports (from modules/home-manager):
diff --git a/home-manager/hosts/wheatley/default.nix b/home-manager/hosts/wheatley/default.nix
index 2600642..c17b81a 100644
--- a/home-manager/hosts/wheatley/default.nix
+++ b/home-manager/hosts/wheatley/default.nix
@@ -1,4 +1,11 @@
-{...}: {
+{
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
   # You can import other home-manager modules here
   imports = [
     ./lillian.nix
diff --git a/home-manager/hosts/wheatley/lillian.nix b/home-manager/hosts/wheatley/lillian.nix
index afb1b42..c3778c3 100644
--- a/home-manager/hosts/wheatley/lillian.nix
+++ b/home-manager/hosts/wheatley/lillian.nix
@@ -1,6 +1,13 @@
 # This is your home-manager configuration file
 # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix)
-{...}: {
+{
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
   # You can import other home-manager modules here
   imports = [
     # If you want to use modules your own flake exports (from modules/home-manager):
diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix
index 07f7fde..799caca 100644
--- a/home-manager/shared/default.nix
+++ b/home-manager/shared/default.nix
@@ -1,4 +1,11 @@
-{pkgs, ...}: {
+{
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
   imports = [
     ./shell/helix
     ./shell/zellij
@@ -28,7 +35,6 @@
     lazygit
     navi
     yazi
-    nil
   ];
   programs.navi.enable = true;
 }
diff --git a/home-manager/shared/shell/bat.nix b/home-manager/shared/shell/bat.nix
index 2afdce3..21acc30 100644
--- a/home-manager/shared/shell/bat.nix
+++ b/home-manager/shared/shell/bat.nix
@@ -1,4 +1,8 @@
-{pkgs, ...}: {
+{
+  lib,
+  pkgs,
+  ...
+}: {
   programs.bat = {
     enable = true;
     extraPackages = with pkgs.bat-extras; [batdiff batman batgrep batwatch];
diff --git a/home-manager/shared/shell/eza.nix b/home-manager/shared/shell/eza.nix
index df2968b..b0c72f2 100644
--- a/home-manager/shared/shell/eza.nix
+++ b/home-manager/shared/shell/eza.nix
@@ -1,4 +1,4 @@
-{...}: {
+{lib, ...}: {
   programs.eza = {
     enable = true;
     enableZshIntegration = true;
diff --git a/home-manager/shared/shell/helix/default.nix b/home-manager/shared/shell/helix/default.nix
index bba04a9..32a2672 100644
--- a/home-manager/shared/shell/helix/default.nix
+++ b/home-manager/shared/shell/helix/default.nix
@@ -1,4 +1,9 @@
-{pkgs, ...}: let
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
   yazi =
     pkgs.writeText "open_in_helix_from_yazi.zsh"
     ''
@@ -27,10 +32,9 @@
       }
 
       send_to_jupyter() {
-        is_new && zellij run -f -n "jupyter console" -- direnv exec . jupyter console --kernel="$1" -f="/tmp/rjh-$(pwd | tr \"/\" -).json" --ZMQTerminalInteractiveShell.include_other_output=True --ZMQTerminalInteractiveShell.other_output_prefix=''' && zellij action write 29 25 && zellij action write 17
+        is_new && zellij run -f -n "jupyter console" -- direnv exec . jupyter console --kernel="$1" -f="/tmp/rjh-$(pwd | tr \"/\" -).json" --ZMQTerminalInteractiveShell.include_other_output=True --ZMQTerminalInteractiveShell.other_output_prefix=''' && zellij action write 29 25
         pwd >> /tmp/rjh
         zellij action write 29 25
-        zellij action write 17
         cat | just send
       }
       send_to_jupyter
diff --git a/home-manager/shared/shell/hyfetch.nix b/home-manager/shared/shell/hyfetch.nix
index 774a3d7..0945e59 100644
--- a/home-manager/shared/shell/hyfetch.nix
+++ b/home-manager/shared/shell/hyfetch.nix
@@ -1,4 +1,9 @@
-{...}: {
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
   programs.hyfetch = {
     enable = true;
     settings = {
diff --git a/home-manager/shared/shell/zellij/default.nix b/home-manager/shared/shell/zellij/default.nix
index 6e154ec..1565979 100644
--- a/home-manager/shared/shell/zellij/default.nix
+++ b/home-manager/shared/shell/zellij/default.nix
@@ -1,4 +1,5 @@
 {
+  lib,
   pkgs,
   inputs,
   ...
diff --git a/home-manager/shared/shell/zsh.nix b/home-manager/shared/shell/zsh.nix
index 3c814c1..a3108ff 100644
--- a/home-manager/shared/shell/zsh.nix
+++ b/home-manager/shared/shell/zsh.nix
@@ -1,4 +1,11 @@
-{pkgs, ...}: {
+{
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
   programs.zoxide = {
     enable = true;
   };
diff --git a/justfile b/justfile
index a6da660..b0aad0e 100644
--- a/justfile
+++ b/justfile
@@ -9,7 +9,3 @@ test:
 
 update:
     nix flake update
-
-clean:
-    sudo nix-collect-garbage
-    sudo nix-store --optimise
diff --git a/nixos/board/package-configs/pi-hole/default.nix b/nixos/board/package-configs/pi-hole/default.nix
index 0596d3b..7ce2716 100644
--- a/nixos/board/package-configs/pi-hole/default.nix
+++ b/nixos/board/package-configs/pi-hole/default.nix
@@ -1,4 +1,11 @@
-{...}: {
+{
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
   services.pihole = {
     enable = true;
     hostConfig = {
diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix
index 44e3892..4b0123a 100644
--- a/nixos/desktop/default.nix
+++ b/nixos/desktop/default.nix
@@ -1,6 +1,7 @@
 # This is your system's configuration file.
 # Use this to configure your system environment (it replaces /etc/nixos/configuration.nix)
 {
+  inputs,
   outputs,
   lib,
   config,
@@ -60,7 +61,7 @@
       tpm2-tss
       virtualgl
       vulkan-tools
-      # waydroid
+      waydroid
       waypipe
       wayland-utils
       xwaylandvideobridge
diff --git a/nixos/desktop/package-configs/default.nix b/nixos/desktop/package-configs/default.nix
index 372d666..95564cd 100644
--- a/nixos/desktop/package-configs/default.nix
+++ b/nixos/desktop/package-configs/default.nix
@@ -1,4 +1,11 @@
-{...}: {
+{
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
   imports = [
     ./firefox
   ];
diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix
index a71f2fb..78ee9f7 100644
--- a/nixos/hosts/EDI/configuration.nix
+++ b/nixos/hosts/EDI/configuration.nix
@@ -4,6 +4,7 @@
   inputs,
   outputs,
   lib,
+  config,
   pkgs,
   ...
 }: {
diff --git a/nixos/hosts/EDI/hardware-configuration.nix b/nixos/hosts/EDI/hardware-configuration.nix
index 40ca9e0..081b9c8 100644
--- a/nixos/hosts/EDI/hardware-configuration.nix
+++ b/nixos/hosts/EDI/hardware-configuration.nix
@@ -4,6 +4,7 @@
 {
   config,
   lib,
+  pkgs,
   modulesPath,
   ...
 }: {
diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix
index f4e7041..998fdde 100644
--- a/nixos/hosts/GLaDOS/configuration.nix
+++ b/nixos/hosts/GLaDOS/configuration.nix
@@ -3,6 +3,8 @@
 {
   inputs,
   outputs,
+  lib,
+  config,
   pkgs,
   ...
 }: {
@@ -82,7 +84,7 @@
     };
   };
 
-  # virtualisation.waydroid.enable = false;
+  virtualisation.waydroid.enable = true;
   networking.hostName = "GLaDOS";
 
   # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
diff --git a/nixos/hosts/GLaDOS/hardware-configuration.nix b/nixos/hosts/GLaDOS/hardware-configuration.nix
index 7c7fcbd..c4ee5ec 100644
--- a/nixos/hosts/GLaDOS/hardware-configuration.nix
+++ b/nixos/hosts/GLaDOS/hardware-configuration.nix
@@ -4,6 +4,7 @@
 {
   config,
   lib,
+  pkgs,
   modulesPath,
   ...
 }: {
diff --git a/nixos/hosts/iso/configuration.nix b/nixos/hosts/iso/configuration.nix
index 1c45890..becff32 100644
--- a/nixos/hosts/iso/configuration.nix
+++ b/nixos/hosts/iso/configuration.nix
@@ -2,7 +2,9 @@
   inputs,
   outputs,
   lib,
+  config,
   pkgs,
+  nixpkgs-stable,
   ...
 }: {
   imports = [
diff --git a/nixos/hosts/iso_server/configuration.nix b/nixos/hosts/iso_server/configuration.nix
index 9f0cd35..a38c7d0 100644
--- a/nixos/hosts/iso_server/configuration.nix
+++ b/nixos/hosts/iso_server/configuration.nix
@@ -2,7 +2,9 @@
   inputs,
   outputs,
   lib,
+  config,
   pkgs,
+  nixpkgs-stable,
   ...
 }: {
   imports = [
diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix
index 8ba1916..9c9ba8b 100644
--- a/nixos/hosts/queen/configuration.nix
+++ b/nixos/hosts/queen/configuration.nix
@@ -2,7 +2,9 @@
   inputs,
   outputs,
   lib,
+  config,
   pkgs,
+  nixpkgs-stable,
   ...
 }: {
   imports = [
diff --git a/nixos/hosts/queen/hardware-configuration.nix b/nixos/hosts/queen/hardware-configuration.nix
index cf6fbc9..3357ba6 100644
--- a/nixos/hosts/queen/hardware-configuration.nix
+++ b/nixos/hosts/queen/hardware-configuration.nix
@@ -1,5 +1,7 @@
 {
+  config,
   lib,
+  pkgs,
   modulesPath,
   ...
 }: {
diff --git a/nixos/hosts/shodan/auto-mount.nix b/nixos/hosts/shodan/auto-mount.nix
index 2924824..1c4a376 100644
--- a/nixos/hosts/shodan/auto-mount.nix
+++ b/nixos/hosts/shodan/auto-mount.nix
@@ -1,4 +1,11 @@
-{pkgs, ...}: {
+{
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
   services.udev.extraRules = ''
     KERNEL=="sd[a-z]|sd[a-z][0-9]", ACTION=="add", RUN+="${pkgs.systemd}/bin/systemctl start --no-block external-drive-mount@%k.service"
     KERNEL=="sd[a-z]|sd[a-z][0-9]", ACTION=="remove", RUN+="${pkgs.systemd}/bin/systemctl stop --no-block external-drive-mount@%k.service"
diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix
index 6120091..f7e0c3e 100644
--- a/nixos/hosts/shodan/configuration.nix
+++ b/nixos/hosts/shodan/configuration.nix
@@ -2,6 +2,7 @@
   inputs,
   outputs,
   lib,
+  config,
   pkgs,
   ...
 }: {
diff --git a/nixos/hosts/shodan/hardware-configuration.nix b/nixos/hosts/shodan/hardware-configuration.nix
index fb0baa3..fdfefac 100644
--- a/nixos/hosts/shodan/hardware-configuration.nix
+++ b/nixos/hosts/shodan/hardware-configuration.nix
@@ -4,6 +4,7 @@
 {
   config,
   lib,
+  pkgs,
   modulesPath,
   ...
 }: {
diff --git a/nixos/hosts/wheatley/armv7l.nix b/nixos/hosts/wheatley/armv7l.nix
index d908a24..e6a9f37 100644
--- a/nixos/hosts/wheatley/armv7l.nix
+++ b/nixos/hosts/wheatley/armv7l.nix
@@ -1,4 +1,8 @@
-{pkgs, ...}: {
+{
+  config,
+  pkgs,
+  ...
+}: {
   boot.kernelPatches = [
     rec {
       name = "compat_uts_machine";
diff --git a/nixos/hosts/wheatley/hardware-configuration.nix b/nixos/hosts/wheatley/hardware-configuration.nix
index efbc691..f7ea389 100644
--- a/nixos/hosts/wheatley/hardware-configuration.nix
+++ b/nixos/hosts/wheatley/hardware-configuration.nix
@@ -2,7 +2,9 @@
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
 {
+  config,
   lib,
+  pkgs,
   modulesPath,
   ...
 }: {
diff --git a/nixos/server/default.nix b/nixos/server/default.nix
index 99a5736..75e56d1 100644
--- a/nixos/server/default.nix
+++ b/nixos/server/default.nix
@@ -1,4 +1,11 @@
-{...}: {
+{
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
   # You can import other home-manager modules here
   imports = [
     ./package-configs
diff --git a/nixos/server/package-configs/akkoma/default.nix b/nixos/server/package-configs/akkoma/default.nix
index d0495bf..bd68ba9 100644
--- a/nixos/server/package-configs/akkoma/default.nix
+++ b/nixos/server/package-configs/akkoma/default.nix
@@ -1,4 +1,7 @@
 {
+  inputs,
+  outputs,
+  lib,
   config,
   pkgs,
   ...
diff --git a/nixos/server/package-configs/aria2/container.nix b/nixos/server/package-configs/aria2/container.nix
index c76c97c..6d2fc82 100644
--- a/nixos/server/package-configs/aria2/container.nix
+++ b/nixos/server/package-configs/aria2/container.nix
@@ -1,4 +1,8 @@
-{config, ...}: {
+{
+  config,
+  pkgs,
+  ...
+}: {
   users.users.aria2.group = "aria2";
   users.groups.aria2 = {};
   users.users.aria2.isSystemUser = true;
diff --git a/nixos/server/package-configs/aria2/default.nix b/nixos/server/package-configs/aria2/default.nix
index e7d15bd..f2a075c 100644
--- a/nixos/server/package-configs/aria2/default.nix
+++ b/nixos/server/package-configs/aria2/default.nix
@@ -1,4 +1,10 @@
-{config, ...}: {
+{
+  inputs,
+  outputs,
+  config,
+  pkgs,
+  ...
+}: {
   users.users.aria2.group = "aria2";
   users.groups.aria2 = {};
   users.users.aria2.isSystemUser = true;
diff --git a/nixos/server/package-configs/cinny/default.nix b/nixos/server/package-configs/cinny/default.nix
index 63891b4..6079856 100644
--- a/nixos/server/package-configs/cinny/default.nix
+++ b/nixos/server/package-configs/cinny/default.nix
@@ -1,4 +1,10 @@
-{pkgs, ...}: {
+{
+  config,
+  pkgs,
+  inputs,
+  lib,
+  ...
+}: {
   services.nginx = {
     enable = true;
     virtualHosts = {
diff --git a/nixos/server/package-configs/conduit/default.nix b/nixos/server/package-configs/conduit/default.nix
index b9debce..2ea9053 100644
--- a/nixos/server/package-configs/conduit/default.nix
+++ b/nixos/server/package-configs/conduit/default.nix
@@ -2,6 +2,7 @@
   config,
   pkgs,
   inputs,
+  lib,
   ...
 }: let
   # You'll need to edit these values
diff --git a/nixos/server/package-configs/coturn/default.nix b/nixos/server/package-configs/coturn/default.nix
index 5bae63e..4539247 100644
--- a/nixos/server/package-configs/coturn/default.nix
+++ b/nixos/server/package-configs/coturn/default.nix
@@ -1,4 +1,8 @@
-{config, ...}: {
+{
+  config,
+  pkgs,
+  ...
+}: {
   sops.secrets."coturn-auth-secret".mode = "0440";
   sops.secrets."coturn-auth-secret".owner = config.users.users.turnserver.name;
   users.users.nginx.extraGroups = ["turnserver"];
diff --git a/nixos/server/package-configs/dashboard/default.nix b/nixos/server/package-configs/dashboard/default.nix
index 7bbb7fc..6cb610e 100644
--- a/nixos/server/package-configs/dashboard/default.nix
+++ b/nixos/server/package-configs/dashboard/default.nix
@@ -1,4 +1,11 @@
-{...}: {
+{
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
   imports = [
     ./grafana
     #./loki
diff --git a/nixos/server/package-configs/dashboard/grafana/default.nix b/nixos/server/package-configs/dashboard/grafana/default.nix
index 2ea84c6..5589873 100644
--- a/nixos/server/package-configs/dashboard/grafana/default.nix
+++ b/nixos/server/package-configs/dashboard/grafana/default.nix
@@ -1,4 +1,8 @@
-{config, ...}: {
+{
+  config,
+  pkgs,
+  ...
+}: {
   # grafana configuration
   services.grafana = {
     enable = true;
diff --git a/nixos/server/package-configs/dashboard/loki/default.nix b/nixos/server/package-configs/dashboard/loki/default.nix
index e83159b..6e68716 100644
--- a/nixos/server/package-configs/dashboard/loki/default.nix
+++ b/nixos/server/package-configs/dashboard/loki/default.nix
@@ -1,4 +1,8 @@
-{...}: {
+{
+  config,
+  pkgs,
+  ...
+}: {
   services.loki = {
     enable = true;
     configFile = ./loki.yaml;
diff --git a/nixos/server/package-configs/dashboard/prometheus/default.nix b/nixos/server/package-configs/dashboard/prometheus/default.nix
index 36710a1..5ea9535 100644
--- a/nixos/server/package-configs/dashboard/prometheus/default.nix
+++ b/nixos/server/package-configs/dashboard/prometheus/default.nix
@@ -1,4 +1,8 @@
-{...}: {
+{
+  config,
+  pkgs,
+  ...
+}: {
   services.prometheus = {
     enable = true;
     port = 9001;
diff --git a/nixos/server/package-configs/dashboard/telegraf/default.nix b/nixos/server/package-configs/dashboard/telegraf/default.nix
index 591e279..0c6e6ba 100644
--- a/nixos/server/package-configs/dashboard/telegraf/default.nix
+++ b/nixos/server/package-configs/dashboard/telegraf/default.nix
@@ -1,4 +1,11 @@
-{config, ...}: {
+{
+  inputs,
+  lib,
+  config,
+  pkgs,
+  user,
+  ...
+}: {
   sops.secrets."grafana-telegraf-key".mode = "0440";
   sops.secrets."grafana-telegraf-key".owner = config.users.users.telegraf.name;
   services.telegraf = {
diff --git a/nixos/server/package-configs/default.nix b/nixos/server/package-configs/default.nix
index 4dd970f..6384555 100644
--- a/nixos/server/package-configs/default.nix
+++ b/nixos/server/package-configs/default.nix
@@ -1,4 +1,11 @@
-{...}: {
+{
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
   imports = [
     ./conduit
     ./forgejo
diff --git a/nixos/server/package-configs/forgejo/default.nix b/nixos/server/package-configs/forgejo/default.nix
index b4efc44..da7b467 100644
--- a/nixos/server/package-configs/forgejo/default.nix
+++ b/nixos/server/package-configs/forgejo/default.nix
@@ -1,4 +1,11 @@
-{pkgs, ...}: {
+{
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
   imports = [];
 
   #sops.secrets."mailpassunhash".mode = "0440";
diff --git a/nixos/server/package-configs/gotosocial/default.nix b/nixos/server/package-configs/gotosocial/default.nix
index 3740c15..9e3afdf 100644
--- a/nixos/server/package-configs/gotosocial/default.nix
+++ b/nixos/server/package-configs/gotosocial/default.nix
@@ -1,4 +1,11 @@
-{pkgs, ...}: {
+{
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
   users.users.gotosocial.extraGroups = ["virtualMail"];
 
   services.nginx = {
diff --git a/nixos/server/package-configs/jellyfin/default.nix b/nixos/server/package-configs/jellyfin/default.nix
index cc492d4..f61461e 100644
--- a/nixos/server/package-configs/jellyfin/default.nix
+++ b/nixos/server/package-configs/jellyfin/default.nix
@@ -1,4 +1,11 @@
-{...}: {
+{
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
   users.users.jellyfin.extraGroups = ["nextcloud" "aria2"];
 
   services.nginx = {
diff --git a/nixos/server/package-configs/mail-server/default.nix b/nixos/server/package-configs/mail-server/default.nix
index 878be36..e43a5c6 100644
--- a/nixos/server/package-configs/mail-server/default.nix
+++ b/nixos/server/package-configs/mail-server/default.nix
@@ -1,4 +1,11 @@
-{config, ...}: {
+{
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
   sops.secrets."mailpass".mode = "0440";
   sops.secrets."mailpass".owner = config.users.users.virtualMail.name;
 
diff --git a/nixos/server/package-configs/ombi/default.nix b/nixos/server/package-configs/ombi/default.nix
index c82156c..7065ae5 100644
--- a/nixos/server/package-configs/ombi/default.nix
+++ b/nixos/server/package-configs/ombi/default.nix
@@ -1,4 +1,8 @@
-{...}: {
+{
+  config,
+  pkgs,
+  ...
+}: {
   users.users = {
     ombi.extraGroups = ["radarr" "sonarr" "aria2" "nextcloud"];
   };
diff --git a/nixos/server/package-configs/phanpy/default.nix b/nixos/server/package-configs/phanpy/default.nix
index 362f8f7..216412e 100644
--- a/nixos/server/package-configs/phanpy/default.nix
+++ b/nixos/server/package-configs/phanpy/default.nix
@@ -1,4 +1,10 @@
-{pkgs, ...}: {
+{
+  config,
+  pkgs,
+  inputs,
+  lib,
+  ...
+}: {
   services.nginx = {
     enable = true;
     virtualHosts = {
diff --git a/nixos/server/package-configs/postgres/default.nix b/nixos/server/package-configs/postgres/default.nix
index 0a3e4f6..92b9478 100644
--- a/nixos/server/package-configs/postgres/default.nix
+++ b/nixos/server/package-configs/postgres/default.nix
@@ -1,4 +1,8 @@
-{pkgs, ...}: {
+{
+  config,
+  pkgs,
+  ...
+}: {
   services.postgresql = {
     # https://nixos.org/manual/nixos/stable/#module-postgresql
     package = pkgs.postgresql_16;
diff --git a/nixos/server/package-configs/roundcube/default.nix b/nixos/server/package-configs/roundcube/default.nix
index 59ee43d..d33c621 100644
--- a/nixos/server/package-configs/roundcube/default.nix
+++ b/nixos/server/package-configs/roundcube/default.nix
@@ -1,6 +1,7 @@
 {
   config,
   pkgs,
+  lib,
   ...
 }: {
   # TODO: Figure out how to create packages for some plugins for roundcube!
diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix
index b664165..a845b75 100644
--- a/nixos/shared/default.nix
+++ b/nixos/shared/default.nix
@@ -1,8 +1,10 @@
 {
   inputs,
+  outputs,
   lib,
   config,
   pkgs,
+  pkgs-edge,
   ...
 }: {
   imports = [
diff --git a/nixos/shared/locale/default.nix b/nixos/shared/locale/default.nix
index ea9e4e8..2444204 100644
--- a/nixos/shared/locale/default.nix
+++ b/nixos/shared/locale/default.nix
@@ -1,4 +1,11 @@
-{...}: {
+{
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
   # Select internationalisation properties.
   i18n.defaultLocale = "en_US.UTF-8";
 
diff --git a/nixos/shared/packages/default.nix b/nixos/shared/packages/default.nix
index b59dcc2..6f28f40 100644
--- a/nixos/shared/packages/default.nix
+++ b/nixos/shared/packages/default.nix
@@ -1,5 +1,8 @@
 {
+  inputs,
   outputs,
+  lib,
+  config,
   pkgs,
   pkgs-edge,
   ...
diff --git a/pkgs/auto-mount/default.nix b/pkgs/auto-mount/default.nix
index b7a8a26..3a27c32 100644
--- a/pkgs/auto-mount/default.nix
+++ b/pkgs/auto-mount/default.nix
@@ -1,5 +1,10 @@
 {
+  lib,
+  stdenv,
+  system,
   pkgs,
+  util-linux,
+  jq,
   writeShellApplication,
 }:
 writeShellApplication
diff --git a/pkgs/dvd/default.nix b/pkgs/dvd/default.nix
index 0973487..7c6f81f 100644
--- a/pkgs/dvd/default.nix
+++ b/pkgs/dvd/default.nix
@@ -1,4 +1,6 @@
 {
+  lib,
+  stdenv,
   direnv,
   writeShellApplication,
 }:
diff --git a/pkgs/dvt/default.nix b/pkgs/dvt/default.nix
index 7a9424c..eabc160 100644
--- a/pkgs/dvt/default.nix
+++ b/pkgs/dvt/default.nix
@@ -1,4 +1,6 @@
 {
+  lib,
+  stdenv,
   direnv,
   writeShellApplication,
 }:
diff --git a/pkgs/install-nix-no-inhibit/default.nix b/pkgs/install-nix-no-inhibit/default.nix
index 622170a..f9365fe 100644
--- a/pkgs/install-nix-no-inhibit/default.nix
+++ b/pkgs/install-nix-no-inhibit/default.nix
@@ -1,4 +1,6 @@
 {
+  lib,
+  stdenv,
   git,
   gum,
   writeShellApplication,
diff --git a/pkgs/install-nix/default.nix b/pkgs/install-nix/default.nix
index 51bd530..bfcf17e 100644
--- a/pkgs/install-nix/default.nix
+++ b/pkgs/install-nix/default.nix
@@ -1,4 +1,8 @@
-{writeShellApplication}:
+{
+  lib,
+  stdenv,
+  writeShellApplication,
+}:
 writeShellApplication
 {
   name = "install-nix";
diff --git a/pkgs/rebuild-no-inhibit/default.nix b/pkgs/rebuild-no-inhibit/default.nix
index e4bd280..4503fcc 100644
--- a/pkgs/rebuild-no-inhibit/default.nix
+++ b/pkgs/rebuild-no-inhibit/default.nix
@@ -1,4 +1,8 @@
-{writeShellApplication}:
+{
+  lib,
+  stdenv,
+  writeShellApplication,
+}:
 writeShellApplication
 {
   name = "rebuild-no-inhibit";
diff --git a/pkgs/rebuild/default.nix b/pkgs/rebuild/default.nix
index 8c61e66..8b59258 100644
--- a/pkgs/rebuild/default.nix
+++ b/pkgs/rebuild/default.nix
@@ -1,4 +1,8 @@
-{writeShellApplication}:
+{
+  lib,
+  stdenv,
+  writeShellApplication,
+}:
 writeShellApplication
 {
   name = "rebuild";
diff --git a/pkgs/restart/default.nix b/pkgs/restart/default.nix
index 2405faa..c3fe9c1 100644
--- a/pkgs/restart/default.nix
+++ b/pkgs/restart/default.nix
@@ -1,4 +1,8 @@
-{writeShellApplication}:
+{
+  lib,
+  stdenv,
+  writeShellApplication,
+}:
 writeShellApplication
 {
   name = "restart";
diff --git a/pkgs/update/default.nix b/pkgs/update/default.nix
index 7f1b3e4..a965b8c 100644
--- a/pkgs/update/default.nix
+++ b/pkgs/update/default.nix
@@ -1,4 +1,8 @@
-{writeShellApplication}:
+{
+  lib,
+  stdenv,
+  writeShellApplication,
+}:
 writeShellApplication
 {
   name = "update";
diff --git a/pkgs/upgrade/default.nix b/pkgs/upgrade/default.nix
index 7ab662b..d72c480 100644
--- a/pkgs/upgrade/default.nix
+++ b/pkgs/upgrade/default.nix
@@ -1,4 +1,8 @@
-{writeShellApplication}:
+{
+  lib,
+  stdenv,
+  writeShellApplication,
+}:
 writeShellApplication
 {
   name = "upgrade";