diff options
| author | Alan Pearce | 2018-05-21 19:47:36 +0200 |
|---|---|---|
| committer | Alan Pearce | 2018-05-21 19:47:36 +0200 |
| commit | ce3e01c5b363ef9ac849066346a7f48b10dc56b1 (patch) | |
| tree | 8137402703dfd668dc1fe35ddabdfc855eaa83f3 | |
| parent | f9a06bdb8e3a0b795d3fc3d29cb467824971088e (diff) | |
| parent | a205c33d34c1bda893d967f4962b4263a9ee5069 (diff) | |
| download | nixfiles-ce3e01c5b363ef9ac849066346a7f48b10dc56b1.tar.lz nixfiles-ce3e01c5b363ef9ac849066346a7f48b10dc56b1.tar.zst nixfiles-ce3e01c5b363ef9ac849066346a7f48b10dc56b1.zip | |
Merge remote-tracking branch 'origin/master'
| -rw-r--r-- | marvin.nix | 1 | ||||
| -rw-r--r-- | modules/machines/x250.nix | 4 |
2 files changed, 0 insertions, 5 deletions
diff --git a/marvin.nix b/marvin.nix index 92ba5db4..62a0b660 100644 --- a/marvin.nix +++ b/marvin.nix @@ -22,7 +22,6 @@ ./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 diff --git a/modules/machines/x250.nix b/modules/machines/x250.nix index c527f4dc..0e8ac04e 100644 --- a/modules/machines/x250.nix +++ b/modules/machines/x250.nix @@ -8,10 +8,6 @@ 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 |