From 72a226ea33bdaee29ebaceb65233f4b7e986e50c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Thu, 5 May 2022 17:49:25 +0200 Subject: [PATCH] chore: remove photoprism (for now) --- flake.nix | 16 +--------------- rpi4.nix | 1 - services/photoprism.nix | 24 ------------------------ 3 files changed, 1 insertion(+), 40 deletions(-) delete mode 100644 services/photoprism.nix diff --git a/flake.nix b/flake.nix index 0c91c13..9eb99cf 100644 --- a/flake.nix +++ b/flake.nix @@ -12,13 +12,6 @@ inputs.nur.url = "github:nix-community/NUR/master"; - # TODO this looks preferable: https://github.com/NixOS/nixpkgs/issues/96043#issuecomment-1030936467 - # inputs.photoprism2nix = { - # url = "github:GTrunSec/photoprism2nix"; - # inputs.nixpkgs.follows = "nixpkgs"; - # inputs.flake-utils.follows = "flake-utils"; - # }; - inputs.pre-commit-hooks = { url = "github:cachix/pre-commit-hooks.nix"; inputs.nixpkgs.follows = "nixpkgs"; @@ -52,11 +45,6 @@ deconz = self: super: { deconz = self.qt5.callPackage ./pkgs/deconz { }; }; - # custom overlay so it's using the flake's nixpkgs - photoprism = self: super: - { - # photoprism = photoprism2nix.defaultPackage.${self.system}; - }; }; nixosModules = { flakeDefaults = import ./modules/flakeDefaults.nix; @@ -65,8 +53,7 @@ homeManagerModules = { git = import ./home/modules/git.nix; }; systemDefaults = { modules = [ nixosModules.flakeDefaults ]; - overlays = - [ nur.overlay overlays.neovim overlays.deconz overlays.photoprism ]; + overlays = [ nur.overlay overlays.neovim overlays.deconz ]; }; lib = rec { createSystem = hostName: @@ -131,7 +118,6 @@ modules = [ nixpkgs.nixosModules.notDetected nixos-hardware.nixosModules.raspberry-pi-4 - # photoprism2nix.nixosModules.photoprism (lib.createSystem "felix-rpi4" { hardwareConfig = ./hardware/rpi4.nix; config = ./rpi4.nix; diff --git a/rpi4.nix b/rpi4.nix index ebd71b4..a2480dc 100644 --- a/rpi4.nix +++ b/rpi4.nix @@ -24,7 +24,6 @@ in with builtins; { # ./services/kodi.nix ./services/jellyfin.nix ./services/etebase.nix - # ./services/photoprism.nix # TODO not working on aarch64 due to tensorflow ./services/mosquitto.nix ./services/home-assistant.nix ./services/owntracks.nix diff --git a/services/photoprism.nix b/services/photoprism.nix deleted file mode 100644 index 600be0b..0000000 --- a/services/photoprism.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ pkgs, config, ... }: - -{ - environment.systemPackages = [ pkgs.photoprism ]; - - services.nginx = { - enable = true; - virtualHosts."photos.felschr.com" = { - enableACME = true; - forceSSL = true; - locations."/" = { - proxyPass = - "http://localhost:${toString config.services.photoprism.port}"; - proxyWebsockets = true; - extraConfig = '' - client_max_body_size 100M; - proxy_read_timeout 300s; - ''; - }; - }; - }; - - services.photoprism.enable = true; -}