Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'pnp/master'

Browse Source
This commit is contained in:
tv 2015-07-25 00:33:13 +02:00
commit 6c73ed76d9
2 changed files with 122 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
1systems/makefu/pnp.nix
View File

@ -9,7 +9,6 @@
[ # Include the results of the hardware scan. [ # Include the results of the hardware scan.
<nixpkgs/nixos/modules/profiles/qemu-guest.nix> <nixpkgs/nixos/modules/profiles/qemu-guest.nix>
../../2configs/makefu/base.nix ../../2configs/makefu/base.nix
../../3modules/krebs/retiolum.nix
../../2configs/makefu/cgit-retiolum.nix ../../2configs/makefu/cgit-retiolum.nix
]; ];
krebs.enable = true; krebs.enable = true;
@ -40,7 +39,7 @@
]; ];
}; };
nix.maxJobs = 1; nix.maxJobs = 2;
networking.hostName = "pnp"; # Define your hostname. networking.hostName = "pnp"; # Define your hostname.
# $ nix-env -qaP | grep wget # $ nix-env -qaP | grep wget
@ -50,5 +49,4 @@
gnumake gnumake
jq jq
]; ];
} }

30
2configs/makefu/base.nix
View File

@ -5,9 +5,7 @@ with lib;
imports = [ ]; imports = [ ];
users.extraUsers = { users.extraUsers = {
root = { root = {
openssh.authorizedKeys.keys = map readFile [ openssh.authorizedKeys.keys = [ config.krebs.users.makefu.pubkey ];
../../Zpubkeys/makefu_arch.ssh.pub
];
}; };
makefu = { makefu = {
uid = 9001; uid = 9001;
@ -18,9 +16,7 @@ with lib;
extraGroups = [ extraGroups = [
"wheel" "wheel"
]; ];
openssh.authorizedKeys.keys = map readFile [ openssh.authorizedKeys.keys = [ config.krebs.users.makefu.pubkey ];
../../Zpubkeys/makefu_arch.ssh.pub
];
}; };
}; };
@ -55,8 +51,8 @@ with lib;
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 complete -d cd
''; '';
promptInit = '' promptInit = ''
case $UID in case $UID in
0) PS1='\[\e[1;31m\]\w\[\e[0m\] ' ;; 0) PS1='\[\e[1;31m\]\w\[\e[0m\] ' ;;
@ -68,29 +64,31 @@ with lib;
fi fi
''; '';
}; };
environment.shellAliases = { environment.shellAliases = {
lsl = "ls -latr"; 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 = '' services.journald.extraConfig = ''
SystemMaxUse=1G SystemMaxUse=1G
RuntimeMaxUse=128M 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 # Enable IPv6 Privacy Extensions
boot.kernel.sysctl = {
"net.ipv6.conf.all.use_tempaddr" = 2; "net.ipv6.conf.all.use_tempaddr" = 2;
"net.ipv6.conf.default.use_tempaddr" = 2; "net.ipv6.conf.default.use_tempaddr" = 2;
}; };
i18n = { i18n = {
consoleKeyMap = "us"; consoleKeyMap = "us";
defaultLocale = "en_US.UTF-8"; defaultLocale = "en_US.UTF-8";
}; };
} }