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

78
1systems/makefu/pnp.nix
View File

@ -5,50 +5,48 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
imports = imports =
[ # 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; boot.loader.grub.enable = true;
boot.loader.grub.enable = true; boot.loader.grub.version = 2;
boot.loader.grub.version = 2; boot.loader.grub.device = "/dev/vda";
boot.loader.grub.device = "/dev/vda";
boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "ehci_pci" "virtio_pci" "virtio_blk" ]; boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "ehci_pci" "virtio_pci" "virtio_blk" ];
boot.kernelModules = [ ]; boot.kernelModules = [ ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
hardware.enableAllFirmware = true; hardware.enableAllFirmware = true;
hardware.cpu.amd.updateMicrocode = true; hardware.cpu.amd.updateMicrocode = true;
# networking.firewall is enabled by default # networking.firewall is enabled by default
networking.firewall.allowedTCPPorts = [ 80 ]; networking.firewall.allowedTCPPorts = [ 80 ];
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-label/nixos"; { device = "/dev/disk/by-label/nixos";
fsType = "ext4"; fsType = "ext4";
}; };
krebs.retiolum = { krebs.retiolum = {
enable = true; enable = true;
hosts = ../../Zhosts; hosts = ../../Zhosts;
connectTo = [ connectTo = [
"gum" "gum"
"pigstarter" "pigstarter"
"fastpoke" "fastpoke"
]; ];
}; };
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
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
wget wget
git git
gnumake gnumake
jq jq
]; ];
} }

170
2configs/makefu/base.nix
View File

@ -2,95 +2,93 @@
with lib; 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 = {
uid = 9001;
group = "users";
home = "/home/makefu";
createHome = true;
useDefaultShell = true;
extraGroups = [
"wheel"
];
openssh.authorizedKeys.keys = map readFile [
../../Zpubkeys/makefu_arch.ssh.pub
];
};
}; };
makefu = {
services.openssh.enable = true; uid = 9001;
nix.useChroot = true; group = "users";
home = "/home/makefu";
users.mutableUsers = true; createHome = true;
useDefaultShell = true;
boot.tmpOnTmpfs = true; extraGroups = [
systemd.tmpfiles.rules = [ "wheel"
"d /tmp 1777 root root - -" ];
]; openssh.authorizedKeys.keys = [ config.krebs.users.makefu.pubkey ];
environment.extraInit = ''
EDITOR=vim
'';
environment.systemPackages = with pkgs; [
git
vim
rxvt_unicode.terminfo
];
programs.bash = {
enableCompletion = true;
interactiveShellInit = ''
HISTCONTROL='erasedups:ignorespace'
HISTSIZE=900001
HISTFILESIZE=$HISTSIZE
shopt -s checkhash
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\] ' ;;
9001) PS1='\[\e[1;32m\]\w\[\e[0m\] ' ;;
*) PS1='\[\e[1;35m\]\u \[\e[1;32m\]\w\[\e[0m\] ' ;;
esac
if test -n "$SSH_CLIENT"; then
PS1='\[\033[35m\]\h'" $PS1"
fi
'';
};
environment.shellAliases = {
lsl = "ls -latr";
}; };
};
security.setuidPrograms = [ "sendmail" ]; services.openssh.enable = true;
nix.useChroot = true;
services.journald.extraConfig = '' users.mutableUsers = true;
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
"net.ipv6.conf.all.use_tempaddr" = 2;
"net.ipv6.conf.default.use_tempaddr" = 2;
};
i18n = {
consoleKeyMap = "us";
defaultLocale = "en_US.UTF-8";
};
boot.tmpOnTmpfs = true;
systemd.tmpfiles.rules = [
"d /tmp 1777 root root - -"
];
environment.extraInit = ''
EDITOR=vim
'';
environment.systemPackages = with pkgs; [
git
vim
rxvt_unicode.terminfo
];
programs.bash = {
enableCompletion = true;
interactiveShellInit = ''
HISTCONTROL='erasedups:ignorespace'
HISTSIZE=900001
HISTFILESIZE=$HISTSIZE
shopt -s checkhash
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\] ' ;;
9001) PS1='\[\e[1;32m\]\w\[\e[0m\] ' ;;
*) PS1='\[\e[1;35m\]\u \[\e[1;32m\]\w\[\e[0m\] ' ;;
esac
if test -n "$SSH_CLIENT"; then
PS1='\[\033[35m\]\h'" $PS1"
fi
'';
};
environment.shellAliases = {
lsl = "ls -lAtr";
};
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
'';
# 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";
};
} }