diff --git a/flake.lock b/flake.lock index fda8d66..1146fd7 100644 --- a/flake.lock +++ b/flake.lock @@ -581,19 +581,6 @@ "type": "github" } }, - "museum": { - "flake": false, - "locked": { - "lastModified": 1741202763, - "narHash": "sha256-fCORHMKFJUT+FHfBffOFSLTz0DTsNOjqyw85v4xDgnE=", - "type": "tarball", - "url": "https://gist.github.com/daedric/336c11e809868dbef559f63eb6566d20/archive/ca063cd48cf055869524d982305f30926e19684f.zip" - }, - "original": { - "type": "tarball", - "url": "https://gist.github.com/daedric/336c11e809868dbef559f63eb6566d20/archive/ca063cd48cf055869524d982305f30926e19684f.zip" - } - }, "nix": { "inputs": { "lowdown-src": "lowdown-src", @@ -919,7 +906,6 @@ "cassowary": "cassowary", "home-manager": "home-manager", "mms": "mms", - "museum": "museum", "nix-doom-emacs-unstraightened": "nix-doom-emacs-unstraightened", "nixos-06cb-009a-fingerprint-sensor": "nixos-06cb-009a-fingerprint-sensor", "nixpkgs": "nixpkgs_4", diff --git a/flake.nix b/flake.nix index 2502805..0133903 100644 --- a/flake.nix +++ b/flake.nix @@ -47,11 +47,6 @@ }; mms.url = "github:mkaito/nixos-modded-minecraft-servers"; - - museum = { - url = "https://gist.github.com/daedric/336c11e809868dbef559f63eb6566d20/archive/ca063cd48cf055869524d982305f30926e19684f.zip"; - flake = false; - }; }; outputs = { nixpkgs, @@ -66,7 +61,6 @@ nixos-06cb-009a-fingerprint-sensor, cassowary, mms, - museum, ... }: let system = "x86_64-linux"; @@ -84,7 +78,6 @@ inherit system; modules = [ ./void.nix - "${museum}/museum.nix" home-manager.nixosModules.home-manager { diff --git a/void.nix b/void.nix index e0bf55f..843290e 100644 --- a/void.nix +++ b/void.nix @@ -4,7 +4,6 @@ { config, pkgs, - pkgs-unstable, lib, mms, ... @@ -254,36 +253,6 @@ ''; users.users.immich.extraGroups = ["video" "render"]; - # ente photos - services.museum = { - enable = true; - package = pkgs-unstable.museum; - hostName = "ente.005540.xyz"; - enteHostName = "ente.005540.xyz"; - credentials = "/etc/nixos/secrets/ente/museum.yaml"; - config = { - webauthn = { - rpid = "ente.005540.xyz"; - rporigins = ["http://localhost:3001"]; - }; - internal = { - admins = ["1580559962386438"]; - }; - s2 = { - b2-eu-cen = { - endpoint = "localhost"; - region = "eu-central-2"; - bucket = "museum"; - }; - }; - }; - }; - services.minio = { - enable = true; - dataDir = ["/pile/Photos/ente/minio"]; - region = "eu-central-2"; - }; - # reverse proxy services.nginx = { enable = true; @@ -317,9 +286,6 @@ send_timeout 600s; ''; }; - "ente.005540.xyz" = { - root = pkgs-unstable.ente-web; - }; }; }; }