diff options
| author | makefu <github@syntax-fehler.de> | 2015-09-27 19:41:01 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2015-09-27 19:41:01 +0200 |
| commit | bc2bd6e2f6e9295b14e641b82bff62b40641988d (patch) | |
| tree | 8bc4b655c12b4e0bc33051116a3adb3003463d34 /makefu/1systems/pornocauster.nix | |
| parent | c65614cdef66c38ff2939928e9072873e19e1c37 (diff) | |
| parent | 170191034e51fb7e80ff6e6ddcac103ec7527afd (diff) | |
Merge branch 'before-merge'
Diffstat (limited to 'makefu/1systems/pornocauster.nix')
| -rw-r--r-- | makefu/1systems/pornocauster.nix | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/makefu/1systems/pornocauster.nix b/makefu/1systems/pornocauster.nix index 4dcfe4eca..d43f89a03 100644 --- a/makefu/1systems/pornocauster.nix +++ b/makefu/1systems/pornocauster.nix @@ -9,6 +9,9 @@ ../2configs/base.nix ../2configs/main-laptop.nix #< base-gui + # configures sources + ../2configs/base-sources.nix + # Krebs ../2configs/tinc-basic-retiolum.nix #../2configs/disable_v6.nix @@ -18,34 +21,30 @@ # applications ../2configs/exim-retiolum.nix - ../2configs/virtualization.nix + #../2configs/virtualization.nix + ../2configs/virtualization-virtualbox.nix ../2configs/wwan.nix # services ../2configs/git/brain-retiolum.nix - # ../2configs/Reaktor/simpleExtend.nix + ../2configs/tor.nix # hardware specifics are in here ../2configs/hw/tp-x220.nix # mount points ../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.user = config.krebs.users.makefu; krebs.build.target = "root@pornocauster"; - #krebs.Reaktor.nickname = "makefu|r"; networking.firewall.allowedTCPPorts = [ 25 ]; - krebs.build.deps = { - nixpkgs = { - url = https://github.com/NixOS/nixpkgs; - #url = https://github.com/makefu/nixpkgs; - rev = "03921972268934d900cc32dad253ff383926771c"; - }; - }; } |