diff --git a/home/modules/runit/default.nix b/home/modules/runit/default.nix index 314d107..eb12c04 100644 --- a/home/modules/runit/default.nix +++ b/home/modules/runit/default.nix @@ -18,16 +18,6 @@ description = "Shell commands executed as the service's main process"; }; log.enable = lib.mkEnableOption "Enable logging"; - environment = lib.mkOption { - type = lib.types.attrsOf lib.types.str; - default = {}; - description = "Environment variables passed to the service's processes"; - }; - environmentFile = lib.mkOption { - type = lib.types.nullOr lib.types.path; - default = null; - description = "Environment file passed to the service"; - }; }; })); }; @@ -38,45 +28,21 @@ config = { home.file = lib.mkMerge ( lib.mapAttrsToList (serviceName: sCfg: - let - envExports = lib.concatStringsSep "\n" ( - lib.mapAttrsToList (k: v: "export ${k}='${v}'") sCfg.environment - ); - envFile = lib.mkIf (sCfg.environmentFile != null) { - "runit/services/${serviceName}/.env" = { - source = sCfg.environmentFile; - }; + { + # run script + "runit/services/${serviceName}/run" = { + text = sCfg.script; + executable = true; }; - envFileSetup = if sCfg.environmentFile != null then '' - set -a - source .env - set +a - '' else ""; - in - lib.mkMerge [ - { - # run script - "runit/services/${serviceName}/run" = { - text = '' - #!/usr/bin/env bash - ${envExports} - ${envFileSetup} - ${sCfg.script} - ''; - executable = true; - }; - - # logging - "runit/services/${serviceName}/log/run" = lib.mkIf sCfg.log.enable { - text = '' - #!/bin/sh - exec svlogd -t ./main - ''; - executable = true; - }; - } - envFile - ] + + # logging + "runit/services/${serviceName}/log/run" = lib.mkIf sCfg.log.enable { + text = '' + #!/bin/sh + exec svlogd -t ./main + ''; + }; + } ) config.runit.services ); }; diff --git a/home/modules/runit/services/cloudflared.nix b/home/modules/runit/services/cloudflared.nix deleted file mode 100644 index 7cdd0b2..0000000 --- a/home/modules/runit/services/cloudflared.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ pkgs, config, rootPath, ... }: - -let - tunnel = "cb0d9c2c-48f9-4bca-9e81-ef92423c5afa"; -in -{ - home.file.".cloudflared/${tunnel}.json".source = rootPath + /secrets/gitcrypt/cloudflared/${tunnel}.json; - home.file.".cloudflared/cert.pem".source = rootPath + /secrets/gitcrypt/cloudflared/cert.pem; - home.file.".cloudflared/config.yml".text = '' - tunnel: ${tunnel} - credentials-file: ${config.home.homeDirectory}/.cloudflared/${tunnel}.json - - ingress: - - hostname: gist.toast.name - service: http://${config.runit.services.opengist.environment.OG_HTTP_HOST}:${config.runit.services.opengist.environment.OG_HTTP_PORT} - - service: http_status:404 - ''; - - runit.services.cloudflared = { - script = '' - exec ${pkgs.cloudflared}/bin/cloudflared tunnel run - ''; - log.enable = true; - }; -} diff --git a/home/modules/runit/services/glances.nix b/home/modules/runit/services/glances.nix index 94db540..4a7079f 100644 --- a/home/modules/runit/services/glances.nix +++ b/home/modules/runit/services/glances.nix @@ -3,7 +3,8 @@ { runit.services.glances = { script = '' - exec ${pkgs.glances}/bin/glances -w + #!/bin/bash + ${pkgs.glances}/bin/glances -w ''; }; } diff --git a/home/modules/runit/services/opengist.nix b/home/modules/runit/services/opengist.nix deleted file mode 100644 index d7929c7..0000000 --- a/home/modules/runit/services/opengist.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ pkgs, rootPath, ... }: - -{ - runit.services.opengist = { - script = '' - exec ${pkgs.opengist}/bin/opengist start - ''; - - environment = { - OG_HTTP_HOST = "127.0.0.1"; - OG_HTTP_PORT = "6157"; - OG_SSH_HOST = "127.0.0.1"; - OG_SSH_PORT = "6522"; - }; - - environmentFile = rootPath + /secrets/gitcrypt/opengist.env; - - log.enable = true; - }; -} diff --git a/secrets/gitcrypt/cloudflared/cb0d9c2c-48f9-4bca-9e81-ef92423c5afa.json b/secrets/gitcrypt/cloudflared/cb0d9c2c-48f9-4bca-9e81-ef92423c5afa.json deleted file mode 100644 index 46cd7b1..0000000 Binary files a/secrets/gitcrypt/cloudflared/cb0d9c2c-48f9-4bca-9e81-ef92423c5afa.json and /dev/null differ diff --git a/secrets/gitcrypt/cloudflared/cert.pem b/secrets/gitcrypt/cloudflared/cert.pem deleted file mode 100644 index 230ea54..0000000 Binary files a/secrets/gitcrypt/cloudflared/cert.pem and /dev/null differ diff --git a/secrets/gitcrypt/opengist.env b/secrets/gitcrypt/opengist.env deleted file mode 100644 index 275e5fc..0000000 Binary files a/secrets/gitcrypt/opengist.env and /dev/null differ diff --git a/secrets/gitcrypt/runit/env b/secrets/gitcrypt/runit/env new file mode 100644 index 0000000..15a44d8 Binary files /dev/null and b/secrets/gitcrypt/runit/env differ