diff options
author | lassulus <lassulus@lassul.us> | 2020-05-25 16:07:42 +0200 |
---|---|---|
committer | lassulus <lassulus@lassul.us> | 2020-05-25 16:07:42 +0200 |
commit | 6c8210f93ae6715cbf5aa2adfef8bfd6bfc908b2 (patch) | |
tree | f4f87d2212f9c3f628c7ed6b5f652e323642fd52 /makefu/1systems | |
parent | d8386001a04b081e5779386b911cf7d4e9fd30e0 (diff) | |
parent | 4ba18c6d2a442834e79b5526eff0aa2c5f8398e8 (diff) |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems')
-rw-r--r-- | makefu/1systems/gum/config.nix | 1 | ||||
-rw-r--r-- | makefu/1systems/omo/config.nix | 24 | ||||
-rw-r--r-- | makefu/1systems/x/config.nix | 2 |
3 files changed, 17 insertions, 10 deletions
diff --git a/makefu/1systems/gum/config.nix b/makefu/1systems/gum/config.nix index 5639691e2..a38a671f4 100644 --- a/makefu/1systems/gum/config.nix +++ b/makefu/1systems/gum/config.nix @@ -140,6 +140,7 @@ in { <stockholm/makefu/2configs/deployment/boot-euer.nix> <stockholm/makefu/2configs/deployment/gecloudpad> <stockholm/makefu/2configs/deployment/docker/archiveteam-warrior.nix> + <stockholm/makefu/2configs/deployment/docker/etherpad.euer.krebsco.de.nix> <stockholm/makefu/2configs/shiori.nix> <stockholm/makefu/2configs/bgt/download.binaergewitter.de.nix> diff --git a/makefu/1systems/omo/config.nix b/makefu/1systems/omo/config.nix index 37fb9128d..cfe0d0a3f 100644 --- a/makefu/1systems/omo/config.nix +++ b/makefu/1systems/omo/config.nix @@ -26,6 +26,10 @@ in { # <stockholm/makefu/2configs/disable_v6.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/omo.nix> <stockholm/makefu/2configs/dcpp/airdcpp.nix> { krebs.airdcpp.dcpp.shares = let @@ -125,16 +129,16 @@ in { zramSwap.enable = true; - krebs.Reaktor.reaktor-shack = { - nickname = "Reaktor|shack"; - workdir = "/var/lib/Reaktor/shack"; - channels = [ "#shackspace" ]; - plugins = with pkgs.ReaktorPlugins; - [ shack-correct - # stockholm-issue - sed-plugin - random-emoji ]; - }; + #krebs.Reaktor.reaktor-shack = { + # nickname = "Reaktor|shack"; + # workdir = "/var/lib/Reaktor/shack"; + # channels = [ "#shackspace" ]; + # plugins = with pkgs.ReaktorPlugins; + # [ shack-correct + # # stockholm-issue + # sed-plugin + # random-emoji ]; + #}; #krebs.Reaktor.reaktor-bgt = { # nickname = "Reaktor|bgt"; # workdir = "/var/lib/Reaktor/bgt"; diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix index ea92e3485..4e6706b25 100644 --- a/makefu/1systems/x/config.nix +++ b/makefu/1systems/x/config.nix @@ -19,7 +19,9 @@ <stockholm/makefu/2configs/tools/all.nix> { programs.adb.enable = true; } + { systemd.services.docker.wantedBy = lib.mkForce []; } <stockholm/makefu/2configs/dict.nix> + <stockholm/makefu/2configs/legacy_only.nix> #<stockholm/makefu/3modules/netboot_server.nix> #{ # netboot_server = { |