summaryrefslogtreecommitdiffstats
path: root/makefu/1systems
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2015-09-02 10:02:05 +0200
committermakefu <github@syntax-fehler.de>2015-09-02 10:02:05 +0200
commit37744f0016b77af41e8f57bc6da32b15f5ac50fd (patch)
treef51174cd0c20364eb9f4b03342dbaed7250a7729 /makefu/1systems
parentf911d43005d043ca360837eb8b3c2c2fe30bc962 (diff)
makefu: sort 2configs
Diffstat (limited to 'makefu/1systems')
-rw-r--r--makefu/1systems/pnp.nix6
-rw-r--r--makefu/1systems/pornocauster.nix16
-rw-r--r--makefu/1systems/tsp.nix4
3 files changed, 15 insertions, 11 deletions
diff --git a/makefu/1systems/pnp.nix b/makefu/1systems/pnp.nix
index bbb99390d..6ca1f1108 100644
--- a/makefu/1systems/pnp.nix
+++ b/makefu/1systems/pnp.nix
@@ -9,9 +9,9 @@
[ # Include the results of the hardware scan.
<nixpkgs/nixos/modules/profiles/qemu-guest.nix>
../2configs/base.nix
- ../2configs/cgit-retiolum.nix
+ ../2configs/git/cgit-retiolum.nix
# ../2configs/graphite-standalone.nix
- ../2configs/vm-single-partition.nix
+ ../2configs/fs/vm-single-partition.nix
../2configs/tinc-basic-retiolum.nix
../2configs/exim-retiolum.nix
@@ -26,7 +26,7 @@
krebs.build.deps = {
nixpkgs = {
url = https://github.com/NixOS/nixpkgs;
- rev = "13576925552b1d0751498fdda22e91a055a1ff6c";
+ rev = "03921972268934d900cc32dad253ff383926771c";
};
};
diff --git a/makefu/1systems/pornocauster.nix b/makefu/1systems/pornocauster.nix
index 1e2c31257..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,16 +21,22 @@
../2configs/virtualization.nix
../2configs/wwan.nix
- ../2configs/Reaktor/simpleExtend.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
];
@@ -41,7 +45,7 @@
nixpkgs = {
url = https://github.com/NixOS/nixpkgs;
#url = https://github.com/makefu/nixpkgs;
- rev = "13576925552b1d0751498fdda22e91a055a1ff6c";
+ rev = "03921972268934d900cc32dad253ff383926771c";
};
};
}
diff --git a/makefu/1systems/tsp.nix b/makefu/1systems/tsp.nix
index 67db22460..3c2bb2eda 100644
--- a/makefu/1systems/tsp.nix
+++ b/makefu/1systems/tsp.nix
@@ -9,9 +9,9 @@
../2configs/base.nix
../2configs/base-gui.nix
../2configs/tinc-basic-retiolum.nix
- ../2configs/sda-crypto-root.nix
+ ../2configs/fs/sda-crypto-root.nix
# 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/rad1o.nix