From fb0205b43d3a7cc5ffcbed03fd39ca03fc21c998 Mon Sep 17 00:00:00 2001 From: TheWanderingCrow Date: Mon, 24 Nov 2025 10:10:06 -0500 Subject: [PATCH] remove the-nest --- flake.lock | 76 ++------------------------- flake.nix | 1 - hosts/nixos/HandlerOne/backup.nix | 1 + hosts/nixos/HandlerOne/default.nix | 1 - modules/services/mealie/default.nix | 10 ++-- modules/services/the-nest/default.nix | 14 ----- 6 files changed, 12 insertions(+), 91 deletions(-) delete mode 100644 modules/services/the-nest/default.nix diff --git a/flake.lock b/flake.lock index bfb7a98..1e83a2b 100644 --- a/flake.lock +++ b/flake.lock @@ -58,24 +58,6 @@ "type": "github" } }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1738453229, - "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -262,11 +244,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1763736959, - "narHash": "sha256-yxUn0ZNrYCP8/Q7U9jl6uRDRFt/dEvvWHHw4fvo9qsk=", + "lastModified": 1763998918, + "narHash": "sha256-Vdg2RCNaAaywYFqPMYACHLnI80xCWkVFzg0SPr2Ud18=", "ref": "refs/heads/master", - "rev": "5359b0ad75d044b1bbef5de118e57de54e731e2e", - "revCount": 154, + "rev": "f8625c1ebf9a1a300a976297ff51c776b52896af", + "revCount": 155, "type": "git", "url": "ssh://git@github.com/TheWanderingCrow/nix-secrets" }, @@ -307,18 +289,6 @@ "type": "github" } }, - "nixpkgs-lib": { - "locked": { - "lastModified": 1738452942, - "narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz" - } - }, "nixpkgs-stable": { "locked": { "lastModified": 1763334038, @@ -461,22 +431,6 @@ "type": "github" } }, - "nixpkgs_8": { - "locked": { - "lastModified": 1739214665, - "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nvf": { "inputs": { "flake-compat": "flake-compat", @@ -533,8 +487,7 @@ "nixpkgs-stable": "nixpkgs-stable_2", "nixpkgs-unstable": "nixpkgs-unstable", "nvix": "nvix", - "sops-nix": "sops-nix", - "the-nest": "the-nest" + "sops-nix": "sops-nix" } }, "rust-overlay": { @@ -605,25 +558,6 @@ "type": "github" } }, - "the-nest": { - "inputs": { - "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_8" - }, - "locked": { - "lastModified": 1745340936, - "narHash": "sha256-zBUwIWHbm0rYREb8014yU4uL8yJiwJ6nkEVOnMrkbOs=", - "owner": "TheWanderingCrow", - "repo": "the-nest", - "rev": "b30f2ab3a461f85f6edca8405b6bcc9f6d178c7d", - "type": "github" - }, - "original": { - "owner": "TheWanderingCrow", - "repo": "the-nest", - "type": "github" - } - }, "xwayland-satellite-stable": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 0af71ff..e9404c9 100644 --- a/flake.nix +++ b/flake.nix @@ -120,6 +120,5 @@ # CrOS inputs nix-secrets.url = "git+ssh://git@github.com/TheWanderingCrow/nix-secrets"; nvix.url = "github:TheWanderingCrow/nvix"; - the-nest.url = "github:TheWanderingCrow/the-nest"; }; } diff --git a/hosts/nixos/HandlerOne/backup.nix b/hosts/nixos/HandlerOne/backup.nix index 8122dec..f178b66 100644 --- a/hosts/nixos/HandlerOne/backup.nix +++ b/hosts/nixos/HandlerOne/backup.nix @@ -12,6 +12,7 @@ let # homebox.nix "/var/lib/homebox/data" "/var/lib/forgejo" + "/var/lib/mealie" # lubelogger.nix "${volumePath}/lubelogger" diff --git a/hosts/nixos/HandlerOne/default.nix b/hosts/nixos/HandlerOne/default.nix index a5bd41f..7c808c6 100644 --- a/hosts/nixos/HandlerOne/default.nix +++ b/hosts/nixos/HandlerOne/default.nix @@ -41,7 +41,6 @@ "hosts/common/optional/podman.nix" # Hosted services - "modules/services/the-nest" "modules/services/mealie" "modules/services/actualbudget" "modules/services/frigate" diff --git a/modules/services/mealie/default.nix b/modules/services/mealie/default.nix index e82655c..408c82f 100644 --- a/modules/services/mealie/default.nix +++ b/modules/services/mealie/default.nix @@ -28,14 +28,16 @@ in ''; services.mealie = { enable = true; + package = pkgs.unstable.mealie; settings = { BASE_URL = "https://mealie.wanderingcrow.net"; - ALLOW_SIGNUP = false; - ALLOW_PASSWORD_LOGIN = false; + ALLOW_SIGNUP = "false"; + ALLOW_PASSWORD_LOGIN = "false"; DB_ENGINE = "sqlite"; - OIDC_AUTH_ENABLED = true; - OIDC_SIGNUP_ENABLED = true; + OIDC_AUTH_ENABLED = "true"; + OIDC_SIGNUP_ENABLED = "true"; OIDC_PROVIDER_NAME = "Pocket ID"; }; + credentialsFile = config.sops.templates."mealie-env".path; }; } diff --git a/modules/services/the-nest/default.nix b/modules/services/the-nest/default.nix deleted file mode 100644 index d1088b5..0000000 --- a/modules/services/the-nest/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - lib, - config, - inputs, - ... -}: { - services.caddy = { - enable = true; - virtualHosts."wanderingcrow.net".extraConfig = '' - root ${inputs.the-nest.outputs.packages.x86_64-linux.default} - file_server - ''; - }; -}