Add option for additional groups to user meta definition

Flake lock file updates:

• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/016a781cc93d3c7f7005b6ba12f667e9861056e0' (2023-05-17)
  → 'github:nix-community/emacs-overlay/e0c0b3f09829e333326a10a051a0836b27b1e08d' (2023-05-24)
• Updated input 'nixos-hardware':
    'github:NixOS/nixos-hardware/71ce85372a614d418d5e303dd5702a79d1545c04' (2023-05-15)
  → 'github:NixOS/nixos-hardware/4cc688ee711159b9bcb5a367be44007934e1a49d' (2023-05-24)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/55af203d468a6f5032a519cba4f41acf5a74b638' (2023-05-15)
  → 'github:NixOS/nixpkgs/b0671cbf1e5c443f7fbfd4941ee0f8a151435114' (2023-05-21)
• Updated input 'nixpkgs-unstable':
    'github:NixOS/nixpkgs/963006aab35e3e8ebbf6052b6bf4ea712fdd3c28' (2023-05-16)
  → 'github:NixOS/nixpkgs/7084250df3d7f9735087d3234407f3c1fc2400e3' (2023-05-22)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/a376127bb5277cd2c337a9458744f370aaf2e08d' (2023-05-14)
  → 'github:Mic92/sops-nix/4ccdfb573f323a108a44c13bb7730e42baf962a9' (2023-05-21)
• Updated input 'sops-nix/nixpkgs-stable':
    'github:NixOS/nixpkgs/c6d2f3dc0d3efd4285eebe4f8a36a47ba438138e' (2023-05-14)
  → 'github:NixOS/nixpkgs/d0dade110dc7072d67ce27826cfe9ab2ab0cf247' (2023-05-21)

flake.lock

