matt1432/nixos-configs
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

chore: update deprecated xserver option
All checks were successful
Discord / discord commits (push) Has been skipped
Details

Browse source
This commit is contained in:
matt1432 2024-02-05 06:40:53 -05:00
parent 540db27873
commit 6441ae6548
3 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/default.nix
View file

@ -52,9 +52,9 @@
services = { services = {
fwupd.enable = true; fwupd.enable = true;
xserver = { xserver.xkb = {
layout = "ca"; layout = "ca";
xkbVariant = "multix"; variant = "multix";
}; };
}; };

6
modules/hyprland/default.nix
View file

@ -89,10 +89,10 @@ in {
]; ];
input = let input = let
inherit (config.services) xserver; inherit (config.services.xserver) xkb;
in { in {
kb_layout = xserver.layout; kb_layout = xkb.layout;
kb_variant = xserver.xkbVariant; kb_variant = xkb.variant;
follow_mouse = true; follow_mouse = true;
touchpad = { touchpad = {

8
modules/kmscon.nix
View file

@ -1,4 +1,6 @@
{config, ...}: { {config, ...}: let
inherit (config.services.xserver) xkb;
in {
services.kmscon = { services.kmscon = {
enable = true; enable = true;
hwRender = false; hwRender = false;
@ -6,8 +8,8 @@
extraOptions = builtins.concatStringsSep " " [ extraOptions = builtins.concatStringsSep " " [
"--font-size 12.5" "--font-size 12.5"
"--font-dpi 170" "--font-dpi 170"
"--xkb-layout ${config.services.xserver.layout}" "--xkb-layout ${xkb.layout}"
"--xkb-variant ${config.services.xserver.xkbVariant}" "--xkb-variant ${xkb.variant}"
"--font-name 'JetBrainsMono Nerd Font'" "--font-name 'JetBrainsMono Nerd Font'"
]; ];
}; };