makefu: sort 2configs

This commit is contained in:
makefu 2015-09-02 10:02:05 +02:00
parent f911d43005
commit 37744f0016
13 changed files with 119 additions and 15 deletions

View File

@ -9,9 +9,9 @@
[ # 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/base.nix ../2configs/base.nix
../2configs/cgit-retiolum.nix ../2configs/git/cgit-retiolum.nix
# ../2configs/graphite-standalone.nix # ../2configs/graphite-standalone.nix
../2configs/vm-single-partition.nix ../2configs/fs/vm-single-partition.nix
../2configs/tinc-basic-retiolum.nix ../2configs/tinc-basic-retiolum.nix
../2configs/exim-retiolum.nix ../2configs/exim-retiolum.nix
@ -26,7 +26,7 @@
krebs.build.deps = { krebs.build.deps = {
nixpkgs = { nixpkgs = {
url = https://github.com/NixOS/nixpkgs; url = https://github.com/NixOS/nixpkgs;
rev = "13576925552b1d0751498fdda22e91a055a1ff6c"; rev = "03921972268934d900cc32dad253ff383926771c";
}; };
}; };

View File

@ -13,9 +13,7 @@
../2configs/tinc-basic-retiolum.nix ../2configs/tinc-basic-retiolum.nix
#../2configs/disable_v6.nix #../2configs/disable_v6.nix
#../2configs/sda-crypto-root.nix # environment
../2configs/sda-crypto-root-home.nix
../2configs/zsh-user.nix ../2configs/zsh-user.nix
# applications # applications
@ -23,16 +21,22 @@
../2configs/virtualization.nix ../2configs/virtualization.nix
../2configs/wwan.nix ../2configs/wwan.nix
../2configs/Reaktor/simpleExtend.nix # services
../2configs/git/brain-retiolum.nix
# ../2configs/Reaktor/simpleExtend.nix
# hardware specifics are in here # hardware specifics are in here
../2configs/tp-x220.nix ../2configs/hw/tp-x220.nix
# mount points
../2configs/fs/sda-crypto-root-home.nix
]; ];
krebs.build.host = config.krebs.hosts.pornocauster; krebs.build.host = config.krebs.hosts.pornocauster;
krebs.build.user = config.krebs.users.makefu; krebs.build.user = config.krebs.users.makefu;
krebs.build.target = "root@pornocauster"; krebs.build.target = "root@pornocauster";
#krebs.Reaktor.nickname = "makefu|r";
networking.firewall.allowedTCPPorts = [ networking.firewall.allowedTCPPorts = [
25 25
]; ];
@ -41,7 +45,7 @@
nixpkgs = { nixpkgs = {
url = https://github.com/NixOS/nixpkgs; url = https://github.com/NixOS/nixpkgs;
#url = https://github.com/makefu/nixpkgs; #url = https://github.com/makefu/nixpkgs;
rev = "13576925552b1d0751498fdda22e91a055a1ff6c"; rev = "03921972268934d900cc32dad253ff383926771c";
}; };
}; };
} }

View File

@ -9,9 +9,9 @@
../2configs/base.nix ../2configs/base.nix
../2configs/base-gui.nix ../2configs/base-gui.nix
../2configs/tinc-basic-retiolum.nix ../2configs/tinc-basic-retiolum.nix
../2configs/sda-crypto-root.nix ../2configs/fs/sda-crypto-root.nix
# hardware specifics are in here # hardware specifics are in here
../2configs/tp-x200.nix #< imports tp-x2x0.nix ../2configs/hw/tp-x200.nix #< imports tp-x2x0.nix
../2configs/disable_v6.nix ../2configs/disable_v6.nix
../2configs/rad1o.nix ../2configs/rad1o.nix

View File

