From d2f9cb70ad60c3429df3b414d5bb33944ef685c4 Mon Sep 17 00:00:00 2001 From: Kyren223 Date: Thu, 5 Jun 2025 13:42:54 +0300 Subject: Moved timers into their own nix module, fixed issues with sops, upgraded gitea.py to use env vars for secrets, added a timer to run every 5 hours to mirror repos from github to gitea --- modules/secrets.nix | 2 +- modules/secrets.yaml | 17 +++++++++++++ modules/secrets.yml | 17 ------------- modules/timers.nix | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 86 insertions(+), 18 deletions(-) create mode 100644 modules/secrets.yaml delete mode 100644 modules/secrets.yml create mode 100644 modules/timers.nix (limited to 'modules') diff --git a/modules/secrets.nix b/modules/secrets.nix index df1e9f0..7cb1e22 100644 --- a/modules/secrets.nix +++ b/modules/secrets.nix @@ -2,7 +2,7 @@ sops = { defaultSopsFile = ./secrets.yaml; - age.sshKeyPaths = [ "/home/kyren/.ssh/id_ed25519" ]; + age.sshKeyPaths = [ "/home/kyren/.ssh/sops_id_ed25519" ]; }; } diff --git a/modules/secrets.yaml b/modules/secrets.yaml new file mode 100644 index 0000000..b3d2e72 --- /dev/null +++ b/modules/secrets.yaml @@ -0,0 +1,17 @@ +gitea-sync-token: ENC[AES256_GCM,data:mG2lOIqSBy+3O/P2AGACQOc/QdORHwsnJmGcdKZo6i5Vsqf6lLVdMA==,iv:2FgXjSIuL+UPkWgGx2PXJ/kl2FFCm+1HfgDJVXeT/jU=,tag:sjRK8x1ktkEgls8jk9EeRQ==,type:str] +github-mirror-token: ENC[AES256_GCM,data:VmTpqOCR71napTGTs2aZDDi8BkT/EhPo7jjijCO9/7PozQDnTzvcY95lZsHSUV9d8jERxqYgkNLxcrxJh+auiNnlFnoZUfGWli6IU9GE/CsVC0JlqAIGv5zMa0gz,iv:7RvW3HOsHkVC1oW4RrTNqzGf8IPEjhwH/8VPZTEIICQ=,tag:gcDsLhrn9OKdCwZCHqTZrQ==,type:str] +sops: + age: + - recipient: age1zn3jpeqducllfxlm2l57pq2kqzkg23q8jgu23lyzvfapgnkf8gmqmtchfx + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBIQUkrREw0blJkeExpWVkr + ZndwbG1xSDllODM3OHNMYUFrKy92VzliTWlRCjRIQ1lpejFKM2p0QUU1OGY3T3hu + NkdkTU9tTHJNaUY3OWtCalFYQTFLN2cKLS0tIEZhU0dIenpHTiszUVZGWkIzTkFO + NEZVQ0JJMTMydUZkY3RKekQwbUEyb1EKcOQ15upVDjgGb4CzzGKIjATxCCxJJKzQ + DkkVZBZycAhVl3ChdsmulkserdvnLgwhSfGs82bsXS8lD0hsdqctCA== + -----END AGE ENCRYPTED FILE----- + lastmodified: "2025-06-05T09:53:12Z" + mac: ENC[AES256_GCM,data:nL72VUNUF7sBWbW64EegrY/Zp+LB2FPYDmWSANv8ShIJMmMY3xypFTtQr082/U2zBivAA+0HoRmUHdlaLv5OF7kVN4xuGq78EzOw55TNAa6yNqlNCbmozQfcOSfkkHsDWCVSBnzzHCmujDzDSseq3hDl4B9PB10WCPhe5+2HQc8=,iv:2zoPZjpLqxBkS4nsg/atFPXQERjk+LHr9MjE3UvcrBo=,tag:kE+9iG5ugefA7VVMbKFhJA==,type:str] + unencrypted_suffix: _unencrypted + version: 3.10.2 diff --git a/modules/secrets.yml b/modules/secrets.yml deleted file mode 100644 index b3d2e72..0000000 --- a/modules/secrets.yml +++ /dev/null @@ -1,17 +0,0 @@ -gitea-sync-token: ENC[AES256_GCM,data:mG2lOIqSBy+3O/P2AGACQOc/QdORHwsnJmGcdKZo6i5Vsqf6lLVdMA==,iv:2FgXjSIuL+UPkWgGx2PXJ/kl2FFCm+1HfgDJVXeT/jU=,tag:sjRK8x1ktkEgls8jk9EeRQ==,type:str] -github-mirror-token: ENC[AES256_GCM,data:VmTpqOCR71napTGTs2aZDDi8BkT/EhPo7jjijCO9/7PozQDnTzvcY95lZsHSUV9d8jERxqYgkNLxcrxJh+auiNnlFnoZUfGWli6IU9GE/CsVC0JlqAIGv5zMa0gz,iv:7RvW3HOsHkVC1oW4RrTNqzGf8IPEjhwH/8VPZTEIICQ=,tag:gcDsLhrn9OKdCwZCHqTZrQ==,type:str] -sops: - age: - - recipient: age1zn3jpeqducllfxlm2l57pq2kqzkg23q8jgu23lyzvfapgnkf8gmqmtchfx - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBIQUkrREw0blJkeExpWVkr - ZndwbG1xSDllODM3OHNMYUFrKy92VzliTWlRCjRIQ1lpejFKM2p0QUU1OGY3T3hu - NkdkTU9tTHJNaUY3OWtCalFYQTFLN2cKLS0tIEZhU0dIenpHTiszUVZGWkIzTkFO - NEZVQ0JJMTMydUZkY3RKekQwbUEyb1EKcOQ15upVDjgGb4CzzGKIjATxCCxJJKzQ - DkkVZBZycAhVl3ChdsmulkserdvnLgwhSfGs82bsXS8lD0hsdqctCA== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-06-05T09:53:12Z" - mac: ENC[AES256_GCM,data:nL72VUNUF7sBWbW64EegrY/Zp+LB2FPYDmWSANv8ShIJMmMY3xypFTtQr082/U2zBivAA+0HoRmUHdlaLv5OF7kVN4xuGq78EzOw55TNAa6yNqlNCbmozQfcOSfkkHsDWCVSBnzzHCmujDzDSseq3hDl4B9PB10WCPhe5+2HQc8=,iv:2zoPZjpLqxBkS4nsg/atFPXQERjk+LHr9MjE3UvcrBo=,tag:kE+9iG5ugefA7VVMbKFhJA==,type:str] - unencrypted_suffix: _unencrypted - version: 3.10.2 diff --git a/modules/timers.nix b/modules/timers.nix new file mode 100644 index 0000000..9c6f4a4 --- /dev/null +++ b/modules/timers.nix @@ -0,0 +1,68 @@ +{ config, pkgs, ... }: { + + systemd.timers."git-auto-sync" = { + wantedBy = [ "timers.target" ]; + timerConfig = { + OnBootSec = "5m"; + OnUnitActiveSec = "5m"; + Unit = "git-auto-sync.service"; + }; + }; + + systemd.services."git-auto-sync" = { + script = "$HOME/scripts/git-auto-sync.sh"; + path = [ + pkgs.git + pkgs.gh + pkgs.keychain + pkgs.openssh + ]; + serviceConfig = { Type = "oneshot"; User = "kyren"; }; + }; + + ########################################################################### + + systemd.timers."k-sleep-tracker" = { + wantedBy = [ "timers.target" ]; + timerConfig = { + OnBootSec = "1m"; + OnUnitActiveSec = "1m"; + Unit = "k-sleep-tracker.service"; + }; + }; + + systemd.services."k-sleep-tracker" = { + script = "$HOME/projects/k/bin/k tracker sleep"; + serviceConfig = { Type = "oneshot"; User = "kyren"; }; + }; + + ########################################################################### + + systemd.timers."git-auto-mirror" = { + wantedBy = [ "timers.target" ]; + timerConfig = { + OnBootSec = "1m"; + OnUnitActiveSec = "5h"; + Unit = "git-auto-mirror.service"; + }; + }; + + sops.secrets.gitea-sync-token = { owner = "kyren"; }; + sops.secrets.github-mirror-token = { owner = "kyren"; }; + systemd.services."git-auto-mirror" = { + script = "python $HOME/scripts/gitea.py"; + path = [ + (pkgs.python312.withPackages (pypkgs: [ + pypkgs.matplotlib + pypkgs.pandas + pypkgs.pygithub + ])) + ]; + environment = { + GITEA_TOKEN_FILE = config.sops.secrets.gitea-sync-token.path; + GITHUB_TOKEN_FILE = config.sops.secrets.github-mirror-token.path; + }; + serviceConfig = { Type = "oneshot"; User = "kyren"; }; + }; + +} -- cgit v1.3.1