all repos — nixfiles @ ce3e01c5b363ef9ac849066346a7f48b10dc56b1

System and user configuration, managed by nix and home-manager

Merge remote-tracking branch 'origin/master'

Alan Pearce
commit

ce3e01c5b363ef9ac849066346a7f48b10dc56b1

parent

f9a06bdb8e3a0b795d3fc3d29cb467824971088e

2 files changed, 0 insertions(+), 5 deletions(-)

jump to
M marvin.nixmarvin.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.nixmodules/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