summaryrefslogtreecommitdiffstats
path: root/makefu/1systems/omo
diff options
context:
space:
mode:
authorlassulus <git@lassul.us>2023-06-19 03:25:39 +0200
committerlassulus <git@lassul.us>2023-06-19 03:25:39 +0200
commit139799c53cdaf55c362109e01be9dd96cc8700ed (patch)
treeb1ce719ec8f62458bce2d9fe2191b8d004630f2a /makefu/1systems/omo
parentcb8fbb09127392a17d698d91f78ede7ae46accb8 (diff)
parenta766e88e7c8d87aa6bdbde796d3a454f7b5e546e (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems/omo')
-rw-r--r--makefu/1systems/omo/config.nix33
1 files changed, 18 insertions, 15 deletions
diff --git a/makefu/1systems/omo/config.nix b/makefu/1systems/omo/config.nix
index 3ff1d0238..224e170dd 100644
--- a/makefu/1systems/omo/config.nix
+++ b/makefu/1systems/omo/config.nix
@@ -54,17 +54,19 @@ in {
<stockholm/makefu/2configs/share/omo.nix>
<stockholm/makefu/2configs/share/gum-client.nix>
<stockholm/makefu/2configs/sync>
- <stockholm/makefu/2configs/dcpp/airdcpp.nix>
- { krebs.airdcpp.dcpp.shares = let
- d = path: "/media/cryptX/${path}";
- in {
- emu.path = d "emu";
- audiobooks.path = lib.mkForce (d "audiobooks");
- incoming.path = lib.mkForce (d "torrent");
- anime.path = d "anime";
- };
- krebs.airdcpp.dcpp.DownloadDirectory = "/media/cryptX/torrent/dcpp";
- }
+
+ <stockholm/makefu/2configs/wireguard/wiregrill.nix>
+ #<stockholm/makefu/2configs/dcpp/airdcpp.nix>
+ #{ krebs.airdcpp.dcpp.shares = let
+ # d = path: "/media/cryptX/${path}";
+ # in {
+ # emu.path = d "emu";
+ # audiobooks.path = lib.mkForce (d "audiobooks");
+ # incoming.path = lib.mkForce (d "torrent");
+ # anime.path = d "anime";
+ # };
+ # krebs.airdcpp.dcpp.DownloadDirectory = "/media/cryptX/torrent/dcpp";
+ #}
{
# copy config from <secrets/sabnzbd.ini> to /var/lib/sabnzbd/
#services.sabnzbd.enable = true;
@@ -84,12 +86,12 @@ in {
<stockholm/makefu/2configs/stats/telegraf>
# <stockholm/makefu/2configs/stats/telegraf/europastats.nix>
<stockholm/makefu/2configs/stats/telegraf/hamstats.nix>
- # <stockholm/makefu/2configs/stats/arafetch.nix>
+ <stockholm/makefu/2configs/hw/cdrip.nix>
# services
{
services.nginx.enable = true;
- networking.firewall.allowedTCPPorts = [ 80 ];
+ networking.firewall.allowedTCPPorts = [ 80 8123 ];
}
# <stockholm/makefu/2configs/syncthing.nix>
<stockholm/makefu/2configs/remote-build/slave.nix>
@@ -100,10 +102,11 @@ in {
<stockholm/makefu/2configs/home/jellyfin.nix>
<stockholm/makefu/2configs/home/music.nix>
<stockholm/makefu/2configs/home/photoprism.nix>
- <stockholm/makefu/2configs/home/tonie.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/ham>
+ <stockholm/makefu/2configs/home/ham/docker.nix>
<stockholm/makefu/2configs/home/zigbee2mqtt>
{
makefu.ps3netsrv = {