collapse gui and identity arguments

modules/system/doas.nix

@@ -1,6 +1,6 @@
 # Replace sudo with doas
 
-{ user, ... }: {
+{ identity, ... }: {
 
   security = {
 
@@ -24,5 +24,7 @@
     };
   };
 
-  home-manager.users.${user}.programs.fish.shellAliases = { sudo = "doas"; };
+  home-manager.users.${identity.user}.programs.fish.shellAliases = {
+    sudo = "doas";
+  };
 }

modules/system/user.nix

@@ -1,7 +1,7 @@
-{ user, ... }: {
+{ identity, ... }: {
 
   # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.${user} = {
+  users.users.${identity.user} = {
 
     # Create a home directory for human user
     isNormalUser = true;