@ -0,0 +1,23 @@
{ config, lib, pkgs, ... }:
# vda1 ext4 (label nixos) -> only root partition
with lib;
{
boot.loader.grub.enable = true;
boot.loader.grub.version = 2;
boot.loader.grub.device = "/dev/sda";
fileSystems."/" = {
device = "/dev/disk/by-label/nixos";
fsType = "ext4";
};
fileSystems."/boot" = {
device = "/dev/disk/by-label/boot";
fsType = "ext4";
};
hardware.enableAllFirmware = true;
nixpkgs.config.allowUnfree = true;
hardware.cpu.amd.updateMicrocode = true;
}

View File

@ -0,0 +1,77 @@
{ config, lib, pkgs, ... }:
# TODO: remove tv lib :)
with import ../../../tv/4lib { inherit lib pkgs; };
let
repos = priv-repos // krebs-repos ;
rules = concatMap krebs-rules (attrValues krebs-repos) ++ concatMap priv-rules (attrValues priv-repos);
krebs-repos = mapAttrs make-krebs-repo {
brain = {
desc = "braiiiins";
};
};
priv-repos = mapAttrs make-priv-repo {
autosync = { };
};
# TODO move users to separate module
make-priv-repo = name: { desc ? null, ... }: {
inherit name desc;
public = false;
};
make-krebs-repo = with git; name: { desc ? null, ... }: {
inherit name desc;
public = false;
hooks = {
post-receive = git.irc-announce {
nick = config.networking.hostName;
channel = "#retiolum";
# TODO remove the hardcoded hostname
server = "cd.retiolum";
};
};
};
set-owners = with git;repo: user:
singleton {
inherit user;
repo = [ repo ];
perm = push "refs/*" [ non-fast-forward create delete merge ];
};
set-ro-access = with git; repo: user:
optional repo.public {
inherit user;
repo = [ repo ];
perm = fetch;
};
# TODO: get the list of all krebsministers
krebsminister = with config.krebs.users; [ lass tv ];
all-makefu = with config.krebs.users; [ makefu makefu-omo makefu-tsp ];
priv-rules = repo: set-owners repo all-makefu;
krebs-rules = repo:
set-owners repo all-makefu ++ set-ro-access repo krebsminister;
in {
imports = [{
krebs.users.makefu-omo = {
name = "makefu-omo" ;
pubkey= with builtins; readFile ../../../krebs/Zpubkeys/makefu_omo.ssh.pub;
};
krebs.users.makefu-tsp = {
name = "makefu-tsp" ;
pubkey= with builtins; readFile ../../../krebs/Zpubkeys/makefu_tsp.ssh.pub;
};
}];
krebs.git = {
enable = true;
cgit = false;
inherit repos rules;
};
}

View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
# TODO: remove tv lib :) # TODO: remove tv lib :)
with import ../../tv/4lib { inherit lib pkgs; }; with import ../../../tv/4lib { inherit lib pkgs; };
let let
repos = priv-repos // krebs-repos ; repos = priv-repos // krebs-repos ;
@ -63,11 +63,11 @@ in {
imports = [{ imports = [{
krebs.users.makefu-omo = { krebs.users.makefu-omo = {
name = "makefu-omo" ; name = "makefu-omo" ;
pubkey= with builtins; readFile ../../krebs/Zpubkeys/makefu_omo.ssh.pub; pubkey= with builtins; readFile ../../../krebs/Zpubkeys/makefu_omo.ssh.pub;
}; };
krebs.users.makefu-tsp = { krebs.users.makefu-tsp = {
name = "makefu-tsp" ; name = "makefu-tsp" ;
pubkey= with builtins; readFile ../../krebs/Zpubkeys/makefu_tsp.ssh.pub; pubkey= with builtins; readFile ../../../krebs/Zpubkeys/makefu_tsp.ssh.pub;
}; };
}]; }];
krebs.git = { krebs.git = {

View File

@ -1,6 +1,6 @@
{ config, lib, ... }: { config, lib, ... }:
with import ../../krebs/4lib { inherit lib; }; with lib;
let let
cfg = config.krebs; cfg = config.krebs;