hosts: move xserver to services/

Signed-off-by: Amneesh Singh <natto@weirdnatto.in>

hosts/default.nix

@@ -3,19 +3,19 @@ let
   inherit (inputs) nixpkgs;
 
   commonModules = [
+    {
+      _module.args = globalArgs;
+    }
     ./programs/neovim
     ./programs/nix
     ./programs/zsh
     ./programs/gnupg
     ./programs/git
     ./programs/doas
-    {
-      _module.args = globalArgs;
-    }
   ];
   desktopModules = [
     ./programs/adb
-    ./xorg.nix
+    ./services/xserver
     ./wayland.nix
     ./sound.nix
   ];

hosts/services/xserver/default.nix

@@ -1,17 +1,11 @@
 { config, lib, ... }:
 
-#let
-#  compiledLayout = pkgs.runCommand "keyboard-layout" {} ''
-#    ${pkgs.xorg.xkbcomp}/bin/xkbcomp ${./colemak-dh.xkb} $out
-#  '';
-#in
 {
   services = {
     libinput = {
       enable = true;
       mouse = {
         accelSpeed = "0";
-        #         accelProfile = "flat";
       };
       touchpad = {
         middleEmulation = false;
@@ -22,13 +16,9 @@
     };
     xserver = {
       enable = true;
-      displayManager = {
-        startx = {
-          enable = true;
-        };
-      };
+      displayManager.startx.enable = true;
       xkb.layout = "us";
-      xkb.variant = "colemak_dh"; # trying to ditch DHz now
+      xkb.variant = "colemak_dh";
       autoRepeatDelay = 320;
       autoRepeatInterval = 30;
     };