Remove Pear, use Jupiter as school device, generalize extra users

hosts/kitty/default.nix

@@ -6,7 +6,7 @@
     ./filesystems
     ./hardware
     ./network
-    ./users
+    ./user
     ../../modules/system
   ];
 
@@ -17,6 +17,7 @@
 
   system = {
     server.enable = true;
+    extraUsers.enable = true;
     stateVersion = "24.11";
   };
 

hosts/kitty/users/corn/default.nix

@@ -1,15 +0,0 @@
-{ pkgs, ... }:
-{
-  users.users."freecorn" = {
-    isNormalUser = true;
-    createHome = true;
-    openssh.authorizedKeys.keys = [
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBCADciME1/rtWOlR2BxaAkRSgIZt61SYOgjTi6hw+yS Chinook"
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICtoHVAmq8Ps7EguBsV3VY4snagzkhH6aXqwbKzuGs2H Radiant"
-    ];
-    uid = 1001;
-    shell = pkgs.zsh;
-  };
-
-  environment.persistence."/persist".directories = [ "/home/freecorn" ];
-}

hosts/kitty/users/default.nix

@@ -1,8 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./corn
-    ./luna
-    ./main
-  ];
-}

hosts/kitty/users/luna/default.nix

@@ -1,13 +0,0 @@
-{ ... }:
-{
-  users.users."luna" = {
-    isNormalUser = true;
-    createHome = true;
-    openssh.authorizedKeys.keys = [
-      "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDJ3hzXkv5MVuGZy4HqfEZD0Ck7ZKiLeVmUTFzGSwZkumCpwX/zirD/tY4SNutPczhhYNn1jwkwnnyCwgkaQ7QWBs72G0opmjXDcSqxXJskSKYgjnUHoPV8uAcMwp5C5GNlwo3DFKXc1c7Sipy1s6y9ZnoKfVmjsr0AhamnC/bHEWg8vx0zuamCzvQ5vLWfpULRKwj286f0s2xaAvYaAJwGD0QMHC0ylFYZuq7Og4HVdlnUt+40BxCi+GAQqsFd4vM+RFjZKKD7ioP5DcIDfvfvxX4UpdKtCxVjeyyF+UJpFnQKytO9HvH4H+CRSAuJ+Vguiq/F3lGhvF0yIQ9M2MD3+tl3RZAj4D6n2ew30mn+QGh2fZgC7Utuzo02pMVUzkpm+mM4x8VyESpC1AuBdh0TAKBwS3ubMpegiCWCfIbNC0CQ/zgIq/5xwhXL8zhmfQrIiULBCd1xqThye0tt7knoPZlVCzOuVYoqxYnwYYGcXhzlArrmgRquyMYHdpFd+DTzJfcQIGdT4a+s0Mc2jRa0KT3A4ZrjziP0OPMQ+cpTd1tmQdEKXN6YhB87Hp9meCefFdzGvVembose82d3BOl45+rWM2ZcH93fNguWwYX0ez8+GiGW4P+gDQcfWfQCNa1daDjgoBwjmbG5rYoS6tfLxSSvYB1YOOK9U3AlPxEuTw== luna@ThinkPad-T480-Arch"
-    ];
-    uid = 1002;
-  };
-
-  environment.persistence."/persist".directories = [ "/home/luna" ];
-}