Merge branch 'before-merge'

This commit is contained in:
Felix Richter 2015-08-16 11:44:52 +00:00
commit 41e7978af2
3 changed files with 16 additions and 3 deletions

View File

@ -28,6 +28,11 @@ in
displayManager.auto.user = mainUser; displayManager.auto.user = mainUser;
desktopManager.xterm.enable = false; desktopManager.xterm.enable = false;
}; };
services.redshift = {
enable = true;
latitude = "48.7";
longitude = "9.1";
};
## FONTS ## FONTS
# TODO: somewhere else? # TODO: somewhere else?

View File

@ -32,7 +32,9 @@ with lib;
}; };
networking.hostName = config.krebs.build.host.name; 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; #nix.maxJobs = 1;
krebs.build.deps = { krebs.build.deps = {
@ -68,6 +70,7 @@ with lib;
vim vim
gnumake gnumake
rxvt_unicode.terminfo rxvt_unicode.terminfo
htop
]; ];
programs.bash = { programs.bash = {
@ -80,7 +83,6 @@ with lib;
shopt -s checkhash shopt -s checkhash
shopt -s histappend histreedit histverify shopt -s histappend histreedit histverify
shopt -s no_empty_cmd_completion shopt -s no_empty_cmd_completion
complete -d cd
''; '';
promptInit = '' promptInit = ''

View File

@ -12,7 +12,7 @@ with lib;
}; };
networking.wireless.enable = true; #networking.wireless.enable = true;
hardware.enableAllFirmware = true; hardware.enableAllFirmware = true;
nixpkgs.config.allowUnfree = 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 Button" 2
xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Timeout" 200 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
'';
} }