From 084e4ca4215ce97273d8fd35b71bbc78f9470505 Mon Sep 17 00:00:00 2001
From: Gabe Venberg <gabevenberg@gmail.com>
Date: Sat, 18 Oct 2025 18:13:15 +0200
Subject: [PATCH] seperated out some options into generic graphical config.

---
 configs/nixos/graphical.nix  | 14 ++++++++++++++
 configs/nixos/i3/default.nix |  9 +--------
 configs/nixos/keyd.nix       | 23 +++++++++++++++++++++++
 3 files changed, 38 insertions(+), 8 deletions(-)
 create mode 100644 configs/nixos/graphical.nix
 create mode 100644 configs/nixos/keyd.nix

diff --git a/configs/nixos/graphical.nix b/configs/nixos/graphical.nix
new file mode 100644
index 0000000..b6b1204
--- /dev/null
+++ b/configs/nixos/graphical.nix
@@ -0,0 +1,14 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: {
+  console.useXkbConfig = true;
+  fonts.fontDir.enable = true;
+  fonts.enableDefaultPackages = true;
+  services.xserver.xkb.options = "ctrl:nocaps,compose:rctrl";
+  services.displayManager.ly = {
+    enable = true;
+  };
+}
diff --git a/configs/nixos/i3/default.nix b/configs/nixos/i3/default.nix
index c8d9e6c..c9f563f 100644
--- a/configs/nixos/i3/default.nix
+++ b/configs/nixos/i3/default.nix
@@ -15,15 +15,7 @@
   services.xserver = {
     enable = true;
     windowManager.i3.enable = true;
-    displayManager.lightdm = {
-      enable = true;
-      greeters.gtk.enable = false;
-      greeter.enable = false;
-    };
-    xkb.options = "ctrl:nocaps,compose:rctrl";
   };
-  fonts.fontDir.enable = true;
-  fonts.enableDefaultPackages = true;
   home-manager.users.${config.host.details.user} = {config, ...}: {
     home.packages = with pkgs; [
       maim
@@ -247,5 +239,6 @@
     ../sound.nix
     ./i3status-rust.nix
     ./lockscreen.nix
+    ../graphical.nix
   ];
 }
diff --git a/configs/nixos/keyd.nix b/configs/nixos/keyd.nix
new file mode 100644
index 0000000..98fe15e
--- /dev/null
+++ b/configs/nixos/keyd.nix
@@ -0,0 +1,23 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: {
+  services.keyd = {
+    enable = true;
+    keyboards.default = {
+      ids = ["*"];
+      settings = {
+        capslock = "overload(control, esc)";
+      };
+    };
+  };
+  environment.etc."libinput/local-overrides.quirks".text = ''
+    [Serial Keyboards]
+
+    MatchUdevType=keyboard
+    MatchName=keyd*keyboard
+    AttrKeyboardIntegration=internal
+  '';
+}