use hoyolab-claim-bot

modules/hoyolab-daily-bot.nix

@@ -1,54 +0,0 @@
-{ config, lib, pkgs, ... }:
-with lib;
-let
-  cfg = config.services.hoyolab-daily-bot;
-in {
-  options.services.hoyolab-daily-bot = {
-    enable = mkEnableOption "Hoyolab Daily Bot";
-
-    package = mkOption {
-      type = types.package;
-      description = lib.mdDoc "Which package to use.";
-      default = pkgs.hoyolab-daily-bot;
-      defaultText = literalExpression "pkgs.hoyolab-daily-bot";
-    };
-
-    cookieFiles = mkOption {
-      type = types.listOf types.str;
-      default = [ ];
-      description =
-        lib.mdDoc "List of paths to cookie files. If not provided, use cookie from browser.";
-    };
-
-    user = mkOption {
-      type = types.str;
-      default = "root";
-      description = lib.mdDoc "";
-    };
-
-    startAt = mkOption {
-      type = types.str;
-      default = "*-*-* 20:00:00";
-      description = lib.mdDoc "";
-    };
-  };
-
-  config = mkIf cfg.enable {
-    systemd.services.hoyolab-daily-bot = {
-      description = "Hoyolab Daily Login Bot.";
-      serviceConfig = {
-        Type = "oneshot";
-        User = cfg.user;
-        StateDirectory = "hoyolab-daily-bot";
-      };
-      startAt = cfg.startAt;
-      script = if (cfg.cookieFiles == [ ]) then ''
-        ${cfg.package}/bin/hoyolab-daily-bot
-      '' else ''
-        ${concatMapStringsSep "\n" (x:
-          "${cfg.package}/bin/hoyolab-daily-bot -c ${x}"
-        ) cfg.cookieFiles}
-      '';
-    };
-  };
-}

profiles/servers/hoyolab.nix

