diff --git a/nix/hosts/heather/borg.nix b/nix/hosts/heather/borg.nix index 74e24d0..851ecb1 100644 --- a/nix/hosts/heather/borg.nix +++ b/nix/hosts/heather/borg.nix @@ -20,7 +20,6 @@ ${lib.our.pubKeys.fallback}.repos = [ "aria-files" ]; ${lib.our.hostKeys.misc}.repos = [ "synced" - "actual" "immich" "books" "rss" diff --git a/nix/hosts/misc/actual.nix b/nix/hosts/misc/actual.nix deleted file mode 100644 index 96589a2..0000000 --- a/nix/hosts/misc/actual.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - pkgs, - lib, - config, - ... -}: -{ - # Actual budget - services.actual = { - enable = true; - openFirewall = false; - settings = { - hostname = "0.0.0.0"; - port = 3000; - }; - }; - - # Allow traffic from reverse proxy - networking.firewall.extraInputRules = '' - ip6 saddr { fc00:dead:beef::1/128 } tcp dport 3000 accept - ip saddr { 10.0.0.1/32 } tcp dport 3000 accept - ''; - - age.secrets.borg-actual-success-url.file = ../../secrets/borg-actual-success-url.age; - services.borgbackup.jobs.actual = { - archiveBaseName = "actual"; - paths = "/var/lib/private/actual"; - startAt = "*-*-* 03:00:00"; - - prune.keep.monthly = 3; - - repo = "ssh://borg@borg.${lib.our.domains.priv}/./actual"; - environment.BORG_RSH = "ssh -i /etc/ssh/ssh_host_ed25519_key"; - encryption = { - mode = "repokey"; - passCommand = "cat ${config.age.secrets.borg-password.path}"; - }; - compression = "auto,zstd"; - postHook = lib.borgPostHookFor pkgs config.age.secrets.borg-actual-success-url; - }; -} diff --git a/nix/hosts/misc/default.nix b/nix/hosts/misc/default.nix index 1e343b9..c453c0c 100644 --- a/nix/hosts/misc/default.nix +++ b/nix/hosts/misc/default.nix @@ -9,7 +9,6 @@ in { imports = [ (modulesPath + "/virtualisation/lxc-container.nix") - ./actual.nix ./syncthing.nix ./code.nix ./immich.nix diff --git a/nix/modules/default.nix b/nix/modules/default.nix index 88a281f..6cef41b 100644 --- a/nix/modules/default.nix +++ b/nix/modules/default.nix @@ -49,7 +49,6 @@ ./programs/steam.nix ./programs/supersonic.nix ./programs/vesktop.nix - ./services/actual.nix ./services/ariade/default.nix ./services/audio-receiver.nix ./services/authelia.nix diff --git a/nix/modules/services/actual.nix b/nix/modules/services/actual.nix deleted file mode 100644 index 814aa73..0000000 --- a/nix/modules/services/actual.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ config, lib, ... }: -let - inherit (lib) mkIf mapAttrs; - cfg = config.services.actual; -in -mapAttrs (_: mkIf cfg.enable) { - environment.persistence."/persist".directories = mkIf cfg.enable [ - { - directory = "/var/lib/private/actual"; - user = "nobody"; - group = "nogroup"; - mode = "0700"; - } - ]; -} diff --git a/nix/secrets.nix b/nix/secrets.nix index d9f6af9..6c9255e 100644 --- a/nix/secrets.nix +++ b/nix/secrets.nix @@ -43,7 +43,6 @@ in ]; "secrets/cal-bridge.age".publicKeys = misc; - "secrets/borg-actual-success-url.age".publicKeys = misc; "secrets/borg-code-success-url.age".publicKeys = code; "secrets/borg-pds-success-url.age".publicKeys = code; "secrets/borg-immich-success-url.age".publicKeys = misc; diff --git a/nix/secrets/borg-actual-success-url.age b/nix/secrets/borg-actual-success-url.age deleted file mode 100644 index a280b36..0000000 --- a/nix/secrets/borg-actual-success-url.age +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDJrcFZUUSBnRkt0 -N2lKUm1TcUFvMDkvZGxhS3p6QXJXQ3hsd01FbWZybDhSVGd0aFhZCmFacDRjUUpM -bHhVdEgybW5STE5nd2hWeDN2S2ZPYVgxNHJuOHluc1JiUEUKLT4gcGl2LXAyNTYg -QUs0dzNnIEF2SndEOFExeXpKdHh3N0hGTXZ5aGVMRkpnLzJxRmJkRU9oR2k4Vjhu -OGgvCkNHSkt1Wm00ZEtJRmhmYnhhSnBZemhEczhJMjNXNGw5NzVnSjlBRysrZ2MK -LT4gcGl2LXAyNTYgWkdFNFdRIEE4WHFBMmVoMjhxTXdvaTJZZGJxNjR4Z1JuUWZF -ZmtBdXdRb3h1Tk1tWG80CkJuMHc1NExjSlVtcmlHeWJOYWdYcThwbVBPSXJYelY5 -NEVzYW1JRWVpam8KLT4galFsZiwtZ3JlYXNlIDghQWUyY0cgNytyIH00SCBjW1o8 -MCZiCnd4MmNNSXFnajVEejEvT201UzNINVBnUjNnNklwcTNROS9FYjFSUmx5U1ZE -WDE1Z2pDb1diTGhRQytrYnpQWjEKa25WclpudWF3RHcwUW5oRlNCRlpXa09KYmY1 -V21kMkdXN1EwaW16UWRDR2puU28KLS0tIGcybEx0dGRHWVRqMm5NeWUvbkFUbnFv -eks4bVlOaFEzZGVhQUtyektibGsKqbG11V77C3SDUkzlQyi6efFHKdHslV8w/GcW -9wF7sGUBsIgmXHdW2aYPV8iffmtciH2o8KUS91PPm2/QBoRk0autNYu4Yb54bXsv -WEcBpAwhgFjCSQSqYzBmo7JiJl+yJ0QpdLc7 ------END AGE ENCRYPTED FILE-----