Clean up in accordance with unofficial nix-linter.

config/default.nix

@@ -1,5 +1,3 @@
-{ config, lib, pkgs, ... }:
-
 {
   imports = [
     ./etc.nix

config/etc.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 

config/locale.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, pkgs, ... }:
 
 {
   i18n = {

config/networking.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, ... }:
 
 let
  firewallcfg = config.machine.firewall;

config/nix.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, ... }:
 
 {
   nix = {

config/security.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 

config/users.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 

config/zsh.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 

configuration.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, ... }:
 
 with lib;
 

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

machines/CDServer/options.nix

@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ lib, ... }:
 
 with lib;
 

machines/Leviathan/Leviathan.nix

@@ -1,8 +1,6 @@
-{ config, lib, pkgs, ... }:
+{ pkgs, ... }:
 
-let
+{
- cfg = import ./configuration.nix;
-in {
   imports = [
     ./hardware-configuration.nix
   ];

machines/Leviathan/hardware-configuration.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, pkgs, ... }:
 
 {
   imports = [

machines/Lilim/configuration.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ pkgs, ... }:
 
 {
   imports = [

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 = [ ];

machines/Lilim/options.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, ... }:
 
 with lib;
 

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

machines/Ophanim/hardware-configuration.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ pkgs, ... }:
 
 {
   imports =

machines/Ophanim/options.nix

@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ lib, ... }:
 
 with lib;
 

options/machine.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ lib, ... }:
 
 with lib;
 

pkgs/nixpkgs.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 {
   nixpkgs.config = {

pkgs/pkgsets.nix

@@ -1,14 +1,11 @@
-{ stable ? import <nixos-stable>,
+{ config, lib, pkgs, ... }:
-  unstable ? import <nixos-unstable>,
-  gitpkgs ? import /nixpkgs/default.nix,
-  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; [

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

services/default.nix

@@ -1,5 +1,3 @@
-{ config, lib, pkgs, ... }:
-
 {
   imports = [
     ./cups.nix

services/ejabberd.nix

@@ -1,8 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  services.ejabberd = {
-    enable = true;
-    imagemagick = true;
-  };
-}

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;

services/gitea.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 

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 = [
     {

services/mailserver.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 

services/nextcloud.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 

services/openssh.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 # For reference:
 # https://infosec.mozilla.org/guidelines/openssh.html

services/prosody.nix

@@ -1,5 +1,3 @@
-{ config, pkgs, ... }:
-
 {
   services.prosody = {
     enable = true;

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
+    # Valve USB devices
-SUBSYSTEM=="usb", ATTRS{idVendor}=="28de", TAG+="uaccess", TAG+="udev-acl"
+    SUBSYSTEM=="usb", ATTRS{idVendor}=="28de", TAG+="uaccess", TAG+="udev-acl"
 
-# Steam Controller udev write access
+    # Steam Controller udev write access
-KERNEL=="uinput", SUBSYSTEM=="misc", TAG+="uaccess", TAG+="udev-acl"
+    KERNEL=="uinput", SUBSYSTEM=="misc", TAG+="uaccess", TAG+="udev-acl"
 
-# Valve HID devices over USB hidraw
+    # Valve HID devices over USB hidraw
-KERNEL=="hidraw*", ATTRS{idVendor}=="28de", TAG+="uaccess", TAG+="udev-acl"
+    KERNEL=="hidraw*", ATTRS{idVendor}=="28de", TAG+="uaccess", TAG+="udev-acl"
 
-# Valve HID devices over bluetooth hidraw
+    # Valve HID devices over bluetooth hidraw
-KERNEL=="hidraw*", KERNELS=="*28DE:*", TAG+="uaccess", TAG+="udev-acl"
+    KERNEL=="hidraw*", KERNELS=="*28DE:*", TAG+="uaccess", TAG+="udev-acl"
 
-# DualShock 4 over USB hidraw
+    # DualShock 4 over USB hidraw
-KERNEL=="hidraw*", ATTRS{idVendor}=="054c", ATTRS{idProduct}=="05c4", TAG+="uaccess", TAG+="udev-acl"
+    KERNEL=="hidraw*", ATTRS{idVendor}=="054c", ATTRS{idProduct}=="05c4", TAG+="uaccess", TAG+="udev-acl"
 
-# DualShock 4 wireless adapter over USB hidraw
+    # DualShock 4 wireless adapter over USB hidraw
-KERNEL=="hidraw*", ATTRS{idVendor}=="054c", ATTRS{idProduct}=="0ba0", TAG+="uaccess", TAG+="udev-acl"
+    KERNEL=="hidraw*", ATTRS{idVendor}=="054c", ATTRS{idProduct}=="0ba0", TAG+="uaccess", TAG+="udev-acl"
 
-# DualShock 4 Slim over USB hidraw
+    # DualShock 4 Slim over USB hidraw
-KERNEL=="hidraw*", ATTRS{idVendor}=="054c", ATTRS{idProduct}=="09cc", TAG+="uaccess", TAG+="udev-acl"
+    KERNEL=="hidraw*", ATTRS{idVendor}=="054c", ATTRS{idProduct}=="09cc", TAG+="uaccess", TAG+="udev-acl"
 
-# DualShock 4 over bluetooth hidraw
+    # DualShock 4 over bluetooth hidraw
-KERNEL=="hidraw*", KERNELS=="*054C:05C4*", TAG+="uaccess", TAG+="udev-acl"
+    KERNEL=="hidraw*", KERNELS=="*054C:05C4*", TAG+="uaccess", TAG+="udev-acl"
 
-# DualShock 4 Slim over bluetooth hidraw
+    # DualShock 4 Slim over bluetooth hidraw
-KERNEL=="hidraw*", KERNELS=="*054C:09CC*", TAG+="uaccess", TAG+="udev-acl"
+    KERNEL=="hidraw*", KERNELS=="*054C:09CC*", TAG+="uaccess", TAG+="udev-acl"
 '';
 }