abstract user config

hosts/algiz/default.nix

@@ -30,12 +30,9 @@
 
   security.sudo.wheelNeedsPassword = false;
 
-  users.extraUsers = {
+  users.users = {
     daylin = {
-      shell = pkgs.zsh;
+      extraGroups = ["docker"];
-      isNormalUser = true;
-      extraGroups = ["wheel" "docker"];
-      initialPassword = "nix";
     };
     git = {
       isNormalUser = true;

hosts/algiz/system.nix

@@ -1,5 +1,5 @@
 {...}: {
-  users.motd = builtins.readFile ./rune;
+  users.motdFile = ./rune;
 
   swapDevices = [
     {

hosts/mannaz/default.nix

@@ -13,14 +13,5 @@
     nix-ld
   ];
 
-  users = {
+  users.users.daylin.extraGroups = ["docker"];
-    extraUsers = {
-      daylin = {
-        shell = pkgs.zsh;
-        isNormalUser = true;
-        extraGroups = ["wheel" "docker" "networkmanager"];
-        initialPassword = "nix";
-      };
-    };
-  };
 }

hosts/othalan/default.nix

@@ -43,13 +43,19 @@
     enableSSHSupport = true;
   };
 
-  users.users.daylin = {
+  users.users.daylin.extraGroups = [
-    isNormalUser = true;
-    shell = pkgs.zsh;
-    extraGroups = [
-      "wheel" # sudo
       "video" # backlight control via light
       "audio"
-    ];
+  ];
-  };
+
+  # users.users.daylin = {
+  #   isNormalUser = true;
+  #   shell = pkgs.zsh;
+  #   extraGroups = [
+  #     "wheel" # sudo
+  #     "video" # backlight control via light
+  #     "audio"
+  #   ];
+  # };
+
 }

modules/roles/common.nix

@@ -1,5 +1,6 @@
 {inputs, ...}: {
   imports = with inputs.self.nixosModules; [
+    users
     nix
     cli
     dev

modules/users/default.nix

@@ -0,0 +1,29 @@
+{
+  nixpkgs,
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  inherit (lib) mkOption mkIf types;
+  cfg = config.users.defaultUser;
+in {
+  options.users.defaultUser = mkOption {
+    default = true;
+    type = types.bool;
+    description = ''
+    include default user "daylin"
+    '';
+  };
+
+  config = mkIf cfg {
+  users.users.daylin = {
+    isNormalUser = true;
+    shell = pkgs.zsh;
+    extraGroups = [
+      "wheel" # sudo
+    ];
+    initialPassword = "nix";
+  };
+  };
+}