diff --git a/machines/Archie/hardware-configuration.nix b/machines/Archie/hardware-configuration.nix
index ccd1840..bd32dc6 100644
--- a/machines/Archie/hardware-configuration.nix
+++ b/machines/Archie/hardware-configuration.nix
@@ -4,7 +4,6 @@
 {
   config,
   lib,
-  pkgs,
   modulesPath,
   ...
 }: {
diff --git a/machines/Everest/configuration.nix b/machines/Everest/configuration.nix
index d7f8a46..c85e788 100755
--- a/machines/Everest/configuration.nix
+++ b/machines/Everest/configuration.nix
@@ -1,12 +1,7 @@
 # Edit this configuration file to define what should be installed on
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}: {
+{lib, ...}: {
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.timeout = 5;
diff --git a/machines/Everest/hardware-configuration.nix b/machines/Everest/hardware-configuration.nix
index 007bc26..7a97c97 100755
--- a/machines/Everest/hardware-configuration.nix
+++ b/machines/Everest/hardware-configuration.nix
@@ -4,7 +4,6 @@
 {
   config,
   lib,
-  pkgs,
   modulesPath,
   ...
 }: {
diff --git a/machines/SteamDeck/hardware-configuration.nix b/machines/SteamDeck/hardware-configuration.nix
index dfb3835..74f2cd4 100755
--- a/machines/SteamDeck/hardware-configuration.nix
+++ b/machines/SteamDeck/hardware-configuration.nix
@@ -4,7 +4,6 @@
 {
   config,
   lib,
-  pkgs,
   modulesPath,
   ...
 }: let
diff --git a/machines/SurfaceGo/hardware-configuration.nix b/machines/SurfaceGo/hardware-configuration.nix
index 955cc05..81a4c56 100644
--- a/machines/SurfaceGo/hardware-configuration.nix
+++ b/machines/SurfaceGo/hardware-configuration.nix
@@ -4,7 +4,6 @@
 {
   config,
   lib,
-  pkgs,
   ...
 }: {
   boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usbhid" "rtsx_pci_sdmmc"];
diff --git a/roles/common/configuration.nix b/roles/common/configuration.nix
index 210eb6f..53fa7ba 100755
--- a/roles/common/configuration.nix
+++ b/roles/common/configuration.nix
@@ -94,7 +94,7 @@
     backupFileExtension = "hm-backup";
     useGlobalPkgs = true;
     verbose = true;
-    users.toast = {config, ...}: {
+    users.toast = {...}: {
       home.stateVersion = "23.11";
       xdg = {
         userDirs = {
diff --git a/roles/common/programs/bash.nix b/roles/common/programs/bash.nix
index bfcc625..66bfbea 100644
--- a/roles/common/programs/bash.nix
+++ b/roles/common/programs/bash.nix
@@ -1,5 +1,5 @@
-{config, ...}: {
-  home-manager.users.toast = {config, ...}: {
+{...}: {
+  home-manager.users.toast = {...}: {
     programs.bash = {
       enable = true;
       enableVteIntegration = true;
diff --git a/roles/common/programs/comma.nix b/roles/common/programs/comma.nix
index e276b89..c04afcb 100644
--- a/roles/common/programs/comma.nix
+++ b/roles/common/programs/comma.nix
@@ -1,8 +1,4 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
+{...}: {
   # Use nix-index-database's comma wrapper
   programs.nix-index-database.comma.enable = true;
   # Run programs from the system's nixpkgs
diff --git a/roles/common/programs/command-not-found.nix b/roles/common/programs/command-not-found.nix
index 8dfa3d1..e3dcd3a 100755
--- a/roles/common/programs/command-not-found.nix
+++ b/roles/common/programs/command-not-found.nix
@@ -1,4 +1,4 @@
-{config, ...}: {
+{...}: {
   # The nixpkgs command-not-found script does not work with flakes, so I disable it
   programs.command-not-found.enable = false;
 }
diff --git a/roles/common/programs/default.nix b/roles/common/programs/default.nix
index 8a8df10..feff14d 100755
--- a/roles/common/programs/default.nix
+++ b/roles/common/programs/default.nix
@@ -1,8 +1,4 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: {
   imports = [
     ./htop.nix
     ./nix.nix
diff --git a/roles/common/programs/git.nix b/roles/common/programs/git.nix
index c9b673a..3b125df 100644
--- a/roles/common/programs/git.nix
+++ b/roles/common/programs/git.nix
@@ -1,8 +1,4 @@
-{
-  config,
-  pkgs,
-  ...
-}: let
+{pkgs, ...}: let
   catppuccinDelta = pkgs.fetchFromGitHub {
     owner = "catppuccin";
     repo = "delta";
diff --git a/roles/common/programs/htop.nix b/roles/common/programs/htop.nix
index 27c0ea1..4d8bd79 100755
--- a/roles/common/programs/htop.nix
+++ b/roles/common/programs/htop.nix
@@ -1,4 +1,4 @@
-{config, ...}: {
+{...}: {
   programs.htop = {
     enable = true;
     settings = {
diff --git a/roles/common/programs/micro.nix b/roles/common/programs/micro.nix
index ab14d1d..75df151 100644
--- a/roles/common/programs/micro.nix
+++ b/roles/common/programs/micro.nix
@@ -1,14 +1,6 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
+{...}: {
   home-manager = {
-    users.toast = {
-      config,
-      pkgs,
-      ...
-    }: {
+    users.toast = {...}: {
       programs.micro = {
         enable = true;
         settings = {
diff --git a/roles/common/programs/nix-index.nix b/roles/common/programs/nix-index.nix
index cce8c55..c3a8177 100755
--- a/roles/common/programs/nix-index.nix
+++ b/roles/common/programs/nix-index.nix
@@ -1,4 +1,4 @@
-{config, ...}: {
+{...}: {
   /*
       environment.systemPackages = [ pkgs.nix-index ];
   	programs.bash.interactiveShellInit = ''
diff --git a/roles/common/programs/nix.nix b/roles/common/programs/nix.nix
index 9444f9b..1663df2 100755
--- a/roles/common/programs/nix.nix
+++ b/roles/common/programs/nix.nix
@@ -1,8 +1,4 @@
-{
-  config,
-  systemPkgs,
-  ...
-}: {
+{systemPkgs, ...}: {
   nix = {
     settings = {
       auto-optimise-store = true;
diff --git a/roles/common/services/tailscale.nix b/roles/common/services/tailscale.nix
index 92080d1..a7c0338 100644
--- a/roles/common/services/tailscale.nix
+++ b/roles/common/services/tailscale.nix
@@ -1,8 +1,4 @@
-{
-  config,
-  lib,
-  ...
-}: {
+{lib, ...}: {
   services.tailscale = {
     enable = true;
     useRoutingFeatures = lib.mkDefault "client";
diff --git a/roles/desktop/configuration.nix b/roles/desktop/configuration.nix
index c56559d..26030cf 100644
--- a/roles/desktop/configuration.nix
+++ b/roles/desktop/configuration.nix
@@ -1,8 +1,4 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: {
   # Enable scanning
   hardware.sane = {
     enable = true;
diff --git a/roles/desktop/programs/discord.nix b/roles/desktop/programs/discord.nix
index 71b3c07..722d013 100644
--- a/roles/desktop/programs/discord.nix
+++ b/roles/desktop/programs/discord.nix
@@ -1,10 +1,9 @@
 {
-  config,
   pkgs,
   lib,
   ...
 }: let
-  discordOverlay = self: super: {
+  discordOverlay = _self: super: {
     discord = super.discord.override {
       withOpenASAR = true;
       withVencord = true;
@@ -23,7 +22,7 @@
     };
     */
   };
-  stock-discord = self: super: {
+  stock-discord = _self: super: {
     discord = super.discord.override {
       withOpenASAR = false;
       withVencord = false;
diff --git a/roles/desktop/programs/firefox.nix b/roles/desktop/programs/firefox.nix
index bb2e697..96b50a9 100644
--- a/roles/desktop/programs/firefox.nix
+++ b/roles/desktop/programs/firefox.nix
@@ -1,8 +1,4 @@
-{
-  config,
-  lib,
-  ...
-}: {
+{lib, ...}: {
   # System wide firefox settings
   programs.firefox = {
     enable = true;
diff --git a/roles/desktop/programs/jamesdsp.nix b/roles/desktop/programs/jamesdsp.nix
index 3f1aa35..a9933bc 100644
--- a/roles/desktop/programs/jamesdsp.nix
+++ b/roles/desktop/programs/jamesdsp.nix
@@ -1,7 +1,3 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: {
   users.users.toast.packages = [pkgs.jamesdsp];
 }
diff --git a/roles/desktop/programs/keepassxc.nix b/roles/desktop/programs/keepassxc.nix
index 3eedb2b..ad2dbb2 100644
--- a/roles/desktop/programs/keepassxc.nix
+++ b/roles/desktop/programs/keepassxc.nix
@@ -1,9 +1,4 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}: let
+{lib, ...}: let
   kpxcSettings = lib.generators.toINI {} {
     General = {
       # Not sure what changing this does, I'll leave it alone
@@ -32,7 +27,6 @@ in {
   home-manager = {
     extraSpecialArgs = {kpxcSettings = kpxcSettings;};
     users.toast = {
-      config,
       pkgs,
       kpxcSettings,
       ...
diff --git a/roles/desktop/programs/micro.nix b/roles/desktop/programs/micro.nix
index 38fda68..d934774 100644
--- a/roles/desktop/programs/micro.nix
+++ b/roles/desktop/programs/micro.nix
@@ -1,15 +1,6 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}: {
+{lib, ...}: {
   home-manager = {
-    users.toast = {
-      config,
-      pkgs,
-      ...
-    }: {
+    users.toast = {pkgs, ...}: {
       programs.micro = {
         enable = true;
         settings = {
diff --git a/roles/desktop/programs/vscode.nix b/roles/desktop/programs/vscode.nix
index ba6fa43..0147762 100644
--- a/roles/desktop/programs/vscode.nix
+++ b/roles/desktop/programs/vscode.nix
@@ -1,5 +1,4 @@
 {
-  config,
   pkgs,
   flakeSelf,
   ...
diff --git a/roles/desktop/services/flatpak.nix b/roles/desktop/services/flatpak.nix
index 775bf53..57d5456 100644
--- a/roles/desktop/services/flatpak.nix
+++ b/roles/desktop/services/flatpak.nix
@@ -1,9 +1,4 @@
-{
-  config,
-  pkgs,
-  flakeSelf,
-  ...
-}: {
+{flakeSelf, ...}: {
   services.flatpak.enable = true;
 
   home-manager = {
diff --git a/roles/desktop/services/pipewire.nix b/roles/desktop/services/pipewire.nix
index c25506f..f32365b 100644
--- a/roles/desktop/services/pipewire.nix
+++ b/roles/desktop/services/pipewire.nix
@@ -1,4 +1,4 @@
-{config, ...}: {
+{...}: {
   services.pipewire = {
     enable = true;
     pulse.enable = true;
diff --git a/roles/desktop/services/printing.nix b/roles/desktop/services/printing.nix
index faa6c14..49a590d 100644
--- a/roles/desktop/services/printing.nix
+++ b/roles/desktop/services/printing.nix
@@ -1,4 +1,4 @@
-{config, ...}: {
+{...}: {
   services.printing = {
     enable = true;
     startWhenNeeded = true;
diff --git a/roles/desktop/services/ssh-agent.nix b/roles/desktop/services/ssh-agent.nix
index a2de598..6f734f8 100644
--- a/roles/desktop/services/ssh-agent.nix
+++ b/roles/desktop/services/ssh-agent.nix
@@ -1,8 +1,4 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
+{...}: {
   programs.ssh.startAgent = true;
   /*
   Home assistant added an option that does this
diff --git a/roles/gaming/programs/default.nix b/roles/gaming/programs/default.nix
index a81bba7..445b615 100755
--- a/roles/gaming/programs/default.nix
+++ b/roles/gaming/programs/default.nix
@@ -1,8 +1,4 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: {
   imports = [
     ./steam.nix
     ./mangohud.nix
diff --git a/roles/gaming/programs/mangohud.nix b/roles/gaming/programs/mangohud.nix
index 41db63d..91e4675 100644
--- a/roles/gaming/programs/mangohud.nix
+++ b/roles/gaming/programs/mangohud.nix
@@ -1,5 +1,5 @@
-{config, ...}: {
-  home-manager.users.toast = {config, ...}: {
+{...}: {
+  home-manager.users.toast = {...}: {
     programs.mangohud = {
       enable = true;
       # This only works for Vulkan, openGL programs still need the mangohud wrapper
diff --git a/roles/gaming/programs/rpcs3.nix b/roles/gaming/programs/rpcs3.nix
index bb7f908..ef1be51 100644
--- a/roles/gaming/programs/rpcs3.nix
+++ b/roles/gaming/programs/rpcs3.nix
@@ -1,8 +1,4 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
+{config, ...}: {
   environment.systemPackages = with config; [
     nur.repos.ataraxiasjel.rpcs3
   ];
diff --git a/roles/gaming/services/syncthing.nix b/roles/gaming/services/syncthing.nix
index c9749c6..5a1daa0 100644
--- a/roles/gaming/services/syncthing.nix
+++ b/roles/gaming/services/syncthing.nix
@@ -1,4 +1,4 @@
-{config, ...}: {
+{...}: {
   /*
   This file will sync saves for games that don't have cloud saves
   TODO: turn this into a module eventually
diff --git a/roles/kde/programs/default.nix b/roles/kde/programs/default.nix
index 21f09ba..bbfc028 100644
--- a/roles/kde/programs/default.nix
+++ b/roles/kde/programs/default.nix
@@ -1,4 +1,4 @@
-{config, ...}: {
+{...}: {
   imports = [
     ./kate.nix
     ./firefox.nix
diff --git a/roles/kde/programs/firefox.nix b/roles/kde/programs/firefox.nix
index 14eab1a..bbe1638 100644
--- a/roles/kde/programs/firefox.nix
+++ b/roles/kde/programs/firefox.nix
@@ -1,8 +1,4 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
+{...}: {
   # KDE specific firefox settings
   programs.firefox = {
     policies = {
diff --git a/roles/kde/programs/git.nix b/roles/kde/programs/git.nix
index 59a3924..e4e40d4 100644
--- a/roles/kde/programs/git.nix
+++ b/roles/kde/programs/git.nix
@@ -1,8 +1,4 @@
-{
-  pkgs,
-  lib,
-  ...
-}: {
+{...}: {
   home-manager.users.toast = {
     programs.git = {
       extraConfig = {
diff --git a/roles/kde/programs/kate.nix b/roles/kde/programs/kate.nix
index 9151416..7f034fc 100644
--- a/roles/kde/programs/kate.nix
+++ b/roles/kde/programs/kate.nix
@@ -1,8 +1,4 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: {
   environment.systemPackages = [pkgs.kate];
 
   # Use kwrite to open text files, and kate if I'm developing stuff
diff --git a/roles/school/programs/default.nix b/roles/school/programs/default.nix
index cef6e88..2bbc214 100644
--- a/roles/school/programs/default.nix
+++ b/roles/school/programs/default.nix
@@ -1,8 +1,4 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: {
   imports = [
     ./virtualbox.nix
     ./idea.nix
diff --git a/roles/school/programs/idea.nix b/roles/school/programs/idea.nix
index a13dd63..7f818a5 100644
--- a/roles/school/programs/idea.nix
+++ b/roles/school/programs/idea.nix
@@ -1,8 +1,4 @@
-{
-  config,
-  pkgs,
-  ...
-}:
+{pkgs, ...}:
 with pkgs; {
   environment.systemPackages = with jetbrains; [
     idea-ultimate
diff --git a/roles/school/programs/virtualbox.nix b/roles/school/programs/virtualbox.nix
index 0e88135..58e7ff1 100644
--- a/roles/school/programs/virtualbox.nix
+++ b/roles/school/programs/virtualbox.nix
@@ -1,4 +1,4 @@
-{config, ...}: {
+{...}: {
   # Need to use visual studio 2019 :(
   virtualisation.virtualbox.host = {
     enable = true;
diff --git a/roles/school/programs/vscode.nix b/roles/school/programs/vscode.nix
index 331f5f5..e39e633 100644
--- a/roles/school/programs/vscode.nix
+++ b/roles/school/programs/vscode.nix
@@ -1,5 +1,4 @@
 {
-  config,
   pkgs,
   lib,
   flakeSelf,
diff --git a/roles/school/services/syncthing.nix b/roles/school/services/syncthing.nix
index bb23f47..84cd213 100644
--- a/roles/school/services/syncthing.nix
+++ b/roles/school/services/syncthing.nix
@@ -1,4 +1,4 @@
-{config, ...}: {
+{...}: {
   services.syncthing.settings.folders = {
     "school-things" = {
       label = "School things";
diff --git a/roles/school/services/xampp.nix b/roles/school/services/xampp.nix
index 22eed0d..26ee73b 100644
--- a/roles/school/services/xampp.nix
+++ b/roles/school/services/xampp.nix
@@ -1,8 +1,4 @@
-{
-  config,
-  pkgs,
-  ...
-}: let
+{pkgs, ...}: let
   booDark = pkgs.fetchzip {
     url = "https://github.com/adorade/boodark/releases/download/v1.1.1/boodark-v1.1.1.zip";
     hash = "sha256-GE/FtFlU6A4I9sRyjMhQIidGpDLD99Wzzngz3QI/rSo=";
diff --git a/roles/server/avahi.nix b/roles/server/avahi.nix
index bfbb229..b0d3798 100755
--- a/roles/server/avahi.nix
+++ b/roles/server/avahi.nix
@@ -1,4 +1,4 @@
-{config, ...}: {
+{...}: {
   services.avahi = {
     openFirewall = true;
     publish = {
diff --git a/roles/server/beep.nix b/roles/server/beep.nix
index 1758887..f8be721 100755
--- a/roles/server/beep.nix
+++ b/roles/server/beep.nix
@@ -1,8 +1,4 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: {
   # Beep as soon as possible in the initrd
   boot.initrd = {
     kernelModules = ["pcspkr"];
diff --git a/roles/server/endlessh.nix b/roles/server/endlessh.nix
index 6495f26..9650d7c 100755
--- a/roles/server/endlessh.nix
+++ b/roles/server/endlessh.nix
@@ -1,4 +1,4 @@
-{config, ...}: {
+{...}: {
   # I prefer using the go implementation
   services.endlessh-go = {
     enable = true;
diff --git a/roles/server/nfs.nix b/roles/server/nfs.nix
index f87c4a7..5122cc7 100755
--- a/roles/server/nfs.nix
+++ b/roles/server/nfs.nix
@@ -1,8 +1,4 @@
-{
-  config,
-  lib,
-  ...
-}: {
+{config, ...}: {
   services = {
     nfs.server = {
       enable = true;
diff --git a/roles/server/samba.nix b/roles/server/samba.nix
index bb7def4..f4fd086 100755
--- a/roles/server/samba.nix
+++ b/roles/server/samba.nix
@@ -1,8 +1,4 @@
-{
-  config,
-  lib,
-  ...
-}: {
+{config, ...}: {
   services = {
     samba = {
       enable = true;
diff --git a/roles/server/ssh.nix b/roles/server/ssh.nix
index 0275ca1..ede04a3 100755
--- a/roles/server/ssh.nix
+++ b/roles/server/ssh.nix
@@ -1,4 +1,4 @@
-{config, ...}: {
+{...}: {
   services.openssh = {
     enable = true;
     settings = {
diff --git a/roles/server/tailscale.nix b/roles/server/tailscale.nix
index 0f0fba4..d0c6aed 100644
--- a/roles/server/tailscale.nix
+++ b/roles/server/tailscale.nix
@@ -1,4 +1,4 @@
-{config, ...}: {
+{...}: {
   services.tailscale = {
     # This is needed for being an exit node
     useRoutingFeatures = "server";
diff --git a/roles/server/traefik.nix b/roles/server/traefik.nix
index 5e44607..171f64d 100644
--- a/roles/server/traefik.nix
+++ b/roles/server/traefik.nix
@@ -1,4 +1,4 @@
-{config, ...}: {
+{...}: {
   specialisation.traefikEnableWebUI.configuration.services.traefik = {
     staticConfigOptions = {
       api = {