@@ -1,14 +1,10 @@
 { config, inputs, ... }: {
-  sops.secrets.hoyolab-cookie1.sopsFile = inputs.self.secretsDir + /home-hypervisor/hoyolab.yaml;
-  sops.secrets.hoyolab-cookie2.sopsFile = inputs.self.secretsDir + /home-hypervisor/hoyolab.yaml;
-  sops.secrets.hoyolab-cookie3.sopsFile = inputs.self.secretsDir + /home-hypervisor/hoyolab.yaml;
+  imports = [ inputs.ataraxiasjel-nur.nixosModules.hoyolab ];
+  sops.secrets.hoyolab-config.sopsFile = inputs.self.secretsDir + /home-hypervisor/hoyolab.yaml;
 
-  services.hoyolab-daily-bot = {
+  services.hoyolab-claim-bot = {
     enable = true;
-    cookieFiles = [
-      config.sops.secrets.hoyolab-cookie1.path
-      config.sops.secrets.hoyolab-cookie2.path
-      config.sops.secrets.hoyolab-cookie3.path
-    ];
+    configFile = config.sops.secrets.hoyolab-config.path;
+    startAt = "*-*-* 20:00:00";
   };
 }

secrets/home-hypervisor/hoyolab.yaml

@@ -1,14 +1,12 @@
-hoyolab-cookie1: ENC[AES256_GCM,data:nntVA/KhfdKApuJxjRNHskAQz7CG3BLCONEpT1QrKLMKzwnA6RsvW2OzKG8SgbVyeqCeTTSIKDPth3jImOwk68zK9S2yz9mWRivlPLR86IVdAannbhTFhmHlCqrRHPPYlEZ+Su23zvOGMKn+YVc15mBxnnFCDKYR7MrTiNxkjovSTSr5WwtDwccfu9kcM2Z2u8lEMtdWqcRFHDarnAvThO8QguWJ+DospIRbAMXFD7wTSDEAGAOhcVegoxHni1D/fDe36pbW0x0lBC/J6z4of+yJpEvRrnWvxWsD/eSqzljxmSzovU3mXesB2tyoz+Jd6guERILtM1XQeezi,iv:VM4GPfkSuq6c5Z4sRVFOcn7YKEkFOtEA0PcbYaOhF9g=,tag:7DPK+nyt0ErkE31udEIRqA==,type:str]
-hoyolab-cookie2: ENC[AES256_GCM,data:/XTaJ6YKw3p1A6i+LGjYU/d6zO/bNsX2dWbMDp9fLNCkPGIwFbUCXbiHZqf+enTmk5zzOyxb+B2sJvjeW4kKKP2BDkr0okpUX/AleA+3ReEgPIIiKPNMNL3t1eAVRQEs9t+3s8zj6+siGPjZUpuy7NvrhnETvi7YmVSTamA400X8d9gbKG4Vs7hPB4otA5t8pXZYqJWLuRyjwvvdxYrtgpdRfgzYWhBOu5dZ+rFtccJI/rQMlTcJcPbhmc2vFV09I2xaeXU8piDEMco3y+wm0p3KduPNzP98s6LvfxiQMqM60/baKw/3M055EbQoRinUJDG63eaqL/ACNztZ,iv:+fWtn55dn5fOGjvIlrYfh0FmMzG9/mf/fNOOa9KR5Qg=,tag:yI0bJpXNC5mKKdO3/8cx+w==,type:str]
-hoyolab-cookie3: ENC[AES256_GCM,data:3lDvQRrf4wrl28G6ognKlEPquG3JYieYA9ZQ4cEL/QwB0F+ksP2sTxFeIr9gihsWZQHgfYzeRLCSOAammW0WO/prpCP1X/JzuA0uGF83aMC07n2FSiroHjiBPBJhwUBRW0hPeXSURWz5D4mtDkv6PQB6bkfY0y2V2QNQ26qiT/mooi1tJGL4uSfMZ5Ix+emJwtzn/CCGTr1Y0U9GZf5IiFj6Z76mMPZ1BEW2C+b/XD1huatMr3KLNGoYVqJm/6pCCGr6GkUh+jJXtdNM612oe0r6PVu6UhVel+58jhWzKUoGv4ZOZMqhbrjla93BEfVNI6aRnTySpRWwl0EV,iv:Wmso1lZa65M7Ej7so2Lw7Mbvib2O7upfpnOEwACTeYc=,tag:oswA0vhQ2I2gty7v7lVjdg==,type:str]
+hoyolab-config: ENC[AES256_GCM,data:a+VkRtVAiVfFSazp64Fy5eA6TAbAcC7bm2k6p8AE1FJgA8Z/LlOCcDbTaueFXecOCGpcSuv+SJTsu+2IRD2V7ZWIUot0b1fxKUFZ5hIU8LmpXxxh8tQz3N7Rw6FAWHrN/BM3m981pTqd4FOmqXtgxOMF8ItsGJEwpRkq31lT+A7dcuEuQCykll2dXeHQJXBVUs3TbeDsCo4/lNan++sYm0QvS33n+ybs29oePPeteWdXHEZtfmWHLKU5KPy86uPOkooKXkv5+XibTgaQzo90/AZA3FjED9Mko+mFzPhGtsYhr2wjId8Go3zm5HKqcpWWiut7mkBJzZ4YoOYCdHaqWM0ySbbdMCGiKmvpQCsq5weXI6WL2wfIxOp5SKVl9K3AR97jgl6CG/uoko9ozCSWsK6DUob5yglTK0iMvcuo0k2ohxAM/aFnxrLmUuQ7Jbu0DjKpT0xlELavSlScA8aS6aMzJT3u/i05pTPkoNDoYB0bviGyjJ+greP+YVINeqJPmrVvK7KKAu2ULLYHfsUNHlAMMZi/22PkNHotIXsbj6kEGaegiDTnuuVFwKW2j4vX4LEp0AwSr/M9OLjLN16k0Sslu+oifP68pxz24DqtpyPCS/cy1uVLtUHjtk8puR+l7+fmaRh1bCGC2zFb/D4q2TFSS8hlv7bYK0YNpEYGkJd6IXyYgcDNijPEAm2VbBYY24eyW8+GMy6wPCD++DPF4/tvhoVpqqPYgE56h2+Qv4Ca0BugmfSzntEOCRKteeCqVmvGTsBGT9YUwravdQc=,iv:sKhAPKaELVo17Rt/tPi5L/kFSSim5A/H6vM+7df5qUE=,tag:nvghxY7EAtDNf8OlolXLlw==,type:str]
 sops:
     kms: []
     gcp_kms: []
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2024-01-21T19:16:02Z"
-    mac: ENC[AES256_GCM,data:wEaG9ORs4llAHChwW7UxXgJ0UIcjzmubfIXF/ufZ+HlD4rxM8SLmWlmyCD9AdwR76VMz2pK3juyZmyGeOubriMegunf0jouHpr59smk6jFES8uBr1ik6GcTG4uL0LSmj+LYeJB43/ob+68VxiTicA05rP4jl+BU0Iy90hX9Hkng=,iv:UdcPrwWOgrdcy8PfveNAxte6yW4VR7VMnknrGItDvVY=,tag:g75nyYRspjO2LMDz+Z4izA==,type:str]
+    lastmodified: "2024-02-02T18:46:43Z"
+    mac: ENC[AES256_GCM,data:W+btPIsNOr8e47vnjwmEa3xQT/kv1nJapzX6PC/CEcCUWng+wfwsIrxj8gg4fXCPiBsjzbYrMlUEylibwNm7sr6xJqI6nVf73cH3kXJMfpufRjfCjLSbzmg6tEWtWf+S7zaRD6ibwe5ZhFooYriGtatZVQg7oyGoMUK5Cf0mJWk=,iv:LhqEJTh5+nlEcExRh2GHwgmazAezKU9nU+ktZjXhJNM=,tag:/r8YVU7dp5DZESu9xCsezA==,type:str]
     pgp:
         - created_at: "2024-01-21T19:15:05Z"
           enc: |-