Merge branch 'before-merge'

3 files changed, 16 insertions, 3 deletions

diff --git a/makefu/2configs/base-gui.nix b/makefu/2configs/base-gui.nix
index 4e5558a1f..55fcd6baa 100644
--- a/makefu/2configs/base-gui.nix
+++ b/makefu/2configs/base-gui.nix
@@ -28,6 +28,11 @@ in
     displayManager.auto.user = mainUser;
     desktopManager.xterm.enable = false;
   };
+  services.redshift = {
+    enable = true;
+    latitude = "48.7";
+    longitude = "9.1";
+  };
 
 ## FONTS
 # TODO: somewhere else?
diff --git a/makefu/2configs/base.nix b/makefu/2configs/base.nix
index 906c74f7d..a5c64f4f3 100644
--- a/makefu/2configs/base.nix
+++ b/makefu/2configs/base.nix
@@ -32,7 +32,9 @@ with lib;
   };
 
   networking.hostName = config.krebs.build.host.name;
-  nix.maxJobs = config.krebs.build.host.cores + 1;
+  nix.maxJobs = config.krebs.build.host.cores;
+
+  time.timeZone = "Europe/Berlin";
   #nix.maxJobs = 1;
 
   krebs.build.deps = {
@@ -68,6 +70,7 @@ with lib;
       vim
       gnumake
       rxvt_unicode.terminfo
+      htop
   ];
 
   programs.bash = {
@@ -80,7 +83,6 @@ with lib;
       shopt -s checkhash
       shopt -s histappend histreedit histverify
       shopt -s no_empty_cmd_completion
-      complete -d cd
       '';
 
     promptInit = ''
diff --git a/makefu/2configs/tp-x200.nix b/makefu/2configs/tp-x200.nix
index 25a2537e8..8d41d6806 100644
--- a/makefu/2configs/tp-x200.nix
+++ b/makefu/2configs/tp-x200.nix
@@ -12,7 +12,7 @@ with lib;
 
   };
 
-  networking.wireless.enable = true;
+  #networking.wireless.enable = true;
 
   hardware.enableAllFirmware = true;
   nixpkgs.config.allowUnfree = true;
@@ -25,4 +25,10 @@ with lib;
     xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Button" 2
     xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Timeout" 200
   '';
+
+  services.thinkfan.enable = true;
+  services.tlp.enable = true;
+  services.tlp.extraConfig = ''
+  START_CHARGE_THRESH_BAT0=80
+  '';
 }