diff --git a/modules/system/hardware/cpu/amd.nix b/modules/system/hardware/cpu/amd.nix
new file mode 100644
index 0000000..e69de29
diff --git a/modules/system/hardware/cpu/default.nix b/modules/system/hardware/cpu/default.nix
new file mode 100644
index 0000000..e69de29
diff --git a/modules/system/hardware/cpu/intel.nix b/modules/system/hardware/cpu/intel.nix
new file mode 100644
index 0000000..e69de29
diff --git a/modules/system/hardware/gpu/amd.nix b/modules/system/hardware/gpu/amd.nix
new file mode 100644
index 0000000..e69de29
diff --git a/modules/system/hardware/gpu/default.nix b/modules/system/hardware/gpu/default.nix
new file mode 100644
index 0000000..e69de29
diff --git a/modules/system/hardware/gpu/nvidia.nix b/modules/system/hardware/gpu/nvidia.nix
new file mode 100644
index 0000000..e69de29
diff --git a/modules/system/keyboard.nix b/modules/system/keyboard.nix
index 7360c89..4139d1f 100644
--- a/modules/system/keyboard.nix
+++ b/modules/system/keyboard.nix
@@ -1,8 +1,7 @@
 {
   services.xserver = {
     xkb.layout = "de,us";
-    # xkbVariant = ",cmk_ed_dh";
-    # xkbModel = ",pc105awide";
-    # xkbOptions = ",misc:extend,lv5:caps_switch_lock,compose:menu";
+    xkbVariant = ",colemak_dh_wide";
+    xkbOptions = "grp:rctrl_rshift_toggle";
   };
 }
diff --git a/modules/system/nix/nixpkgs.nix b/modules/system/nix/nixpkgs.nix
index 9e110f2..6eb219d 100644
--- a/modules/system/nix/nixpkgs.nix
+++ b/modules/system/nix/nixpkgs.nix
@@ -8,14 +8,10 @@
     # <https://nixos.org/manual/nixpkgs/unstable/#chap-packageconfig>
     hostPlatform = "x86_64-linux";
     config = {
-      # Allow broken packages to be built. Setting this to false means packages
-      # will refuse to evaluate sometimes, but only if they have been marked as
-      # broken for a specific reason. At that point we can either try to solve
-      # the breakage, or get rid of the package entirely.
-      allowBroken = false;
+      # Disallow broken packages to be built.       allowBroken = false;
       allowUnsupportedSystem = true;
 
-      # Allow unfree packages since it's sadly necessary
+      # Allow unfree packages
       allowUnfree = true;
 
       # Default to none, add more as necessary. This is usually where
@@ -28,11 +24,6 @@
       # explicit naming conventions, i.e., no aliases.
       allowAliases = false;
 
-      # Enable parallel building by default. This, in theory, should speed up building
-      # derivations, especially rust ones. However setting this to true causes a mass rebuild
-      # of the *entire* system closure, so it must be handled with proper care.
-      enableParallelBuildingByDefault = false;
-
       # List of derivation warnings to display while rebuilding.
       #  See: <https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/check-meta.nix>
       # NOTE: "maintainerless" can be added to emit warnings