From f44140eb6935f6391c58fe7cef8a9cc96f61aafe Mon Sep 17 00:00:00 2001 From: chn Date: Fri, 4 Jul 2025 10:07:15 +0800 Subject: [PATCH] modules.user.zgq: init --- devices/srv1/default.nix | 2 +- modules/user/default.nix | 8 +++++++- modules/user/zgq/default.nix | 8 ++++++++ modules/user/zgq/id_ed25519.pub | 1 + 4 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 modules/user/zgq/default.nix create mode 100644 modules/user/zgq/id_ed25519.pub diff --git a/devices/srv1/default.nix b/devices/srv1/default.nix index 793d3345..31c794b7 100644 --- a/devices/srv1/default.nix +++ b/devices/srv1/default.nix @@ -63,7 +63,7 @@ inputs: }; }; packages.vasp = {}; - user.users = [ "chn" "xll" "zem" "yjq" "gb" "wp" "hjp" "wm" "GROUPIII-1" "GROUPIII-2" "GROUPIII-3" ]; + user.users = [ "chn" "xll" "zem" "yjq" "gb" "wp" "hjp" "wm" "GROUPIII-1" "GROUPIII-2" "GROUPIII-3" "zgq" ]; }; }; } diff --git a/modules/user/default.nix b/modules/user/default.nix index 7ce3a20c..1312d5a7 100644 --- a/modules/user/default.nix +++ b/modules/user/default.nix @@ -33,6 +33,7 @@ inputs: pen = 1019; reonokiy = 1020; zqq = 1021; + zgq = 1022; misskey-misskey = 2000; misskey-misskey-old = 2001; frp = 2002; @@ -118,7 +119,12 @@ inputs: users.users.root = { shell = inputs.pkgs.zsh; - openssh.authorizedKeys.keys = [(builtins.readFile ./chn/id_ed25519_sk.pub)]; + openssh.authorizedKeys.keys = inputs.lib.mkMerge + [ + [(builtins.readFile ./chn/id_ed25519_sk.pub)] + (inputs.lib.mkIf (inputs.config.nixos.model.cluster.clusterName or null == "srv1") + [(builtins.readFile ./zgq/id_ed25519.pub)]) + ]; hashedPassword = "$y$j9T$.UyKKvDnmlJaYZAh6./rf/$65dRqishAiqxCE6LEMjqruwJPZte7uiyYLVKpzdZNH5"; }; home-manager.users.root = homeInputs: diff --git a/modules/user/zgq/default.nix b/modules/user/zgq/default.nix new file mode 100644 index 00000000..d096e80f --- /dev/null +++ b/modules/user/zgq/default.nix @@ -0,0 +1,8 @@ +inputs: +{ + config = let inherit (inputs.config.nixos) user; in inputs.lib.mkIf (builtins.elem "zgq" user.users) + { + users.users.zgq.extraGroups = inputs.lib.mkIf (inputs.config.nixos.model.cluster.clusterName or null == "srv1") + [ "wheel" ]; + }; +} diff --git a/modules/user/zgq/id_ed25519.pub b/modules/user/zgq/id_ed25519.pub new file mode 100644 index 00000000..84c1e67f --- /dev/null +++ b/modules/user/zgq/id_ed25519.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKHnhPmiGpuK0OlMPLM9QFYpjcr5/WoG8IFoC9EDLSqc zgq