summaryrefslogtreecommitdiffstats
path: root/makefu/2configs/base.nix
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 /makefu/2configs/base.nix
parent1c08ba3213f4c74afd906e27ae742af3a97af288 (diff)
parentcee09a1ae3ecbaab66cf1707241827df7905426c (diff)
Merge branch 'before-merge'
Diffstat (limited to 'makefu/2configs/base.nix')
-rw-r--r--makefu/2configs/base.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/makefu/2configs/base.nix b/makefu/2configs/base.nix
index 906c74f7..a5c64f4f 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 = ''