makefu: fix whitespace, use registry instead of readfile

This commit is contained in:
makefu 2015-07-24 23:03:50 +02:00
parent 13cc704c60
commit f9c46e9d43
2 changed files with 123 additions and 126 deletions

View File

@ -50,5 +50,4 @@
gnumake
jq
];
}

View File

@ -5,9 +5,7 @@ with lib;
imports = [ ];
users.extraUsers = {
root = {
openssh.authorizedKeys.keys = map readFile [
../../Zpubkeys/makefu_arch.ssh.pub
];
openssh.authorizedKeys.keys = [ config.krebs.users.makefu.pubkey ];
};
makefu = {
uid = 9001;
@ -18,9 +16,7 @@ with lib;
extraGroups = [
"wheel"
];
openssh.authorizedKeys.keys = map readFile [
../../Zpubkeys/makefu_arch.ssh.pub
];
openssh.authorizedKeys.keys = [ config.krebs.users.makefu.pubkey ];
};
};
@ -55,8 +51,8 @@ with lib;
shopt -s histappend histreedit histverify
shopt -s no_empty_cmd_completion
complete -d cd
'';
promptInit = ''
case $UID in
0) PS1='\[\e[1;31m\]\w\[\e[0m\] ' ;;
@ -68,29 +64,31 @@ with lib;
fi
'';
};
environment.shellAliases = {
lsl = "ls -latr";
};
security.setuidPrograms = [ "sendmail" ];
nixpkgs.config.packageOverrides = pkgs: {
nano = pkgs.runCommand "empty" {} "mkdir -p $out";
};
services.cron.enable = false;
services.nscd.enable = false;
security.setuidPrograms = [ "sendmail" ];
services.journald.extraConfig = ''
SystemMaxUse=1G
RuntimeMaxUse=128M
'';
nixpkgs.config.packageOverrides = pkgs: {
nano = pkgs.runCommand "empty" {} "mkdir -p $out";
};
services.cron.enable = false;
services.nscd.enable = false;
boot.kernel.sysctl = {
# Enable IPv6 Privacy Extensions
boot.kernel.sysctl = {
"net.ipv6.conf.all.use_tempaddr" = 2;
"net.ipv6.conf.default.use_tempaddr" = 2;
};
i18n = {
consoleKeyMap = "us";
defaultLocale = "en_US.UTF-8";
};
}