123

flake.nix

@@ -92,9 +92,6 @@
     inputs:
     let
       flakeContext = { inherit inputs; };
-      # system = "x86_64-linux"; # Замени, если нужно
-      # pkgs = import inputs.nixpkgs { inherit system; };
-      # immich-s = import ./pkgs/immich/default.nix { inherit pkgs; };
     in
     {
       nixosModules = {
@@ -133,12 +130,8 @@
           xray = import ./modules/vds/xray.nix flakeContext;
         };
       };
-      homeConfigurations = {
-        default = import ./home/default.nix flakeContext;
-      };
-      # homeModules = {
-      # };
-    } // (import ./nixosConfigurations flakeContext)
-     // (import ./pkgs flakeContext);
+    }
+    // (import ./homeConfigurations flakeContext)
+    // (import ./nixosConfigurations flakeContext)
+    // (import ./pkgs flakeContext);
 }
-

homeConfigurations/default.nix

@@ -0,0 +1,6 @@
+{ ... }@flakeContext:
+{
+  homeConfigurations = {
+    default = import ./home.nix flakeContext;
+  };
+}

nixosConfigurations/default.nix

@@ -1,4 +1,4 @@
-{...}@flakeContext:
+{ ... }@flakeContext:
 {
   nixosConfigurations = {
     atoridu = import ./hosts/mini-pc.nix flakeContext; # atoridu

pkgs/default.nix

@@ -1,11 +1,9 @@
-{ inputs, ...}@flakeContext:
+{ inputs, ... }@flakeContext:
 let
-  system = "x86_64-linux"; # Замени, если нужно
-  pkgs = import inputs.nixpkgs { inherit system; };
-  immich-s = import ./pkgs/immich/default.nix { inherit pkgs; };
+  pkgs = import inputs.nixpkgs { system = "x86_64-linux"; };
 in
 {
-      packages."x86_64-linux" = {
-        immich = immich-s.package;
-      };
+  packages."x86_64-linux" = {
+    immich = pkgs.callPackage ./immich/package.nix {};
+  };
 }

pkgs/immich/default.nix

@@ -1,20 +0,0 @@
-# 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;
-    # };
-  };
-}