all repos — archive/nixos-configuration @ 87a1912fa27c2a8bef99bc03328a8f35aee7a3c3

Superseded by nixfiles

Merge remote-tracking branch 'origin/master'

Alan Pearce
commit

87a1912fa27c2a8bef99bc03328a8f35aee7a3c3

parent

942123bce188dc6ff278d43a0dc61c6a5a8f0f12

3 files changed, 6 insertions(+), 1 deletion(-)

jump to
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; [