diff options
| author | lassulus <lass@aidsballs.de> | 2015-09-05 12:17:59 +0200 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2015-09-05 12:17:59 +0200 |
| commit | f54a0a9ea7fd5a9902a5b38786da42f06d615b5a (patch) | |
| tree | d7c475b212d8acc35a5dc7d20ec1f2228c664010 /makefu/1systems/pornocauster.nix | |
| parent | f3c1727659c59ff638b1adead8e30ee2f79f39de (diff) | |
| parent | d6d9956abc60548c755d30e6a5bd13c10abbb181 (diff) | |
Merge branch 'makefu'
Diffstat (limited to 'makefu/1systems/pornocauster.nix')
| -rw-r--r-- | makefu/1systems/pornocauster.nix | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/makefu/1systems/pornocauster.nix b/makefu/1systems/pornocauster.nix index 415c1af30..4dcfe4eca 100644 --- a/makefu/1systems/pornocauster.nix +++ b/makefu/1systems/pornocauster.nix @@ -13,9 +13,7 @@ ../2configs/tinc-basic-retiolum.nix #../2configs/disable_v6.nix - #../2configs/sda-crypto-root.nix - ../2configs/sda-crypto-root-home.nix - + # environment ../2configs/zsh-user.nix # applications @@ -23,14 +21,22 @@ ../2configs/virtualization.nix ../2configs/wwan.nix + # services + ../2configs/git/brain-retiolum.nix + # ../2configs/Reaktor/simpleExtend.nix + # 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.user = config.krebs.users.makefu; krebs.build.target = "root@pornocauster"; + #krebs.Reaktor.nickname = "makefu|r"; + networking.firewall.allowedTCPPorts = [ 25 ]; @@ -39,7 +45,7 @@ nixpkgs = { url = https://github.com/NixOS/nixpkgs; #url = https://github.com/makefu/nixpkgs; - rev = "13576925552b1d0751498fdda22e91a055a1ff6c"; + rev = "03921972268934d900cc32dad253ff383926771c"; }; }; } |