From 09ce473994ae79d4cfb7850b7cd1704922ca0bd5 Mon Sep 17 00:00:00 2001 From: oqyude Date: Thu, 7 Aug 2025 01:06:05 +0300 Subject: [PATCH] 123 --- flake.nix | 22 +++++----------------- pkgs/default.nix | 11 +++++++++++ 2 files changed, 16 insertions(+), 17 deletions(-) create mode 100755 pkgs/default.nix diff --git a/flake.nix b/flake.nix index 4143802..d276da8 100755 --- a/flake.nix +++ b/flake.nix @@ -92,21 +92,11 @@ inputs: let flakeContext = { inherit inputs; }; - system = "x86_64-linux"; # Замени, если нужно - pkgs = import inputs.nixpkgs { inherit system; }; - immich-s = import ./pkgs/immich/default.nix { inherit pkgs; }; + # system = "x86_64-linux"; # Замени, если нужно + # pkgs = import inputs.nixpkgs { inherit system; }; + # immich-s = import ./pkgs/immich/default.nix { inherit pkgs; }; in { - - #(import ./flake-part1.nix { inherit nixpkgs home-manager; system = "x86_64-linux"; }) - # (import ./flake-part1.nix flakeContext) - # nixosConfigurations = { - # atoridu = import ./devices/mini-pc.nix flakeContext; # atoridu - # lamet = import ./devices/mini-laptop.nix flakeContext; # lamet - # otreca = import ./devices/vds.nix flakeContext; # vds - # sapphira = import ./devices/server.nix flakeContext; # sapphira - # wsl = import ./devices/wsl.nix flakeContext; # wsl - # }; nixosModules = { default = import ./modules/default.nix flakeContext; desktop = import ./modules/desktop/default.nix flakeContext; @@ -148,9 +138,7 @@ }; # homeModules = { # }; - packages."x86_64-linux" = { - immich = immich-s.package; - }; - } // (import ./nixosConfigurations flakeContext); + } // (import ./nixosConfigurations flakeContext) + // (import ./pkgs flakeContext); } diff --git a/pkgs/default.nix b/pkgs/default.nix new file mode 100755 index 0000000..b0f1f71 --- /dev/null +++ b/pkgs/default.nix @@ -0,0 +1,11 @@ +{ inputs, ...}@flakeContext: +let + system = "x86_64-linux"; # Замени, если нужно + pkgs = import inputs.nixpkgs { inherit system; }; + immich-s = import ./pkgs/immich/default.nix { inherit pkgs; }; +in +{ + packages."x86_64-linux" = { + immich = immich-s.package; + }; +}