mirror of
https://github.com/sadan4/dotfiles.git
synced 2025-02-26 18:18:50 -05:00
IT WAS THE WRONG FILE THIS WHOLE TIME[13;2u
This commit is contained in:
parent
dfac3cc6ca
commit
2be375c6ea
2 changed files with 21 additions and 17 deletions
|
@ -9,11 +9,17 @@ let
|
||||||
NAME = "meyer";
|
NAME = "meyer";
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
imports = [
|
imports =
|
||||||
|
[ ]
|
||||||
|
++ [
|
||||||
(import ../../systemModules/sops.nix { inherit NAME; })
|
(import ../../systemModules/sops.nix { inherit NAME; })
|
||||||
(import ../../systemModules/networkManager.nix { inherit NAME; })
|
(import ../../systemModules/networkManager.nix { inherit NAME; })
|
||||||
(import ../../systemModules/docker.nix { inherit NAME; })
|
(import ../../systemModules/docker.nix { inherit NAME; })
|
||||||
(import ../../systemModules/nixHelper.nix { inherit NAME; })
|
(import ../../systemModules/nixHelper.nix { inherit NAME; })
|
||||||
|
]
|
||||||
|
++ [
|
||||||
|
import
|
||||||
|
../docker/vw/nginx.nix
|
||||||
];
|
];
|
||||||
users = {
|
users = {
|
||||||
users = {
|
users = {
|
||||||
|
@ -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
|
||||||
|
];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -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
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue