From f33bb778bea5e4f1a1697cacaa06f7e9df2ad9f5 Mon Sep 17 00:00:00 2001
From: oqyude <oqyude@gmail.com>
Date: Wed, 6 Aug 2025 19:55:24 +0300
Subject: [PATCH] 123

---
 flake.nix                                  |  4 ++++
 modules/default.nix                        |  2 ++
 modules/server/immich.nix                  |  3 ++-
 overlays/immich/default.nix                |  5 -----
 packages/immich/default.nix                | 19 +++++++++++++++++++
 {overlays => packages}/immich/package.nix  |  0
 {overlays => packages}/immich/sources.json |  0
 {overlays => packages}/immich/update.sh    |  0
 8 files changed, 27 insertions(+), 6 deletions(-)
 delete mode 100644 overlays/immich/default.nix
 create mode 100644 packages/immich/default.nix
 rename {overlays => packages}/immich/package.nix (100%)
 rename {overlays => packages}/immich/sources.json (100%)
 rename {overlays => packages}/immich/update.sh (100%)

diff --git a/flake.nix b/flake.nix
index dba9151..6139ac7 100755
--- a/flake.nix
+++ b/flake.nix
@@ -92,6 +92,7 @@
     inputs:
     let
       flakeContext = { inherit inputs; };
+      immich = import ./pkgs/immich; #{ inherit pkgs; };
     in
     {
       nixosConfigurations = {
@@ -142,5 +143,8 @@
       };
       # homeModules = {
       # };
+     packages."x86_64-linux" = {
+        immich = immich.package;
+      };
     };
 }
diff --git a/modules/default.nix b/modules/default.nix
index 3be8a0b..621686b 100755
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -10,6 +10,7 @@
     ./server
     ./users.nix
     ./options.nix
+    #./overlays.nix
     ./temp.nix
     #(lib.mkIf (config.xlib.device.type == "server") (import ./server { inherit inputs config lib pkgs ; }))
 
@@ -17,4 +18,5 @@
     nix-index-database.nixosModules.nix-index # nix-index module
   ];
   _module.args.inputs = inputs;
+  services.immich.package = lib.mkIf (config.xlib.device.type == "server") inputs.self.packages.x86_64-linux.immich;
 }
diff --git a/modules/server/immich.nix b/modules/server/immich.nix
index 7e720bc..4a74bf3 100755
--- a/modules/server/immich.nix
+++ b/modules/server/immich.nix
@@ -3,12 +3,13 @@
   config,
   lib,
   pkgs,
+  #pkgs-src,
   ...
 }:
 {
   services = {
     immich = {
-      #package = latest.immich;
+      #package = pkgs-src.immich;
       enable = true;
       port = 2283;
       host = "0.0.0.0";
diff --git a/overlays/immich/default.nix b/overlays/immich/default.nix
deleted file mode 100644
index 0fcb48f..0000000
--- a/overlays/immich/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-self: super: {
-  pkgs-src = {
-    immich = super.callPackage ./package.nix { };
-  };
-}
diff --git a/packages/immich/default.nix b/packages/immich/default.nix
new file mode 100644
index 0000000..f813c90
--- /dev/null
+++ b/packages/immich/default.nix
@@ -0,0 +1,19 @@
+# self: super: {
+#   pkgs-src = {
+#     immich = super.callPackage ./package.nix { };
+#   };
+# }
+
+{ pkgs }:
+let
+  sources = pkgs.lib.importJSON ./sources.json;
+in {
+  package = pkgs.callPackage ./package.nix {
+    # src = pkgs.fetchFromGitHub {
+    #   owner = "immich-app";
+    #   repo = "immich";
+    #   rev = "v${sources.version}";
+    #   hash = sources.hash;
+    # };
+  };
+}
\ No newline at end of file
diff --git a/overlays/immich/package.nix b/packages/immich/package.nix
similarity index 100%
rename from overlays/immich/package.nix
rename to packages/immich/package.nix
diff --git a/overlays/immich/sources.json b/packages/immich/sources.json
similarity index 100%
rename from overlays/immich/sources.json
rename to packages/immich/sources.json
diff --git a/overlays/immich/update.sh b/packages/immich/update.sh
similarity index 100%
rename from overlays/immich/update.sh
rename to packages/immich/update.sh