From 2a8daf2aae69068232fb2ed3c78f1d5610375fbf Mon Sep 17 00:00:00 2001 From: randomuser Date: Mon, 18 Dec 2023 13:19:58 -0600 Subject: [PATCH] refactor the ugly systemd service to a nice one --- boxes/mainsail.nix | 61 +++++++++++++++++++++------------------------- 1 file changed, 28 insertions(+), 33 deletions(-) diff --git a/boxes/mainsail.nix b/boxes/mainsail.nix index 4eba506..66796b5 100644 --- a/boxes/mainsail.nix +++ b/boxes/mainsail.nix @@ -1,5 +1,4 @@ { lib, config, pkgs, ...}: - { imports = [ ../common/steam.nix @@ -21,9 +20,17 @@ }; }; + services.calibre-web.enable = true; + services.calibre-web.listen.port = 8080; + programs.adb.enable = true; users.users.usr.extraGroups = ["adbusers"]; + services.openssh = { + enable = true; + ports = [2222]; + }; + services.radicale = { enable = true; config = '' @@ -34,20 +41,6 @@ ''; }; - environment.etc."nextcloud-admin-pass".text = "aslkfjaslkdfjsalkdfjlKJFLKJDLFKJLSKDJFLSKDJFLSKDJFLSKDFJ"; - services.nextcloud = { - enable = true; - hostName = "beepboop.systems"; - config.adminpassFile = "/etc/nextcloud-admin-pass"; - package = pkgs.nextcloud27; - # Instead of using pkgs.nextcloud27Packages.apps, - # we'll reference the package version specified above - extraApps = with config.services.nextcloud.package.packages.apps; { - inherit news contacts calendar tasks; - }; - extraAppsEnable = true; - }; - systemd.targets.sleep.enable = false; systemd.targets.suspend.enable = false; systemd.targets.hibernate.enable = false; @@ -68,7 +61,7 @@ vscodium-fhs libreoffice - anki + anki-bin ytfzf kdenlive libreoffice @@ -77,28 +70,30 @@ gnumake scrcpy + thunderbird + mepo ]; - systemd.services.paperless-activate = { + systemd.services.paperless-web-bridge = { script = '' - while true; do - # restart every 5 minutes - echo "starting link" - ${pkgs.openssh}/bin/ssh -v -NR 3004:localhost:3004 -p 55555 useracc@beepboop.systems & - ONE="$!" - ${pkgs.openssh}/bin/ssh -v -NR 4000:localhost:80 -p 55555 useracc@beepboop.systems & - TWO="$!" - ${pkgs.openssh}/bin/ssh -v -NR 5232:localhost:5232 -p 55555 useracc@beepboop.systems & - THREE="$!" - echo "waiting" - sleep $((60 * 5)) - echo "killing and restarting" - kill $ONE || true - kill $TWO || true - kill $THREE || true - done + ${pkgs.openssh}/bin/ssh -v -NR 3004:localhost:3004 -p 55555 useracc@beepboop.systems ''; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" "ankisyncd.service" ]; + }; + systemd.services.radicale-web-bridge = { + script = '' + ${pkgs.openssh}/bin/ssh -v -NR 5232:localhost:5232 -p 55555 useracc@beepboop.systems + ''; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" "ankisyncd.service" ]; + }; + + systemd.services.internal-ssh-bridge = { + script = '' + ${pkgs.openssh}/bin/ssh -v -NR 2222:localhost:2222 -p 55555 useracc@beepboop.systems + ''; wantedBy = [ "multi-user.target" ]; after = [ "network.target" "ankisyncd.service" ]; };