@@ -71,11 +71,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1684293023,
+        "lastModified": 1684896957,
-        "narHash": "sha256-scsN8CvQ8ObD09verWq6e8u4FUMYrZh0uhYl2F1OOC4=",
+        "narHash": "sha256-N5naB0P7jD/xwmLAEkf+nhVwqnvbuHX1M4xLuufL40k=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "016a781cc93d3c7f7005b6ba12f667e9861056e0",
+        "rev": "e0c0b3f09829e333326a10a051a0836b27b1e08d",
         "type": "github"
       },
       "original": {
@@ -229,11 +229,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1684169666,
+        "lastModified": 1684899633,
-        "narHash": "sha256-N5jrykeSxLVgvm3Dd3hZ38/XwM/jU+dltqlXgrGlYxk=",
+        "narHash": "sha256-NtwerXX8UFsoNy6k+DukJMriWtEjQtMU/Urbff2O2Dg=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "71ce85372a614d418d5e303dd5702a79d1545c04",
+        "rev": "4cc688ee711159b9bcb5a367be44007934e1a49d",
         "type": "github"
       },
       "original": {
@@ -292,11 +292,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1684025543,
+        "lastModified": 1684632198,
-        "narHash": "sha256-hGe7S+i5je+8E/b2mOXVI9nmr038Dw+bV8e1P8xHSe0=",
+        "narHash": "sha256-SdxMPd0WmU9MnDBuuy7ouR++GftrThmSGL7PCQj/uVI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c6d2f3dc0d3efd4285eebe4f8a36a47ba438138e",
+        "rev": "d0dade110dc7072d67ce27826cfe9ab2ab0cf247",
         "type": "github"
       },
       "original": {
@@ -308,11 +308,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1684215771,
+        "lastModified": 1684754342,
-        "narHash": "sha256-fsum28z+g18yreNa1Y7MPo9dtps5h1VkHfZbYQ+YPbk=",
+        "narHash": "sha256-plGnjnbnPLoZCTdQX21oT7xliQhFtgcWlkuDHgtEb1o=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "963006aab35e3e8ebbf6052b6bf4ea712fdd3c28",
+        "rev": "7084250df3d7f9735087d3234407f3c1fc2400e3",
         "type": "github"
       },
       "original": {
@@ -324,11 +324,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1684171562,
+        "lastModified": 1684661732,
-        "narHash": "sha256-BMUWjVWAUdyMWKk0ATMC9H0Bv4qAV/TXwwPUvTiC5IQ=",
+        "narHash": "sha256-2/Xo/UmUUoMXc0T5tzoUsYjMLLMjEfzRWDAQB0WwtW0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "55af203d468a6f5032a519cba4f41acf5a74b638",
+        "rev": "b0671cbf1e5c443f7fbfd4941ee0f8a151435114",
         "type": "github"
       },
       "original": {
@@ -384,11 +384,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1684032930,
+        "lastModified": 1684637723,
-        "narHash": "sha256-ueeSYDii2e5bkKrsSdP12JhkW9sqgYrUghLC8aDfYGQ=",
+        "narHash": "sha256-0vAxL7MVMhGbTkAyvzLvleELHjVsaS43p+PR1h9gzNQ=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "a376127bb5277cd2c337a9458744f370aaf2e08d",
+        "rev": "4ccdfb573f323a108a44c13bb7730e42baf962a9",
         "type": "github"
       },
       "original": {

machines/nucturne/default.nix

@@ -1,6 +1,11 @@
-{ config, pkgs, inputs, nixos-hardware, ... }: {
+{
-  imports =
+  config,
-    [ ../../common/users.nix ./hardware-configuration.nix ./software.nix ];
+  pkgs,
+  inputs,
+  nixos-hardware,
+  ...
+}: {
+  imports = [../../common/users.nix ./hardware-configuration.nix ./software.nix];
 
   elss = {
     # base system
@@ -29,10 +34,10 @@
     openvpn.enable = true;
 
     # nm-networks
-    networking.nmConnections = [ ];
+    networking.nmConnections = [];
 
     # enable sops
-    sops = { enable = true; };
+    sops = {enable = true;};
 
     # enable wireguard
     wireguard.enable = true;
@@ -40,17 +45,22 @@
     # user setup
     users = {
       enable = true;
-      admins = [ "ellmau" ];
+      admins = ["ellmau"];
-      users = [ ];
+      users = [];
 
-      meta = { ellmau.git = { signDefault = true; }; };
+      meta = {
+        ellmau = {
+          git = {signDefault = true;};
+          extraGroups = ["networkmanager"];
+        };
+      };
     };
   };
 
   boot = {
-    extraModulePackages = [ config.boot.kernelPackages.v4l2loopback ];
+    extraModulePackages = [config.boot.kernelPackages.v4l2loopback];
 
-    kernelModules = [ "v4l2loopback" ];
+    kernelModules = ["v4l2loopback"];
 
     plymouth.enable = true;
   };

machines/stel-xps/default.nix

@@ -1,4 +1,10 @@
-{ config, pkgs, inputs, nixos-hardware, ... }: {
+{
+  config,
+  pkgs,
+  inputs,
+  nixos-hardware,
+  ...
+}: {
   imports = [
     ../../common/users.nix
     ./printer.nix
@@ -34,10 +40,10 @@
     openvpn.enable = true;
 
     # nm-networks
-    networking.nmConnections = [ "tartaros" "eduroam" ];
+    networking.nmConnections = ["tartaros" "eduroam"];
 
     # enable sops
-    sops = { enable = true; };
+    sops = {enable = true;};
 
     # enable wireguard
     wireguard.enable = true;
@@ -45,23 +51,26 @@
     # user setup
     users = {
       enable = true;
-      admins = [ "ellmau" ];
+      admins = ["ellmau"];
-      users = [ ];
+      users = [];
 
       meta = {
-        ellmau.git = {
+        ellmau = {
-          key = "0x4998BEEE";
+          git = {
-          gpgsm = true;
+            key = "0x4998BEEE";
-          signDefault = true;
+            gpgsm = true;
+            signDefault = true;
+          };
+          extraGroups = ["networkmanager"];
         };
       };
     };
   };
 
   boot = {
-    extraModulePackages = [ config.boot.kernelPackages.v4l2loopback ];
+    extraModulePackages = [config.boot.kernelPackages.v4l2loopback];
 
-    kernelModules = [ "v4l2loopback" ];
+    kernelModules = ["v4l2loopback"];
 
     plymouth.enable = true;
   };

modules/communication.nix

@@ -18,7 +18,7 @@ with lib; {
         signal-desktop
         skypeforlinux
         #remove teams as MS has removed the linux packages from their servers
-        #teams
+        teams
         zoom-us
       ];
     };

modules/users.nix

@@ -45,6 +45,12 @@ with lib; {
               type = types.str;
               description = "Email address of the user";
             };
+            extraGroups = mkOption {
+              type = types.listOf types.str;
+              description = "additional groups to add";
+              default = [];
+            };
+
             git = mkOption {
               type = types.submodule {
                 options = {
@@ -92,7 +98,7 @@ with lib; {
       inherit (meta) description;
       isNormalUser = true;
       home = "/home/${login}";
-      extraGroups = [];
+      extraGroups = meta.extraGroups;
       openssh.authorizedKeys.keys = meta.publicKeys;
     };