diff --git a/flake.lock b/flake.lock index 27349b2..6c28b5e 100644 --- a/flake.lock +++ b/flake.lock @@ -184,6 +184,24 @@ "type": "github" } }, + "flake-utils_3": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -444,7 +462,8 @@ "nixos-generators": "nixos-generators", "nixpkgs": "nixpkgs_2", "nixpkgs-stable": "nixpkgs-stable", - "pre-commit-hooks": "pre-commit-hooks" + "pre-commit-hooks": "pre-commit-hooks", + "yousable": "yousable" } }, "systems": { @@ -477,6 +496,21 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "utils": { "locked": { "lastModified": 1667395993, @@ -491,6 +525,27 @@ "repo": "flake-utils", "type": "github" } + }, + "yousable": { + "inputs": { + "flake-utils": "flake-utils_3", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1689940068, + "narHash": "sha256-GBzYvmmAntjUREwjtbLvubFXpcq49qjcgA+jaXUWc4M=", + "owner": "t184256", + "repo": "yousable", + "rev": "1c984eeba11aa9ccfbb797d53e693ee3c252523d", + "type": "github" + }, + "original": { + "owner": "t184256", + "repo": "yousable", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 29a404c..c8fcbda 100644 --- a/flake.nix +++ b/flake.nix @@ -51,11 +51,16 @@ url = "github:Infinidoge/nix-minecraft"; inputs.nixpkgs.follows = "nixpkgs"; }; + + yousable = { + url = "github:t184256/yousable"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = inputs@{ self, nixpkgs, home-manager, baduhai-nur, kmonad , nixpkgs-stable, deploy-rs, agenix, nixos-generators, homepage, dotfiles - , pre-commit-hooks, nix-minecraft, ... }: { + , pre-commit-hooks, nix-minecraft, yousable, ... }: { nixosConfigurations = { rotterdam = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; @@ -91,6 +96,7 @@ modules = [ ./hosts/servers/alexandria.nix agenix.nixosModules.default + yousable.nixosModules.default self.nixosModules.qbittorrent ({ config, pkgs, ... }: let diff --git a/hosts/servers/alexandria/default.nix b/hosts/servers/alexandria/default.nix index 5ce2d65..808c15e 100644 --- a/hosts/servers/alexandria/default.nix +++ b/hosts/servers/alexandria/default.nix @@ -17,7 +17,6 @@ ./security.nix ./services.nix ./pairdrop.nix - ./podsync.nix ./users.nix ./variables.nix ./vaultwarden.nix diff --git a/hosts/servers/alexandria/podsync.nix b/hosts/servers/alexandria/podsync.nix deleted file mode 100644 index a63d150..0000000 --- a/hosts/servers/alexandria/podsync.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ inputs, config, pkgs, lib, ... }: - -{ - virtualisation.oci-containers.containers."podsync" = { - image = "docker.io/mxpv/podsync:latest"; - environment = { TZ = "America/Bahia"; }; - ports = [ "${config.ports.podsync}:80" ]; - volumes = [ "${config.age.secrets."podsync.toml".path}:/app/config.toml" ]; - extraOptions = [ "--label=io.containers.autoupdate=registry" ]; - }; - - services.nginx.virtualHosts."podsync.baduhai.me" = { - useACMEHost = "baduhai.me"; - forceSSL = true; - kTLS = true; - locations."/".proxyPass = "http://127.0.0.1:${config.ports.podsync}"; - }; - - age.secrets."podsync.toml".file = ../../../secrets/podsync.toml.age; -} diff --git a/hosts/servers/alexandria/variables.nix b/hosts/servers/alexandria/variables.nix index ce509f1..61d0050 100644 --- a/hosts/servers/alexandria/variables.nix +++ b/hosts/servers/alexandria/variables.nix @@ -16,7 +16,6 @@ in { cinny = mkStringOption "8002"; librespeed = mkStringOption "8003"; paperless = mkStringOption "8004"; - podsync = mkStringOption "8005"; cinny2 = mkStringOption "8006"; searx = mkStringOption "8007"; qbittorrent = mkStringOption "8008"; diff --git a/secrets/podsync.toml.age b/secrets/podsync.toml.age deleted file mode 100644 index 2bbce21..0000000 Binary files a/secrets/podsync.toml.age and /dev/null differ diff --git a/secrets/secrets.nix b/secrets/secrets.nix index ee8be97..5faa985 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -23,5 +23,4 @@ in { "nextcloud-adminpass.age".publicKeys = all-hosts; "cloudflare.age".publicKeys = all-hosts; "paperless.age".publicKeys = all-hosts; - "podsync.toml.age".publicKeys = all-hosts; }