From c60c1019d2950365a15ecb2237ab936ad0ba5b85 Mon Sep 17 00:00:00 2001
From: iFargle <albert@sysctl.io>
Date: Thu, 18 Jan 2024 14:45:54 +0900
Subject: [PATCH] Clean up

---
 nixos/users/albert/default.nix | 36 ++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/nixos/users/albert/default.nix b/nixos/users/albert/default.nix
index 5cd13918..73a9e52e 100644
--- a/nixos/users/albert/default.nix
+++ b/nixos/users/albert/default.nix
@@ -4,24 +4,26 @@ let
 in {
   # Define a user account.
   imports = [  ]  ++ lib.optional (builtins.isString desktop) ./desktop.nix;
-  users.mutableUsers = false;
-  users.users.albert = {
-    isNormalUser = true;
-    description = "Albert J. Copeland";
-    # video is required for the "light" command to work
-    extraGroups = [ "networkmanager" "wheel" ] 
-      ++ ifExists [ "video"  ] 
-      ++ ifExists [ "docker" ];
-    # mkpasswd -m sha-512
-    hashedPassword = "$y$j9T$wKLsIWaA4Gf63RvjedwLJ0$EHKL6BBJV0CAxEKcHHjaBqW085KJ/MGvmbyWzmcWOy6";
-    packages = [ pkgs.home-manager ];
-    openssh.authorizedKeys.keyFiles = [ ../../../keys/ssh/keys.txt ];
-  };
 
-  users.groups.albert = {
-    gid = 1000;
-    name = "albert";
-    members = [ "albert" ];
+  users = {
+    mutableUsers = false;
+    users.albert = {
+      isNormalUser = true;
+      description = "Albert J. Copeland";
+      # video is required for the "light" command to work
+      extraGroups = [ "networkmanager" "wheel" ] 
+        ++ ifExists [ "video"  ] 
+        ++ ifExists [ "docker" ];
+      # mkpasswd -m sha-512
+      hashedPassword = "$y$j9T$wKLsIWaA4Gf63RvjedwLJ0$EHKL6BBJV0CAxEKcHHjaBqW085KJ/MGvmbyWzmcWOy6";
+      packages = [ pkgs.home-manager ];
+      openssh.authorizedKeys.keyFiles = [ ../../../keys/ssh/keys.txt ];
+    };
+    groups.albert = {
+      gid = 1000;
+      name = "albert";
+      members = [ "albert" ];
+    };
   };
 
   # Make this user trusted