diff --git a/hardware/bluetooth/default.nix b/hardware/bluetooth/default.nix
index 28b204a..042c6c6 100644
--- a/hardware/bluetooth/default.nix
+++ b/hardware/bluetooth/default.nix
@@ -1,8 +1,4 @@
-# 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, ... }:
+{ pkgs, ... }:
 
 {
   # Blueooth support in general
diff --git a/home-manager/software/mpv/default.nix b/home-manager/software/mpv/default.nix
index b2ef514..1e0af39 100644
--- a/home-manager/software/mpv/default.nix
+++ b/home-manager/software/mpv/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 {
   programs.mpv = {
     enable = true;
diff --git a/home-manager/ubuntu.nix b/home-manager/ubuntu.nix
index 35541b9..19d4403 100644
--- a/home-manager/ubuntu.nix
+++ b/home-manager/ubuntu.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 {
   imports = [
     ./common
diff --git a/home-manager/work-wsl.nix b/home-manager/work-wsl.nix
index 3e4a9fb..0d142a0 100644
--- a/home-manager/work-wsl.nix
+++ b/home-manager/work-wsl.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 {
   imports = [
     ./common
diff --git a/modules/cli-packages.nix b/modules/cli-packages.nix
index 4e68cd9..17a4fa1 100644
--- a/modules/cli-packages.nix
+++ b/modules/cli-packages.nix
@@ -1,8 +1,4 @@
-# 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, ... }:
+{ pkgs, ... }:
 
 {
   environment.systemPackages = with pkgs; [
diff --git a/modules/common.nix b/modules/common.nix
index 3a8de82..8f31e78 100644
--- a/modules/common.nix
+++ b/modules/common.nix
@@ -1,8 +1,4 @@
-# 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, ... }:
+{ pkgs, ... }:
 
 {
   imports = [
diff --git a/modules/desktop.nix b/modules/desktop.nix
index 303e752..12fb10b 100644
--- a/modules/desktop.nix
+++ b/modules/desktop.nix
@@ -1,8 +1,4 @@
-# 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, ... }:
+{ pkgs, ... }:
 
 {
   imports = [
diff --git a/modules/docker.nix b/modules/docker.nix
index b2c0d74..1ed137c 100644
--- a/modules/docker.nix
+++ b/modules/docker.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 {
   virtualisation.docker =
     {
diff --git a/modules/droidcam/default.nix b/modules/droidcam/default.nix
index 9f2b482..0eb0d9d 100644
--- a/modules/droidcam/default.nix
+++ b/modules/droidcam/default.nix
@@ -1,7 +1,3 @@
-# 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’).
-
 { ... }:
 {
   programs.droidcam.enable = true;
diff --git a/modules/home-manager.nix b/modules/home-manager.nix
index 969304e..e507037 100644
--- a/modules/home-manager.nix
+++ b/modules/home-manager.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ ... }:
 let
   system-version = import ../version.nix;
   home-manager-url = "https://github.com/nix-community/home-manager/archive/release-" + system-version + ".tar.gz";
diff --git a/modules/restic/default.nix b/modules/restic/default.nix
index 1b33f78..99200c4 100644
--- a/modules/restic/default.nix
+++ b/modules/restic/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ ... }:
 {
   services.restic.backups."andreas" = {
     user = "andreas";
diff --git a/modules/xonsh/default.nix b/modules/xonsh/default.nix
index 30655e8..180598c 100644
--- a/modules/xonsh/default.nix
+++ b/modules/xonsh/default.nix
@@ -1,7 +1,3 @@
-# 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’).
-
 { pkgs, ... }:
 {
   programs.xonsh = {
diff --git a/systems/gwyn/configuration.nix b/systems/gwyn/configuration.nix
index ee72bcd..51c2321 100644
--- a/systems/gwyn/configuration.nix
+++ b/systems/gwyn/configuration.nix
@@ -1,7 +1,3 @@
-# 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’).
-
 { ... }:
 {
   imports =
diff --git a/systems/gwyn/hardware-configuration.nix b/systems/gwyn/hardware-configuration.nix
index 586b653..71dc0f7 100644
--- a/systems/gwyn/hardware-configuration.nix
+++ b/systems/gwyn/hardware-configuration.nix
@@ -1,7 +1,4 @@
-# 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, ... }:
 
 {
   imports = [
diff --git a/systems/staubfinger/configuration.nix b/systems/staubfinger/configuration.nix
index c94ba7e..4ba54f4 100644
--- a/systems/staubfinger/configuration.nix
+++ b/systems/staubfinger/configuration.nix
@@ -1,8 +1,4 @@
-# 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, ... }:
+{ ... }:
 
 {
   imports =
diff --git a/systems/staubfinger/hardware-configuration.nix b/systems/staubfinger/hardware-configuration.nix
index 5d717e3..996a7ec 100644
--- a/systems/staubfinger/hardware-configuration.nix
+++ b/systems/staubfinger/hardware-configuration.nix
@@ -1,7 +1,4 @@
-# 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, ... }:
+{ ... }:
 
 {
   boot.initrd.availableKernelModules = [
diff --git a/systems/vm/configuration.nix b/systems/vm/configuration.nix
index 25e99ca..f10a39d 100644
--- a/systems/vm/configuration.nix
+++ b/systems/vm/configuration.nix
@@ -1,8 +1,4 @@
-# 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, ... }:
+{ ... }:
 
 {
   imports =
diff --git a/systems/vm/hardware-configuration.nix b/systems/vm/hardware-configuration.nix
index 10b677c..278a1ce 100644
--- a/systems/vm/hardware-configuration.nix
+++ b/systems/vm/hardware-configuration.nix
@@ -1,7 +1,4 @@
-# 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, ... }:
+{ ... }:
 
 {
   boot.initrd.availableKernelModules = [