diff --git a/config/default.nix b/config/default.nix
index a8fe7b5..b1dfef1 100644
--- a/config/default.nix
+++ b/config/default.nix
@@ -1,5 +1,3 @@
-{ config, lib, pkgs, ... }:
-
 {
   imports = [
     ./etc.nix
diff --git a/config/etc.nix b/config/etc.nix
index 05c5631..7171993 100644
--- a/config/etc.nix
+++ b/config/etc.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 
diff --git a/config/locale.nix b/config/locale.nix
index d2171ee..ae037b8 100644
--- a/config/locale.nix
+++ b/config/locale.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, pkgs, ... }:
 
 {
   i18n = {
diff --git a/config/networking.nix b/config/networking.nix
index 7fc3a42..94e1671 100644
--- a/config/networking.nix
+++ b/config/networking.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, ... }:
 
 let
  firewallcfg = config.machine.firewall;
diff --git a/config/nix.nix b/config/nix.nix
index 11774dc..52b9979 100644
--- a/config/nix.nix
+++ b/config/nix.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, ... }:
 
 {
   nix = {
diff --git a/config/security.nix b/config/security.nix
index 44568c3..52131af 100644
--- a/config/security.nix
+++ b/config/security.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 
diff --git a/config/users.nix b/config/users.nix
index 615664f..8fc61d6 100644
--- a/config/users.nix
+++ b/config/users.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 
diff --git a/config/zsh.nix b/config/zsh.nix
index 24fb37d..4e5c5a7 100644
--- a/config/zsh.nix
+++ b/config/zsh.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 
diff --git a/configuration.nix b/configuration.nix
index bec2ee7..fbf922a 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, ... }:
 
 with lib;
 
diff --git a/machines/CDServer/configuration.nix b/machines/CDServer/configuration.nix
index 73c1095..6eec01a 100644
--- a/machines/CDServer/configuration.nix
+++ b/machines/CDServer/configuration.nix
@@ -2,8 +2,6 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ config, pkgs, ... }:
-
 {
   imports = [
       ./hardware-configuration.nix
diff --git a/machines/CDServer/options.nix b/machines/CDServer/options.nix
index d659dc1..555f6b0 100644
--- a/machines/CDServer/options.nix
+++ b/machines/CDServer/options.nix
@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ lib, ... }:
 
 with lib;
 
diff --git a/machines/Leviathan/Leviathan.nix b/machines/Leviathan/Leviathan.nix
index 470313d..4b8bfe2 100644
--- a/machines/Leviathan/Leviathan.nix
+++ b/machines/Leviathan/Leviathan.nix
@@ -1,8 +1,6 @@
-{ config, lib, pkgs, ... }:
+{ pkgs, ... }:
 
-let
- cfg = import ./configuration.nix;
-in {
+{
   imports = [
     ./hardware-configuration.nix
   ];
diff --git a/machines/Leviathan/hardware-configuration.nix b/machines/Leviathan/hardware-configuration.nix
index 36a7444..e8a0156 100644
--- a/machines/Leviathan/hardware-configuration.nix
+++ b/machines/Leviathan/hardware-configuration.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, pkgs, ... }:
 
 {
   imports = [
diff --git a/machines/Lilim/configuration.nix b/machines/Lilim/configuration.nix
index 601c9e0..4bc2225 100644
--- a/machines/Lilim/configuration.nix
+++ b/machines/Lilim/configuration.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ pkgs, ... }:
 
 {
   imports = [
diff --git a/machines/Lilim/hardware-configuration.nix b/machines/Lilim/hardware-configuration.nix
index 20a8f08..bed052e 100644
--- a/machines/Lilim/hardware-configuration.nix
+++ b/machines/Lilim/hardware-configuration.nix
@@ -1,7 +1,6 @@
-{ config, lib, pkgs, ... }:
+{ pkgs, ... }:
 
 let
- localpkgs = import <nixpkgs-local> {};
  musnix_channel = (fetchTarball "https://github.com/musnix/musnix/archive/master.tar.gz");
 # vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
 in {
@@ -26,7 +25,7 @@ in {
 
     initrd.kernelModules = [ "hid-multitouch" ];
     initrd.availableKernelModules = [ "hid-microsoft" "hid-multitouch" "xhci_pci" "nvme" "usb_storage" "sd_mod" ];
-    kernelModules = [ "kvm-intel" "hid-microsoft" "hid-multitouch" "uinput" ] ++ [ "snd-seq" "snd-rawmidi" ];
+    kernelModules = [ "kvm-intel" "hid-microsoft" "hid-multitouch" "uinput" ];
     kernel.sysctl = { "fs.inotify.max_user_watches" = 524288; };
     kernelParams = [ "threadirq" ];
     extraModulePackages = [ ];
diff --git a/machines/Lilim/options.nix b/machines/Lilim/options.nix
index 1f52138..4a3b9ae 100644
--- a/machines/Lilim/options.nix
+++ b/machines/Lilim/options.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, ... }:
 
 with lib;
 
diff --git a/machines/Ophanim/configuration.nix b/machines/Ophanim/configuration.nix
index af98748..61adb62 100644
--- a/machines/Ophanim/configuration.nix
+++ b/machines/Ophanim/configuration.nix
@@ -2,8 +2,6 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ config, pkgs, ... }:
-
 {
   imports = [
       ./hardware-configuration.nix
diff --git a/machines/Ophanim/hardware-configuration.nix b/machines/Ophanim/hardware-configuration.nix
index 83fc558..83329fb 100644
--- a/machines/Ophanim/hardware-configuration.nix
+++ b/machines/Ophanim/hardware-configuration.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ pkgs, ... }:
 
 {
   imports =
diff --git a/machines/Ophanim/options.nix b/machines/Ophanim/options.nix
index 09afed8..546a04b 100644
--- a/machines/Ophanim/options.nix
+++ b/machines/Ophanim/options.nix
@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ lib, ... }:
 
 with lib;
 
diff --git a/options/machine.nix b/options/machine.nix
index f795e45..7f6b4fb 100644
--- a/options/machine.nix
+++ b/options/machine.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ lib, ... }:
 
 with lib;
 
diff --git a/pkgs/nixpkgs.nix b/pkgs/nixpkgs.nix
index 7011fc1..329aea2 100644
--- a/pkgs/nixpkgs.nix
+++ b/pkgs/nixpkgs.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 {
   nixpkgs.config = {
diff --git a/pkgs/pkgsets.nix b/pkgs/pkgsets.nix
index e2ebc98..4521372 100644
--- a/pkgs/pkgsets.nix
+++ b/pkgs/pkgsets.nix
@@ -1,14 +1,11 @@
-{ stable ? import <nixos-stable>,
-  unstable ? import <nixos-unstable>,
-  gitpkgs ? import /nixpkgs/default.nix,
-  config, lib, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 with lib;
 
 let
   cfg = config.machine;
   optPkgs = package: pkgstring: optionals (elem pkgstring cfg.pkgs) package;
-  gitpkgs = import /nixpkgs/default.nix {};
+  gitpkgs = import /nixpkgs {};
 
   # Programms I'm likely to want on every machine and/or may execute as root
   base = with pkgs; [
diff --git a/services/containers.nix b/services/containers.nix
index 2d5b197..1a108ec 100644
--- a/services/containers.nix
+++ b/services/containers.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 
@@ -8,8 +8,6 @@ mkIf (elem "containers" config.machine.services) {
     hostAddress = "192.168.100.10";
     localAddress = "192.168.100.11";
     config =
-      { config, lib, pkgs, ... }:
-
       {
         imports = [
           ../machines/CDServer/options.nix
diff --git a/services/default.nix b/services/default.nix
index 1584c78..7dc3c30 100644
--- a/services/default.nix
+++ b/services/default.nix
@@ -1,5 +1,3 @@
-{ config, lib, pkgs, ... }:
-
 {
   imports = [
     ./cups.nix
diff --git a/services/desktop/gnome3.nix b/services/desktop/gnome3.nix
deleted file mode 100644
index e69de29..0000000
diff --git a/services/ejabberd.nix b/services/ejabberd.nix
deleted file mode 100644
index bac4444..0000000
--- a/services/ejabberd.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  services.ejabberd = {
-    enable = true;
-    imagemagick = true;
-  };
-}
diff --git a/services/fail2ban.nix b/services/fail2ban.nix
index b959a22..ef73c7a 100644
--- a/services/fail2ban.nix
+++ b/services/fail2ban.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 # mostly taken from https://github.com/davidak/nixos-config/blob/master/services/fail2ban.nix
 with lib;
diff --git a/services/gitea.nix b/services/gitea.nix
index 9e0e9d9..3465832 100644
--- a/services/gitea.nix
+++ b/services/gitea.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 
diff --git a/services/hydra.nix b/services/hydra.nix
index 739bad1..9c27df3 100644
--- a/services/hydra.nix
+++ b/services/hydra.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 # hydra user needs to be manually crated
 # sudo -u hydra -s
@@ -10,7 +10,7 @@
 
 with lib;
 
-mkIf (elem "hydra" config.machine.services) rec {
+mkIf (elem "hydra" config.machine.services) {
   # also take a look at ../conf/nix.nix
   nix.buildMachines = [
     {
diff --git a/services/mailserver.nix b/services/mailserver.nix
index 5b960b3..270685f 100644
--- a/services/mailserver.nix
+++ b/services/mailserver.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 
diff --git a/services/nextcloud.nix b/services/nextcloud.nix
index 93b08a7..baa07f5 100644
--- a/services/nextcloud.nix
+++ b/services/nextcloud.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 
diff --git a/services/openssh.nix b/services/openssh.nix
index 3f14bce..28fca4f 100644
--- a/services/openssh.nix
+++ b/services/openssh.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 # For reference:
 # https://infosec.mozilla.org/guidelines/openssh.html
diff --git a/services/prosody.nix b/services/prosody.nix
index 6ce5c6c..2666cdf 100644
--- a/services/prosody.nix
+++ b/services/prosody.nix
@@ -1,5 +1,3 @@
-{ config, pkgs, ... }:
-
 {
   services.prosody = {
     enable = true;
diff --git a/services/udev.nix b/services/udev.nix
index 8dda732..b16cfaf 100644
--- a/services/udev.nix
+++ b/services/udev.nix
@@ -1,34 +1,34 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 
 mkIf (elem "udev" config.machine.services) {
   services.udev.extraRules = ''
-# Valve USB devices
-SUBSYSTEM=="usb", ATTRS{idVendor}=="28de", TAG+="uaccess", TAG+="udev-acl"
+    # Valve USB devices
+    SUBSYSTEM=="usb", ATTRS{idVendor}=="28de", TAG+="uaccess", TAG+="udev-acl"
 
-# Steam Controller udev write access
-KERNEL=="uinput", SUBSYSTEM=="misc", TAG+="uaccess", TAG+="udev-acl"
+    # Steam Controller udev write access
+    KERNEL=="uinput", SUBSYSTEM=="misc", TAG+="uaccess", TAG+="udev-acl"
 
-# Valve HID devices over USB hidraw
-KERNEL=="hidraw*", ATTRS{idVendor}=="28de", TAG+="uaccess", TAG+="udev-acl"
+    # Valve HID devices over USB hidraw
+    KERNEL=="hidraw*", ATTRS{idVendor}=="28de", TAG+="uaccess", TAG+="udev-acl"
 
-# Valve HID devices over bluetooth hidraw
-KERNEL=="hidraw*", KERNELS=="*28DE:*", TAG+="uaccess", TAG+="udev-acl"
+    # Valve HID devices over bluetooth hidraw
+    KERNEL=="hidraw*", KERNELS=="*28DE:*", TAG+="uaccess", TAG+="udev-acl"
 
-# DualShock 4 over USB hidraw
-KERNEL=="hidraw*", ATTRS{idVendor}=="054c", ATTRS{idProduct}=="05c4", TAG+="uaccess", TAG+="udev-acl"
+    # DualShock 4 over USB hidraw
+    KERNEL=="hidraw*", ATTRS{idVendor}=="054c", ATTRS{idProduct}=="05c4", TAG+="uaccess", TAG+="udev-acl"
 
-# DualShock 4 wireless adapter over USB hidraw
-KERNEL=="hidraw*", ATTRS{idVendor}=="054c", ATTRS{idProduct}=="0ba0", TAG+="uaccess", TAG+="udev-acl"
+    # DualShock 4 wireless adapter over USB hidraw
+    KERNEL=="hidraw*", ATTRS{idVendor}=="054c", ATTRS{idProduct}=="0ba0", TAG+="uaccess", TAG+="udev-acl"
 
-# DualShock 4 Slim over USB hidraw
-KERNEL=="hidraw*", ATTRS{idVendor}=="054c", ATTRS{idProduct}=="09cc", TAG+="uaccess", TAG+="udev-acl"
+    # DualShock 4 Slim over USB hidraw
+    KERNEL=="hidraw*", ATTRS{idVendor}=="054c", ATTRS{idProduct}=="09cc", TAG+="uaccess", TAG+="udev-acl"
 
-# DualShock 4 over bluetooth hidraw
-KERNEL=="hidraw*", KERNELS=="*054C:05C4*", TAG+="uaccess", TAG+="udev-acl"
+    # DualShock 4 over bluetooth hidraw
+    KERNEL=="hidraw*", KERNELS=="*054C:05C4*", TAG+="uaccess", TAG+="udev-acl"
 
-# DualShock 4 Slim over bluetooth hidraw
-KERNEL=="hidraw*", KERNELS=="*054C:09CC*", TAG+="uaccess", TAG+="udev-acl"
+    # DualShock 4 Slim over bluetooth hidraw
+    KERNEL=="hidraw*", KERNELS=="*054C:09CC*", TAG+="uaccess", TAG+="udev-acl"
 '';
 }