From 0938c2fc886587f3f1f071316ac80e4f9423d5eb Mon Sep 17 00:00:00 2001 From: noe Date: Sat, 30 Mar 2024 01:04:01 -0400 Subject: [PATCH] pdr: attempt withdrawal --- flake.lock | 24 +++++++++++++++++++ flake.nix | 5 ++++ nixos/hosts/porcelain-doll-repair/default.nix | 3 +-- 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/flake.lock b/flake.lock index 97013e3..4fcbe6c 100644 --- a/flake.lock +++ b/flake.lock @@ -322,6 +322,29 @@ "url": "https://iceshrimp.dev/iceshrimp/packaging" } }, + "iceshrimp-withdrawal": { + "inputs": { + "iceshrimp": [ + "iceshrimp" + ], + "nixpkgs": [ + "nixpkgs-unstable" + ] + }, + "locked": { + "lastModified": 1711774883, + "narHash": "sha256-AyzeCcMCX5hxixvo2uTQkZ8hRGMi/m+3wQPknhaVzeU=", + "ref": "refs/heads/main", + "rev": "0539d4394620fb6016ca21423390b3012f553f2d", + "revCount": 37, + "type": "git", + "url": "https://iceshrimp.dev/noe/withdrawal" + }, + "original": { + "type": "git", + "url": "https://iceshrimp.dev/noe/withdrawal" + } + }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -625,6 +648,7 @@ "doll-repair": "doll-repair", "home-manager": "home-manager", "iceshrimp": "iceshrimp", + "iceshrimp-withdrawal": "iceshrimp-withdrawal", "nixos-generators": "nixos-generators", "nixpkgs": "nixpkgs_3", "nixpkgs-stable": "nixpkgs-stable", diff --git a/flake.nix b/flake.nix index 315185a..9fbfbb3 100644 --- a/flake.nix +++ b/flake.nix @@ -39,6 +39,11 @@ url = "git+https://iceshrimp.dev/iceshrimp/packaging"; inputs.nixpkgs.follows = "nixpkgs-unstable"; }; + iceshrimp-withdrawal = { + url = "git+https://iceshrimp.dev/noe/withdrawal"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; + inputs.iceshrimp.follows = "iceshrimp"; + }; # Self noe-sh = { diff --git a/nixos/hosts/porcelain-doll-repair/default.nix b/nixos/hosts/porcelain-doll-repair/default.nix index 2ccd39d..6234efd 100644 --- a/nixos/hosts/porcelain-doll-repair/default.nix +++ b/nixos/hosts/porcelain-doll-repair/default.nix @@ -2,8 +2,6 @@ imports = [ ../../templates/proxmox-lxc.nix ../../server.nix - #../../features/dns-cache.nix - #../../features/telemetry inputs.iceshrimp.nixosModules.iceshrimp {} ]; @@ -31,6 +29,7 @@ services.iceshrimp = { enable = true; + package = inputs.iceshrimp-withdrawal.packages.${pkgs.system}.iceshrimp.withdrawal; settings.url = "https://porcelain.doll.repair"; dbPasswordFile = config.sops.secrets.db_password.path; createDb = true;