diff --git a/flake.nix b/flake.nix index a358ffb..6eca491 100644 --- a/flake.nix +++ b/flake.nix @@ -28,13 +28,16 @@ my-overlay = self: super: { scripts = (super.buildEnv { name = "scripts"; paths = [ ./. ]; }); }; - home = import ./home/default.nix - { - inherit system nixpkgs my-overlay home-manager ide; - modules = import ./modules { - inherit system nixpkgs ide my-overlay; - }; - }; + pkgs = import nixpkgs { + inherit system; + overlays = [ my-overlay ]; + }; + modules = import ./modules { + inherit system pkgs ide my-overlay; + }; + home = import ./home { + inherit system pkgs modules home-manager; + }; in { nixosConfigurations = { diff --git a/home/default.nix b/home/default.nix index 5c424bc..52dd0f6 100644 --- a/home/default.nix +++ b/home/default.nix @@ -1,23 +1,18 @@ -{ system, nixpkgs, my-overlay, home-manager, modules, ... }: { +{ system, pkgs, home-manager, modules, ... }: { ivand = home-manager.lib.homeManagerConfiguration { + inherit pkgs; modules = [ ./ivand modules.programs modules.packages modules.nvim ]; - pkgs = import nixpkgs { - inherit system; - overlays = [ my-overlay ]; - }; }; vid = home-manager.lib.homeManagerConfiguration { + inherit pkgs; modules = [ ./home/vid modules.programs ]; - pkgs = import nixpkgs { - inherit system; - }; }; } diff --git a/modules/default.nix b/modules/default.nix index 9b6e340..0ba3bd0 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -1,7 +1,4 @@ -{ system, nixpkgs, ide, my-overlay, ... }: -let - pkgs = import nixpkgs { inherit system; overlays = [ my-overlay ]; }; -in +{ system, pkgs, ide, my-overlay, ... }: { gaming = import ./gaming { }; dnscrypt = import ./dnscrypt { };