summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Richter <makefu@syntax-fehler.de>2015-08-16 11:44:52 +0000
committerFelix Richter <makefu@syntax-fehler.de>2015-08-16 11:44:52 +0000
commit41e7978af2dbe8ac2195012ac05c11db4644b8af (patch)
treeea6ccc85a1f463d86d8631b518db87939eb41bb3
parent1c08ba3213f4c74afd906e27ae742af3a97af288 (diff)
parentcee09a1ae3ecbaab66cf1707241827df7905426c (diff)
Merge branch 'before-merge'
-rw-r--r--makefu/2configs/base-gui.nix5
-rw-r--r--makefu/2configs/base.nix6
-rw-r--r--makefu/2configs/tp-x200.nix8
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
+ '';
}