diff --git a/common/users/meyer-server/default.nix b/common/users/meyer-server/default.nix index cc3b2eb..419ed63 100644 --- a/common/users/meyer-server/default.nix +++ b/common/users/meyer-server/default.nix @@ -9,12 +9,18 @@ let NAME = "meyer"; in { - imports = [ - (import ../../systemModules/sops.nix { inherit NAME; }) - (import ../../systemModules/networkManager.nix { inherit NAME; }) - (import ../../systemModules/docker.nix { inherit NAME; }) - (import ../../systemModules/nixHelper.nix { inherit NAME; }) - ]; + imports = + [ ] + ++ [ + (import ../../systemModules/sops.nix { inherit NAME; }) + (import ../../systemModules/networkManager.nix { inherit NAME; }) + (import ../../systemModules/docker.nix { inherit NAME; }) + (import ../../systemModules/nixHelper.nix { inherit NAME; }) + ] + ++ [ + import + ../docker/vw/nginx.nix + ]; users = { users = { "${NAME}" = { @@ -37,7 +43,14 @@ in inherit inputs stable unstable; }; users = { - "${NAME}" = import ./home.nix; + "${NAME}" = + { ... }: + { + imports = [ + ../docker/vw + ./home.nix + ]; + }; }; }; } diff --git a/common/users/meyer/default.nix b/common/users/meyer/default.nix index 114a27b..9c4a618 100644 --- a/common/users/meyer/default.nix +++ b/common/users/meyer/default.nix @@ -18,8 +18,6 @@ in (import ../../systemModules/nixHelper.nix { inherit NAME; }) (import ../../programs/wireshark.nix { inherit NAME; }) (import ../../programs/kanata.nix { inherit NAME; }) - ] ++ [ - (builtins.trace "importing nginx.nix" import ../docker/vw/nginx.nix) ]; users = { users = { @@ -41,14 +39,7 @@ in home-manager = { extraSpecialArgs = { inherit inputs stable unstable; }; users = { - "${NAME}" = - { ... }: - { - imports = [ - ../docker/vw - ./home.nix - ]; - }; + "${NAME}" = import ./home.nix; }; }; }