Merge remote-tracking branch 'origin/master'
Alan Pearce alan@alanpearce.eu
Mon, 19 Mar 2018 15:09:25 +0100
3 files changed, 6 insertions(+), 1 deletions(-)
M marvin.nix → marvin.nix
@@ -12,7 +12,7 @@ ./modules/development/javascript.nix ./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/machines/x250.nix ./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
M modules/hardware/qwerty.nix → modules/hardware/qwerty.nix
@@ -4,11 +4,13 @@ { services.kmscon = { 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"; }; }
M modules/programs/kde.nix → modules/programs/kde.nix
@@ -10,6 +10,8 @@ displayManager = { sddm.enable = true; }; }; + + physlock.enable = lib.mkForce false; }; environment.systemPackages = with pkgs; [