Restructure Groups (and Permissions)

machines/kcnhub/users.nix

@@ -7,5 +7,9 @@
     ./users/spandan.nix
     ./users/matlab-server.nix
     ./users/frances.nix
+
+    # Groups
+    ./users/groups/admin.nix
+    ./users/groups/nfrf.nix
   ];
 }

machines/kcnhub/users/alan.nix

@@ -1,7 +1,6 @@
 { pkgs, ... }: {
   users.users.alan = {
     isNormalUser = true;
-    extraGroups = [ "wheel" ];
     homeSize = "50g";
     homeProjectId = 103;
     packages = with pkgs; [

machines/kcnhub/users/carol.nix

@@ -1,7 +1,6 @@
 { pkgs, ... }: {
   users.users.carol = {
     isNormalUser = true;
-    extraGroups = [ "wheel" ];
     homeSize = "50g";
     homeProjectId = 102;
     packages = with pkgs; [

machines/kcnhub/users/darian.nix

@@ -1,7 +1,6 @@
 { pkgs, ... }: {
   users.users.darian = {
     isNormalUser = true;
-    extraGroups = [ "wheel" ];
     homeSize = "50g";
     homeProjectId = 101;
     packages = with pkgs; [

machines/kcnhub/users/david.nix

@@ -1,7 +1,6 @@
 { pkgs, ... }: {
   users.users.david = {
     isNormalUser = true;
-    extraGroups = [ "wheel" ];
     homeSize = "50g";
     homeProjectId = 100;
     packages = with pkgs; [

machines/kcnhub/users/frances.nix

@@ -1,10 +1,6 @@
 { pkgs, ... }: {
   users.users.frances = {
     isNormalUser = true;
-    extraGroups = [ 
-      "wheel"
-      "mousetbi"
-    ];
     homeSize = "50g";
     homeProjectId = 106;
     packages = with pkgs; [
@@ -12,5 +8,4 @@
     ];
     initialHashedPassword = "$y$j9T$I9LtX8Vx/2RKuUT1HjPKN/$TmoQPB/J7y3owZf80oWZjLPv//CVeUd8gVttcFeINQA";
   };
-  users.groups."mousetbi" = { };
 }

machines/kcnhub/users/groups/admin.nix

@@ -0,0 +1,8 @@
+{ ... }: {
+  users.groups."wheel" = {
+    members = [
+      "root"
+      "david"
+    ];
+  };
+}

machines/kcnhub/users/groups/nfrf.nix

@@ -0,0 +1,8 @@
+{ ... }: {
+  users.groups."nfrf" = {
+    members = [
+      "spandan"
+      "frances"
+    ];
+  };
+}

machines/kcnhub/users/matlab-server.nix

@@ -1,7 +1,6 @@
 { pkgs, ... }: {
   users.users.matlab-server = {
     isNormalUser = true;
-    extraGroups = [ "wheel" ];
     homeSize = "15g";
     homeProjectId = 105;
     packages = with pkgs; [

machines/kcnhub/users/spandan.nix

@@ -1,15 +1,10 @@
 { pkgs, ... }: {
   users.users.spandan = {
     isNormalUser = true;
-    extraGroups = [
-      "wheel"
-      "mousetbi"
-    ];
     homeSize = "50g";
     homeProjectId = 104;
     packages = with pkgs; [
 	
     ];
   };
-  users.groups."mousetbi" = { };
 }