summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--makefu/1systems/latte/config.nix18
-rw-r--r--makefu/1systems/omo/config.nix7
-rw-r--r--makefu/2configs/torrent/rtorrent.nix (renamed from makefu/2configs/torrent.nix)0
3 files changed, 22 insertions, 3 deletions
diff --git a/makefu/1systems/latte/config.nix b/makefu/1systems/latte/config.nix
index fdd3df192..5332fadf5 100644
--- a/makefu/1systems/latte/config.nix
+++ b/makefu/1systems/latte/config.nix
@@ -29,10 +29,19 @@ in {
<stockholm/makefu/2configs/remote-build/slave.nix>
# Storage
+ <stockholm/makefu/2configs/share>
<stockholm/makefu/2configs/share/hetzner-client.nix>
# Services:
<stockholm/makefu/2configs/nix-community/mediawiki-matrix-bot.nix>
+ # <stockholm/makefu/2configs/torrent.nix>
+ # <stockholm/makefu/2configs/torrent/deluge.nix>
+ <stockholm/makefu/2configs/torrent/rtorrent.nix>
+ <stockholm/makefu/2configs/deployment/rss.euer.krebsco.de.nix>
+
+ # local usage:
+ <stockholm/makefu/2configs/mosh.nix>
+ <stockholm/makefu/2configs/bitlbee.nix>
# Supervision
<stockholm/makefu/2configs/nix-community/supervision.nix>
@@ -40,9 +49,9 @@ in {
# Krebs
<stockholm/makefu/2configs/tinc/retiolum.nix>
- #<stockholm/makefu/2configs/home-manager>
- # configure your hw:
- # <stockholm/makefu/2configs/torrent.nix>
+ # backup
+ <stockholm/makefu/2configs/backup/state.nix>
+
];
krebs = {
@@ -50,4 +59,7 @@ in {
build.host = config.krebs.hosts.latte;
};
+ makefu.dl-dir = "/media/cloud/download";
+ networking.firewall.allowedTCPPorts = [ 80 ];
+
}
diff --git a/makefu/1systems/omo/config.nix b/makefu/1systems/omo/config.nix
index 3a216ea76..42f335264 100644
--- a/makefu/1systems/omo/config.nix
+++ b/makefu/1systems/omo/config.nix
@@ -43,14 +43,18 @@ in {
<stockholm/makefu/2configs/tools/dev.nix>
<stockholm/makefu/2configs/tools/desktop.nix>
<stockholm/makefu/2configs/tools/mobility.nix>
+ <stockholm/makefu/2configs/tools/consoles.nix>
#<stockholm/makefu/2configs/graphite-standalone.nix>
#<stockholm/makefu/2configs/share-user-sftp.nix>
<stockholm/makefu/2configs/urlwatch>
# <stockholm/makefu/2configs/legacy_only.nix>
+ <stockholm/makefu/2configs/share>
<stockholm/makefu/2configs/share/omo.nix>
<stockholm/makefu/2configs/share/gum-client.nix>
+ <stockholm/makefu/2configs/share/hetzner-client.nix>
+ <stockholm/makefu/2configs/sync>
<stockholm/makefu/2configs/dcpp/airdcpp.nix>
{ krebs.airdcpp.dcpp.shares = let
d = path: "/media/cryptX/${path}";
@@ -96,6 +100,8 @@ in {
<stockholm/makefu/2configs/home/music.nix>
<stockholm/makefu/2configs/home/photoprism.nix>
+ <stockholm/makefu/2configs/home/tonie.nix>
+ <stockholm/makefu/2configs/home/ps4srv.nix>
# <stockholm/makefu/2configs/home/metube.nix>
<stockholm/makefu/2configs/home/ham>
<stockholm/makefu/2configs/home/zigbee2mqtt>
@@ -104,6 +110,7 @@ in {
enable = true;
servedir = "/media/cryptX/emu/ps3";
};
+ users.users.makefu.packages = [ pkgs.pkgrename ];
}
diff --git a/makefu/2configs/torrent.nix b/makefu/2configs/torrent/rtorrent.nix
index 74f1e5fe8..74f1e5fe8 100644
--- a/makefu/2configs/torrent.nix
+++ b/makefu/2configs/torrent/rtorrent.nix