From 99ed790ea52acf9b69634bc581ddba7dfb7e4623 Mon Sep 17 00:00:00 2001 From: Hunter Halloran Date: Wed, 17 Dec 2025 16:24:31 -0500 Subject: [PATCH] fix merge conflict --- hosts/user-config.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/hosts/user-config.nix b/hosts/user-config.nix index 69b71a7..c1acda1 100644 --- a/hosts/user-config.nix +++ b/hosts/user-config.nix @@ -65,8 +65,6 @@ let externalUserOptions = lib.filterAttrs (_: moduleOptions: moduleOptions != { }) externalUserModuleOptions; # Submodule defining the structure of a user account - userSubmodule = lib.types.submodule { - options = { userSubmodule = lib.types.submodule { options = { isNormalUser = lib.mkOption { @@ -154,7 +152,6 @@ let }; }; }; - in {