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

modules/system/settings/security/apparmor/default.nix

@@ -1,4 +0,0 @@
-{ ... }:
-{
-  security.apparmor.enable = true;
-}

modules/system/settings/security/default.nix

@@ -1,7 +1,6 @@
 { ... }:
 {
   imports = [
-    ./apparmor
     ./privilege
     ./rtkit
   ];

modules/system/users/corn/default.nix

@@ -0,0 +1,19 @@
+{ config, lib, pkgs, ... }:
+{
+  users.users."freecorn" = lib.mkIf config.system.extraUsers.enable {
+    isNormalUser = true;
+    createHome = true;
+    openssh.authorizedKeys.keys = [
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBCADciME1/rtWOlR2BxaAkRSgIZt61SYOgjTi6hw+yS Chinook"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICtoHVAmq8Ps7EguBsV3VY4snagzkhH6aXqwbKzuGs2H Radiant"
+    ];
+    extraGroups = [
+      "audio"
+      "video"
+    ];
+    uid = 1001;
+    shell = pkgs.zsh;
+  };
+
+  environment.persistence."/persist".directories = [ "/home/freecorn" ];
+}

modules/system/users/default.nix

@@ -1,4 +1,6 @@
-{ ... }:
+{ lib, ... }:
 {
   imports = [ ./main ];
+
+  options.system.extraUsers.enable = lib.mkEnableOption "Enable a shared system";
 }

modules/system/users/luna/default.nix

@@ -0,0 +1,17 @@
+{ config, lib, ... }:
+{
+  users.users."luna" = lib.mkIf config.system.extraUsers.enable {
+    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"
+    ];
+    extraGroups = [
+      "audio"
+      "video"
+    ];
+    uid = 1002;
+  };
+
+  environment.persistence."/persist".directories = [ "/home/luna" ];
+}

modules/system/users/main/default.nix

@@ -14,7 +14,6 @@
       openssh.authorizedKeys.keyFiles = [
         ../../../../hosts/tower/id_ed25519.pub
 
-        ../../../../hosts/pear/id_ed25519.pub
         ../../../../hosts/intuos/id_ed25519.pub
         ../../../../hosts/jupiter/id_ed25519.pub
         ../../../../hosts/redmond/id_ed25519.pub