IT WAS THE WRONG FILE THIS WHOLE TIME[13;2u

This commit is contained in:
sadan 2025-02-24 00:29:32 -05:00
parent dfac3cc6ca
commit 2be375c6ea
No known key found for this signature in database
2 changed files with 21 additions and 17 deletions

View file

@ -9,12 +9,18 @@ let
NAME = "meyer"; NAME = "meyer";
in in
{ {
imports = [ imports =
(import ../../systemModules/sops.nix { inherit NAME; }) [ ]
(import ../../systemModules/networkManager.nix { inherit NAME; }) ++ [
(import ../../systemModules/docker.nix { inherit NAME; }) (import ../../systemModules/sops.nix { inherit NAME; })
(import ../../systemModules/nixHelper.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 = {
users = { users = {
"${NAME}" = { "${NAME}" = {
@ -37,7 +43,14 @@ in
inherit inputs stable unstable; inherit inputs stable unstable;
}; };
users = { users = {
"${NAME}" = import ./home.nix; "${NAME}" =
{ ... }:
{
imports = [
../docker/vw
./home.nix
];
};
}; };
}; };
} }

View file

@ -18,8 +18,6 @@ in
(import ../../systemModules/nixHelper.nix { inherit NAME; }) (import ../../systemModules/nixHelper.nix { inherit NAME; })
(import ../../programs/wireshark.nix { inherit NAME; }) (import ../../programs/wireshark.nix { inherit NAME; })
(import ../../programs/kanata.nix { inherit NAME; }) (import ../../programs/kanata.nix { inherit NAME; })
] ++ [
(builtins.trace "importing nginx.nix" import ../docker/vw/nginx.nix)
]; ];
users = { users = {
users = { users = {
@ -41,14 +39,7 @@ in
home-manager = { home-manager = {
extraSpecialArgs = { inherit inputs stable unstable; }; extraSpecialArgs = { inherit inputs stable unstable; };
users = { users = {
"${NAME}" = "${NAME}" = import ./home.nix;
{ ... }:
{
imports = [
../docker/vw
./home.nix
];
};
}; };
}; };
} }