john/jsl-home
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

using mkMerge now

Browse Source
This commit is contained in:
John Lancaster
2025-07-06 23:54:22 -05:00
parent cc21dcdc92
commit 92067f8b69
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
flake.nix
View File

@@ -56,14 +56,17 @@
inputs.home-manager.nixosModules.default inputs.home-manager.nixosModules.default
]; ];
nix.settings.trusted-users = [ "root" "@wheel" ]; nix.settings.trusted-users = [ "root" "@wheel" ];
users.users.${config.user} = { users.users.${config.user} = lib.mkMerge [
isNormalUser = true; {
description = "John Lancaster"; isNormalUser = true;
extraGroups = [] description = "John Lancaster";
++ lib.optionals config.root [ "wheel" ] extraGroups = []
++ lib.optionals config.docker [ "docker" ] ++ lib.optionals config.root [ "wheel" ]
++ lib.optionals config.networking.networkmanager.enable [ "networkmanager" ]; ++ lib.optionals config.docker [ "docker" ]
} // userOptions config; ++ lib.optionals config.networking.networkmanager.enable [ "networkmanager" ];
}
(userOptions config)
];
users.users.root = lib.mkIf config.root (userOptions config); users.users.root = lib.mkIf config.root (userOptions config);
security.sudo-rs = lib.mkIf config.root { security.sudo-rs = lib.mkIf config.root {