Merge remote-tracking branch 'origin/master'
Alan Pearce alan@alanpearce.eu
Mon, 21 May 2018 19:47:36 +0200
2 files changed, 0 insertions(+), 5 deletions(-)
M marvin.nix → marvin.nix
@@ -22,7 +22,6 @@ ./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/machines/x250.nix → modules/machines/x250.nix
@@ -8,10 +8,6 @@ hardware.firmware = with pkgs; [ firmwareLinuxNonfree ]; - services.xserver.monitorSection = '' - DisplaySize 277 156 - ''; - services.tlp.extraConfig = '' # Newer Thinkpads have a battery firmware # it conflicts with TLP if stop thresholds are set