From bf1e85957ecec50767463ed0f7e9bb425f262d33 Mon Sep 17 00:00:00 2001 From: Greg Burd Date: Mon, 2 Oct 2023 13:48:03 +0000 Subject: [PATCH] console settings in nixos, not desktop --- nixos/_mixins/desktop/default.nix | 5 ----- nixos/default.nix | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/nixos/_mixins/desktop/default.nix b/nixos/_mixins/desktop/default.nix index 3e4ef3c..58c927e 100644 --- a/nixos/_mixins/desktop/default.nix +++ b/nixos/_mixins/desktop/default.nix @@ -19,11 +19,6 @@ initrd.verbose = false; }; - console = { - useXkbConfig = true; - earlySetup = false; - }; - hardware = { opengl = { enable = true; diff --git a/nixos/default.nix b/nixos/default.nix index 9cd3ea7..45645a1 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -39,9 +39,9 @@ in console = { packages = with pkgs; [ terminus_font ]; - earlySetup = true; font = "${pkgs.terminus_font}/share/consolefonts/ter-132n.psf.gz"; - useXkbConfig = true; # use xkbOptions in tty. + useXkbConfig = true; # use xkbOptions, in this case swap caps-lock and ctrl, in tty. + earlySetup = true; }; i18n = {