From 104d4b6c8d4d12b000b2ef955bbf06dd5f45dd18 Mon Sep 17 00:00:00 2001 From: "Chinmay D. Pai" Date: Mon, 30 Sep 2024 11:14:57 +0530 Subject: [PATCH] chore: move lanzaboote to system module and remove nixpkgs-immich input * lanzaboote is needed to evaluate nix configuration, even if it's not used in the system. * removed nixpkgs-immich since nixpkgs now has immich service Signed-off-by: Chinmay D. Pai --- flake.nix | 3 +-- modules/nixos/services/immich/default.nix | 8 ++------ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/flake.nix b/flake.nix index 62c1040..d5b5705 100644 --- a/flake.nix +++ b/flake.nix @@ -23,11 +23,11 @@ disko.nixosModules.disko srvos.nixosModules.common srvos.nixosModules.mixins-systemd-boot + inputs.lanzaboote.nixosModules.lanzaboote ]; systems.hosts.thonkpad.modules = [ inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x1-12th-gen - inputs.lanzaboote.nixosModules.lanzaboote ]; systems.hosts.thonkpad.specialArgs = { inherit userdata; @@ -101,7 +101,6 @@ nil.inputs.nixpkgs.follows = "nixpkgs"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - nixpkgs-immich.url = "github:nixos/nixpkgs/d026e3fa1ad0d78d9072d9afdeae515d2d68acae"; nixos-hardware.url = "github:nixos/nixos-hardware"; nur.url = "github:nix-community/nur"; diff --git a/modules/nixos/services/immich/default.nix b/modules/nixos/services/immich/default.nix index 09ee28f..66650be 100644 --- a/modules/nixos/services/immich/default.nix +++ b/modules/nixos/services/immich/default.nix @@ -1,13 +1,9 @@ { config, - inputs, lib, + pkgs, ... }: { - imports = [ - "${inputs.nixpkgs-immich}/nixos/modules/services/web-apps/immich.nix" - ]; - options.snowflake.services.immich = { enable = lib.mkEnableOption "Enable immich service"; @@ -24,7 +20,7 @@ lib.mkIf cfg.enable { services.immich = { enable = true; - package = inputs.nixpkgs-immich.legacyPackages.x86_64-linux.immich; + package = pkgs.immich; mediaLocation = "/storage/media/immich-library"; port = 9121; };