From 7ecab07fd8716cb1cbe3b6f61042909e12195e6d Mon Sep 17 00:00:00 2001
From: Silas Schöffel <sils@sils.li>
Date: Wed, 18 Dec 2024 00:01:32 +0100
Subject: keyboard: move to basesystem

---
 modules/nixos/sils/basesystem.nix |  9 +++++++++
 sys/default.nix                   |  1 -
 sys/keyboard/default.nix          | 10 ----------
 3 files changed, 9 insertions(+), 11 deletions(-)
 delete mode 100644 sys/keyboard/default.nix

diff --git a/modules/nixos/sils/basesystem.nix b/modules/nixos/sils/basesystem.nix
index 5684618..0e9f6de 100644
--- a/modules/nixos/sils/basesystem.nix
+++ b/modules/nixos/sils/basesystem.nix
@@ -35,5 +35,14 @@ in {
       cpu.intel.updateMicrocode = true;
       enableRedistributableFirmware = true;
     };
+
+    services.xserver.xkb = {
+      layout = "de";
+      options = "grp:win_space_toggle";
+    };
+    console = {
+      font = "Lat2-Terminus16";
+      keyMap = "de";
+    };
   };
 }
diff --git a/sys/default.nix b/sys/default.nix
index 0ada9b1..0eeeb35 100644
--- a/sys/default.nix
+++ b/sys/default.nix
@@ -1,6 +1,5 @@
 {...}: {
   imports = [
-    ./keyboard
     ./packages
     ./services
     ./sound
diff --git a/sys/keyboard/default.nix b/sys/keyboard/default.nix
deleted file mode 100644
index 999ebc8..0000000
--- a/sys/keyboard/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{...}: {
-  services.xserver.xkb = {
-    layout = "de";
-    options = "grp:win_space_toggle";
-  };
-  console = {
-    font = "Lat2-Terminus16";
-    keyMap = "de";
-  };
-}
-- 
cgit 1.4.1