diff --git a/flake.nix b/flake.nix index d276da8..d51d22c 100755 --- a/flake.nix +++ b/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); } - diff --git a/homeConfigurations/default.nix b/homeConfigurations/default.nix new file mode 100755 index 0000000..509f390 --- /dev/null +++ b/homeConfigurations/default.nix @@ -0,0 +1,6 @@ +{ ... }@flakeContext: +{ + homeConfigurations = { + default = import ./home.nix flakeContext; + }; +} diff --git a/home/default.nix b/homeConfigurations/home.nix similarity index 100% rename from home/default.nix rename to homeConfigurations/home.nix diff --git a/home/minimal.nix b/homeConfigurations/minimal.nix similarity index 100% rename from home/minimal.nix rename to homeConfigurations/minimal.nix diff --git a/home/modules/dconf.nix b/homeConfigurations/modules/dconf.nix similarity index 100% rename from home/modules/dconf.nix rename to homeConfigurations/modules/dconf.nix diff --git a/home/modules/packages.nix b/homeConfigurations/modules/packages.nix similarity index 100% rename from home/modules/packages.nix rename to homeConfigurations/modules/packages.nix diff --git a/home/modules/plasma-manager.nix b/homeConfigurations/modules/plasma-manager.nix similarity index 100% rename from home/modules/plasma-manager.nix rename to homeConfigurations/modules/plasma-manager.nix diff --git a/home/primary.nix b/homeConfigurations/primary.nix similarity index 100% rename from home/primary.nix rename to homeConfigurations/primary.nix diff --git a/home/server.nix b/homeConfigurations/server.nix similarity index 100% rename from home/server.nix rename to homeConfigurations/server.nix diff --git a/home/vds.nix b/homeConfigurations/vds.nix similarity index 100% rename from home/vds.nix rename to homeConfigurations/vds.nix diff --git a/home/wsl-apps/default.nix b/homeConfigurations/wsl-apps/default.nix similarity index 100% rename from home/wsl-apps/default.nix rename to homeConfigurations/wsl-apps/default.nix diff --git a/home/wsl-apps/gramps.nix b/homeConfigurations/wsl-apps/gramps.nix similarity index 100% rename from home/wsl-apps/gramps.nix rename to homeConfigurations/wsl-apps/gramps.nix diff --git a/home/wsl.nix b/homeConfigurations/wsl.nix similarity index 100% rename from home/wsl.nix rename to homeConfigurations/wsl.nix diff --git a/nixosConfigurations/default.nix b/nixosConfigurations/default.nix index c2c1bb3..5fd4afe 100755 --- a/nixosConfigurations/default.nix +++ b/nixosConfigurations/default.nix @@ -1,4 +1,4 @@ -{...}@flakeContext: +{ ... }@flakeContext: { nixosConfigurations = { atoridu = import ./hosts/mini-pc.nix flakeContext; # atoridu diff --git a/pkgs/default.nix b/pkgs/default.nix index b0f1f71..a8cb11a 100755 --- a/pkgs/default.nix +++ b/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 {}; + }; } diff --git a/pkgs/immich/default.nix b/pkgs/immich/default.nix deleted file mode 100644 index 03f3ef4..0000000 --- a/pkgs/immich/default.nix +++ /dev/null @@ -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; - # }; - }; -}