users -> user

devices/nas/default.nix

@@ -89,7 +89,7 @@ inputs:
           wireguardIp = "192.168.83.4";
         };
       };
-      users.users = [ "chn" "xll" "zem" "yjq" "gb" ];
+      user.users = [ "chn" "xll" "zem" "yjq" "gb" ];
     };
   };
 }

devices/xmupc1/default.nix

@@ -104,7 +104,7 @@ inputs:
         groupshare.enable = true;
       };
       bugs = [ "xmunet" "amdpstate" ];
-      users.users = [ "chn" "xll" "zem" "yjq" "gb" ];
+      user.users = [ "chn" "xll" "zem" "yjq" "gb" ];
     };
     services.hardware.bolt.enable = true;
   };

devices/xmupc2/default.nix

@@ -94,7 +94,7 @@ inputs:
         groupshare.enable = true;
       };
       bugs = [ "xmunet" ];
-      users.users = [ "chn" "xll" "zem" "yjq" "gb" ];
+      user.users = [ "chn" "xll" "zem" "yjq" "gb" ];
     };
   };
 }

modules/default.nix

@@ -44,6 +44,6 @@ inputs:
           ];
         };
       })
-      ./hardware ./packages ./system ./virtualization ./services ./bugs ./users
+      ./hardware ./packages ./system ./virtualization ./services ./bugs ./user
     ];
   }

modules/packages/desktop/chromium.nix

