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

merge in new sources definition

Browse Source
This commit is contained in:
makefu 2015-09-27 19:30:37 +02:00
parent dec3f4a211
commit 5038c65ab0
3 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
makefu/1systems/pornocauster.nix
View File

@ -9,6 +9,9 @@
../2configs/base.nix ../2configs/base.nix
../2configs/main-laptop.nix #< base-gui ../2configs/main-laptop.nix #< base-gui
# configures sources
../2configs/base-sources.nix
# Krebs # Krebs
../2configs/tinc-basic-retiolum.nix ../2configs/tinc-basic-retiolum.nix
#../2configs/disable_v6.nix #../2configs/disable_v6.nix
@ -18,34 +21,30 @@
# applications # applications
../2configs/exim-retiolum.nix ../2configs/exim-retiolum.nix
../2configs/virtualization.nix #../2configs/virtualization.nix
../2configs/virtualization-virtualbox.nix
../2configs/wwan.nix ../2configs/wwan.nix
# services # services
../2configs/git/brain-retiolum.nix ../2configs/git/brain-retiolum.nix
# ../2configs/Reaktor/simpleExtend.nix ../2configs/tor.nix
# hardware specifics are in here # hardware specifics are in here
../2configs/hw/tp-x220.nix ../2configs/hw/tp-x220.nix
# mount points # mount points
../2configs/fs/sda-crypto-root-home.nix ../2configs/fs/sda-crypto-root-home.nix
]; ];
krebs.Reaktor.enable = true;
krebs.Reaktor.debug = true;
krebs.Reaktor.nickname = "makefu|r";
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
]; ];
krebs.build.deps = {
nixpkgs = {
url = https://github.com/NixOS/nixpkgs;
#url = https://github.com/makefu/nixpkgs;
rev = "03921972268934d900cc32dad253ff383926771c";
};
};
} }

19
makefu/2configs/base-sources.nix Normal file
View File

@ -0,0 +1,19 @@
{ config, lib, pkgs, ... }:
{
krebs.build.source = {
git.nixpkgs = {
url = https://github.com/NixOS/nixpkgs;
#url = https://github.com/makefu/nixpkgs;
rev = "68bd8e4a9dc247726ae89cc8739574261718e328";
};
dir.secrets = {
host = config.krebs.hosts.pornocauster;
path = "/home/makefu/secrets/${config.krebs.build.host.name}/";
};
dir.stockholm = {
host = config.krebs.hosts.pornocauster;
path = toString ../.. ;
};
};
}

9
makefu/2configs/base.nix
View File

@ -37,15 +37,6 @@ with lib;
time.timeZone = "Europe/Berlin"; time.timeZone = "Europe/Berlin";
#nix.maxJobs = 1; #nix.maxJobs = 1;
krebs.build.deps = {
secrets = {
url = "/home/makefu/secrets/${config.krebs.build.host.name}";
};
stockholm = {
url = toString ../..;
};
};
services.openssh.enable = true; services.openssh.enable = true;
nix.useChroot = true; nix.useChroot = true;