From 5bdf9e3a2c97bcb499369792f467ba4fbe84b450 Mon Sep 17 00:00:00 2001 From: muon Date: Thu, 25 Dec 2025 15:44:14 +0000 Subject: [PATCH] Add kb variant --- modules/nixos/desktop/xorg.nix | 41 ++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/modules/nixos/desktop/xorg.nix b/modules/nixos/desktop/xorg.nix index 96b18bb..4428b2c 100644 --- a/modules/nixos/desktop/xorg.nix +++ b/modules/nixos/desktop/xorg.nix @@ -1,5 +1,9 @@ -{ pkgs, lib, config, ... }: -let +{ + pkgs, + lib, + config, + ... +}: let monitorModule = lib.types.submodule { options = { name = lib.mkOption { @@ -18,7 +22,7 @@ in { xorg.enable = lib.mkEnableOption "enables xorg"; monitors = lib.mkOption { type = lib.types.attrsOf monitorModule; - default = { }; + default = {}; }; }; @@ -28,20 +32,23 @@ in { "multi-user.target" "network-online.target" ]; + in + lib.mkIf config.mods.xorg.enable { + services.xserver.enable = true; + services.xserver.xkb = { + layout = "us"; + variant = "altgr-intl"; + options = "caps:escape"; + }; + services.xserver.dpi = 96; - in lib.mkIf config.mods.xorg.enable { - services.xserver.enable = true; - services.xserver.xkb.layout = "us"; - services.xserver.xkb.options = "caps:escape"; - services.xserver.dpi = 96; + # services.xserver.displayManager.gdm.enable = true; + services.displayManager.sddm.enable = true; + services.displayManager.sddm.enableHidpi = false; + services.displayManager.autoLogin.enable = true; + services.displayManager.autoLogin.user = config.mods.user.name; - # services.xserver.displayManager.gdm.enable = true; - services.displayManager.sddm.enable = true; - services.displayManager.sddm.enableHidpi = false; - services.displayManager.autoLogin.enable = true; - services.displayManager.autoLogin.user = config.mods.user.name; - - systemd.services.display-manager.wants = startupTargets; - systemd.services.display-manager.after = startupTargets; - }; + systemd.services.display-manager.wants = startupTargets; + systemd.services.display-manager.after = startupTargets; + }; }