all repos — archive/nixos-configuration @ 87a1912fa27c2a8bef99bc03328a8f35aee7a3c3

Superseded by nixfiles

Merge remote-tracking branch 'origin/master'

Alan Pearce
commit

87a1912fa27c2a8bef99bc03328a8f35aee7a3c3

parent

942123bce188dc6ff278d43a0dc61c6a5a8f0f12

1 file changed, 2 insertions(+), 1 deletion(-)

changed files
M marvin.nixmarvin.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