@@ -6,7 +6,7 @@ inputs:
     in mkIf (builtins.elem "desktop" inputs.config.nixos.packages._packageSets)
     {
       programs.chromium = { enable = true; extraOpts.PasswordManagerEnabled = false; };
-      nixos.users.sharedModules =
+      nixos.user.sharedModules =
       [{
         config.programs.chromium =
         {

modules/packages/desktop/firefox.nix

@@ -2,7 +2,7 @@ inputs:
 {
   config = inputs.lib.mkIf (builtins.elem "desktop" inputs.config.nixos.packages._packageSets)
   {
-    nixos.users.sharedModules = [{ config =
+    nixos.user.sharedModules = [{ config =
     {
       programs.firefox =
       {

modules/packages/desktop/plasma/default.nix

@@ -1,7 +1,7 @@
 inputs:
 {
   imports = inputs.localLib.mkModules (inputs.localLib.findModules ./.);
-  config.nixos.users.sharedModules = inputs.lib.mkIf inputs.config.nixos.system.gui.enable
+  config.nixos.user.sharedModules = inputs.lib.mkIf inputs.config.nixos.system.gui.enable
   [{
     config.programs.plasma = inputs.lib.mkMerge
     [

modules/packages/desktop/plasma/konsole.nix

@@ -2,7 +2,7 @@ inputs:
 {
   config = inputs.lib.mkIf inputs.config.nixos.system.gui.enable
   {
-    nixos.users.sharedModules =
+    nixos.user.sharedModules =
     [(hmInputs: {
       config =
       {
@@ -79,6 +79,6 @@ inputs:
       in inputs.lib.mkIf impermanence.enable (inputs.lib.mkMerge (builtins.map
         (user:
           { "${impermanence.root}".users.${user}.directories = [ ".local/share/konsole" ".local/share/yakuake" ]; })
-        inputs.config.nixos.users.users));
+        inputs.config.nixos.user.users));
   };
 }

modules/packages/server/default.nix

@@ -53,7 +53,7 @@ inputs:
             certifi charset-normalizer idna orjson psycopg2 inquirerpy requests tqdm pydbus
           ])];
         };
-        users.sharedModules = [(home-inputs:
+        user.sharedModules = [(home-inputs:
         {
           config.programs =
           {

modules/packages/server/ssh/default.nix

@@ -119,7 +119,7 @@ inputs:
         extraConfig = "AddKeysToAgent yes";
       };
       environment.sessionVariables.SSH_ASKPASS_REQUIRE = "prefer";
-      nixos.users.sharedModules =
+      nixos.user.sharedModules =
       [(hmInputs: {
         config.programs.ssh =
         {

modules/packages/server/zsh/default.nix

@@ -5,7 +5,7 @@ inputs:
       inherit (inputs.lib) mkIf;
     in mkIf (builtins.elem "server" inputs.config.nixos.packages._packageSets)
     {
-      nixos.users.sharedModules = [(home-inputs: { config.programs =
+      nixos.user.sharedModules = [(home-inputs: { config.programs =
       {
         zsh =
         {

modules/packages/workstation/default.nix

@@ -46,7 +46,7 @@ inputs:
             phonopy tensorflow keras scipy scikit-learn jupyterlab autograd # localPackages.pix2tex
           ])];
         };
-        users.sharedModules =
+        user.sharedModules =
         [{
           config.programs =
           {

modules/services/fontconfig.nix

@@ -26,6 +26,6 @@ inputs:
           serif = [ "Liberation Serif" "Source Han Serif SC" ];
         };
       };
-      nixos.users.sharedModules = [{ config.xdg.configFile."fontconfig/conf.d/10-hm-fonts.conf".force = true; }];
+      nixos.user.sharedModules = [{ config.xdg.configFile."fontconfig/conf.d/10-hm-fonts.conf".force = true; }];
     };
 }

modules/system/impermanence.nix

@@ -53,7 +53,7 @@ inputs:
           ++ (if inputs.config.services.xserver.displayManager.sddm.enable then
             [{ directory = "/var/lib/sddm"; user = "sddm"; group = "sddm"; mode = "0700"; }] else []);
         }
-        // (if builtins.elem "chn" inputs.config.nixos.users.users then
+        // (if builtins.elem "chn" inputs.config.nixos.user.users then
         {
           users.chn =
           {

modules/user/chn/default.nix

@@ -4,9 +4,9 @@ inputs:
   config =
     let
       inherit (inputs.lib) mkIf;
-      inherit (inputs.config.nixos) users;
+      inherit (inputs.config.nixos) user;
       inherit (builtins) listToAttrs;
-    in mkIf (builtins.elem "chn" users.users)
+    in mkIf (builtins.elem "chn" user.users)
     {
       users.users.chn =
       {
@@ -32,7 +32,7 @@ inputs:
       };
       home-manager.users.chn =
       {
-        imports = users.sharedModules;
+        imports = user.sharedModules;
         config =
         {
           programs =

modules/user/default.nix

@@ -1,14 +1,14 @@
 inputs:
 {
   imports = inputs.localLib.mkModules (inputs.localLib.findModules ./.);
-  options.nixos.users = let inherit (inputs.lib) mkOption types; in
+  options.nixos.user = let inherit (inputs.lib) mkOption types; in
   {
     users = mkOption { type = types.listOf types.nonEmptyStr; default = [ "chn" ]; };
     sharedModules = mkOption { type = types.listOf types.anything; default = []; };
   };
   config =
     let
-      inherit (inputs.config.nixos) users;
+      inherit (inputs.config.nixos) user;
       inherit (builtins) map;
       inherit (inputs.lib) mkMerge;
     in
@@ -24,7 +24,7 @@ inputs:
           };
           groups.${name}.gid = inputs.config.nixos.system.user.group.${name};
         })
-        users.users);
+        user.users);
     };
 }
 

modules/user/gb/default.nix

@@ -3,8 +3,8 @@ inputs:
   config =
     let
       inherit (inputs.lib) mkIf;
-      inherit (inputs.config.nixos) users;
-    in mkIf (builtins.elem "gb" users.users)
+      inherit (inputs.config.nixos) user;
+    in mkIf (builtins.elem "gb" user.users)
     {
       users.users.gb =
       {
@@ -18,7 +18,7 @@ inputs:
       };
       home-manager.users.gb = homeInputs:
       {
-        imports = users.sharedModules;
+        imports = user.sharedModules;
         config.home.file.groupshare.source = homeInputs.config.lib.file.mkOutOfStoreSymlink "/var/lib/groupshare";
       };
       sops.secrets."users/gb".neededForUsers = true;

modules/user/root/default.nix

@@ -3,7 +3,7 @@ inputs:
   config =
     let
       inherit (inputs.lib) mkIf;
-      inherit (inputs.config.nixos) users;
+      inherit (inputs.config.nixos) user;
     in
     {
       users.users.root =
@@ -23,7 +23,7 @@ inputs:
       };
       home-manager.users.root =
       {
-        imports = users.sharedModules;
+        imports = user.sharedModules;
         config.programs.git =
           { extraConfig.core.editor = inputs.lib.mkForce "vim"; userName = "chn"; userEmail = "chn@chn.moe"; };
       };

modules/user/test/default.nix

@@ -3,8 +3,8 @@ inputs:
   config =
     let
       inherit (inputs.lib) mkIf;
-      inherit (inputs.config.nixos) users;
-    in mkIf (builtins.elem "test" users.users)
+      inherit (inputs.config.nixos) user;
+    in mkIf (builtins.elem "test" user.users)
     {
       users.users.test =
       {
@@ -12,6 +12,6 @@ inputs:
         password = "test";
         shell = inputs.pkgs.zsh;
       };
-      home-manager.users.test.imports = users.sharedModules;
+      home-manager.users.test.imports = user.sharedModules;
     };
 }

modules/user/xll/default.nix

@@ -3,8 +3,8 @@ inputs:
   config =
     let
       inherit (inputs.lib) mkIf;
-      inherit (inputs.config.nixos) users;
-    in mkIf (builtins.elem "xll" users.users)
+      inherit (inputs.config.nixos) user;
+    in mkIf (builtins.elem "xll" user.users)
     {
       users.users.xll =
       {
@@ -18,7 +18,7 @@ inputs:
       };
       home-manager.users.xll = homeInputs:
       {
-        imports = users.sharedModules;
+        imports = user.sharedModules;
         config.home.file.groupshare.source = homeInputs.config.lib.file.mkOutOfStoreSymlink "/var/lib/groupshare";
       };
       sops.secrets."users/xll".neededForUsers = true;

modules/user/yjq/default.nix

@@ -3,8 +3,8 @@ inputs:
   config =
     let
       inherit (inputs.lib) mkIf;
-      inherit (inputs.config.nixos) users;
-    in mkIf (builtins.elem "yjq" users.users)
+      inherit (inputs.config.nixos) user;
+    in mkIf (builtins.elem "yjq" user.users)
     {
       users.users.yjq =
       {
@@ -18,7 +18,7 @@ inputs:
       };
       home-manager.users.yjq = homeInputs:
       {
-        imports = users.sharedModules;
+        imports = user.sharedModules;
         config.home.file.groupshare.source = homeInputs.config.lib.file.mkOutOfStoreSymlink "/var/lib/groupshare";
       };
       sops.secrets."users/yjq".neededForUsers = true;

modules/user/zem/default.nix

@@ -3,8 +3,8 @@ inputs:
   config =
     let
       inherit (inputs.lib) mkIf;
-      inherit (inputs.config.nixos) users;
-    in mkIf (builtins.elem "zem" users.users)
+      inherit (inputs.config.nixos) user;
+    in mkIf (builtins.elem "zem" user.users)
     {
       users.users.zem =
       {
@@ -18,7 +18,7 @@ inputs:
       };
       home-manager.users.zem = homeInputs:
       {
-        imports = users.sharedModules;
+        imports = user.sharedModules;
         config.home.file.groupshare.source = homeInputs.config.lib.file.mkOutOfStoreSymlink "/var/lib/groupshare";
       };
       sops.secrets."users/zem".neededForUsers = true;