diff options
| author | Alan Pearce | 2018-03-19 15:09:25 +0100 |
|---|---|---|
| committer | Alan Pearce | 2018-03-19 15:09:25 +0100 |
| commit | 87a1912fa27c2a8bef99bc03328a8f35aee7a3c3 (patch) | |
| tree | 63c2a548585c3c3853b71ddd0472c367ded7da70 | |
| parent | 942123bce188dc6ff278d43a0dc61c6a5a8f0f12 (diff) | |
| parent | 404f3ad2d3a8bd5961c4e55ae621f87e40f9c7dc (diff) | |
| download | nixfiles-87a1912fa27c2a8bef99bc03328a8f35aee7a3c3.tar.lz nixfiles-87a1912fa27c2a8bef99bc03328a8f35aee7a3c3.tar.zst nixfiles-87a1912fa27c2a8bef99bc03328a8f35aee7a3c3.zip | |
Merge remote-tracking branch 'origin/master'
| -rw-r--r-- | marvin.nix | 3 | ||||
| -rw-r--r-- | modules/hardware/qwerty.nix | 2 | ||||
| -rw-r--r-- | modules/programs/kde.nix | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/marvin.nix b/marvin.nix index df798d49..92ba5db4 100644 --- a/marvin.nix +++ b/marvin.nix @@ -12,7 +12,7 @@ ./modules/development/lisp.nix ./modules/hardware/adb.nix ./modules/hardware/audio.nix - ./modules/hardware/colemak.nix + ./modules/hardware/qwerty.nix ./modules/hardware/network-manager.nix ./modules/hardware/nitrokey.nix ./modules/hardware/systemd-boot.nix @@ -22,6 +22,7 @@ ./modules/programs/accounting.nix ./modules/programs/dotfiles.nix ./modules/programs/i3.nix + ./modules/programs/kde.nix ./modules/programs/infrastructure.nix ./modules/programs/passwords.nix ./modules/programs/shell.nix diff --git a/modules/hardware/qwerty.nix b/modules/hardware/qwerty.nix index 3783b3a9..d220cb27 100644 --- a/modules/hardware/qwerty.nix +++ b/modules/hardware/qwerty.nix @@ -4,11 +4,13 @@ extraConfig = '' xkb-model=pc104 xkb-layout=us + xkb-variant=intl-unicode xkb-options="altwin:prtsc_rwin" ''; }; services.xserver = { layout = "us"; + xkbVariant = "intl-unicode"; xkbOptions = "altwin:prtsc_rwin"; }; } diff --git a/modules/programs/kde.nix b/modules/programs/kde.nix index e9d99fd6..652eb2a6 100644 --- a/modules/programs/kde.nix +++ b/modules/programs/kde.nix @@ -10,6 +10,8 @@ with lib; sddm.enable = true; }; }; + + physlock.enable = lib.mkForce false; }; environment.systemPackages = with pkgs; [ |