Merged Host/Home Opt into SysOpt

2024-04-14 07:57:07 +02:00
parent 0a02d67b7e
commit 972cb47e3f
65 changed files with 331 additions and 338 deletions
--- a/modules/nixos/users/default.nix
+++ b/modules/nixos/users/default.nix
@ -1,23 +1,26 @@
-{ config, pkgs, ... }: {
+{ config, pkgs, lib, ... }:
+let nameValuePair = name: value: { inherit name value; };
+in {
  programs.zsh.enable = true;
  users = {
    defaultUserShell = pkgs.zsh;
-    users.${config.hostcfg.username} = {
-      isNormalUser = true;
-      description = "${config.hostcfg.username}";
-      extraGroups = [
-        "networkmanager"
-        "wheel"
-        "vboxsf"
-        "adbusers"
-        "libvirtd"
-        "kvm"
-        "lp"
-        "audio"
-        "video"
-        "docker"
-        "wireshark"
-      ];
-    };
+    users = builtins.listToAttrs (map (userConfig:
+      nameValuePair userConfig.username {
+        isNormalUser = true;
+        description = "${userConfig.username}";
+        extraGroups = [
+          "networkmanager"
+          "wheel"
+          "vboxsf"
+          "adbusers"
+          "libvirtd"
+          "kvm"
+          "lp"
+          "audio"
+          "video"
+          "docker"
+          "wireshark"
+        ];
+      }) config.syscfg.users);
  };
 }