UGA-Innovation-Factory/athenix
3
1
Fork 0
Code Issues Pull Requests Actions Projects Releases Activity

fix merge conflict

Browse Source
This commit is contained in:
Hunter David Halloran
2025-12-17 16:24:31 -05:00
parent 94824dd6bf
commit 99ed790ea5
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
hosts/user-config.nix
View File

@@ -65,8 +65,6 @@ let
externalUserOptions = lib.filterAttrs (_: moduleOptions: moduleOptions != { }) externalUserModuleOptions; externalUserOptions = lib.filterAttrs (_: moduleOptions: moduleOptions != { }) externalUserModuleOptions;
# Submodule defining the structure of a user account # Submodule defining the structure of a user account
userSubmodule = lib.types.submodule {
options = {
userSubmodule = lib.types.submodule { userSubmodule = lib.types.submodule {
options = { options = {
isNormalUser = lib.mkOption { isNormalUser = lib.mkOption {
@@ -154,7 +152,6 @@ let
}; };
}; };
}; };
in in
{ {