diff --git a/lib/deploy/default.nix b/lib/deploy/default.nix index 408cffca..e8a95c3e 100644 --- a/lib/deploy/default.nix +++ b/lib/deploy/default.nix @@ -45,12 +45,12 @@ rec { (overrides.${name}.profiles.system or { }) // { path = deploy-rs.lib.${system}.activate.nixos host; + sudo = "doas -u"; } // lib.optionalAttrs (user != null) { user = "root"; sshUser = user; - } - // lib.optionalAttrs (host.config.${namespace}.security.doas.enable or false) { sudo = "doas -u"; }; + }; }; }; } diff --git a/modules/nixos/default-users/default.nix b/modules/nixos/default-users/default.nix index ef298abc..a52ac69c 100644 --- a/modules/nixos/default-users/default.nix +++ b/modules/nixos/default-users/default.nix @@ -9,6 +9,11 @@ let in { options.py.users.default.enable = lib.mkEnableOption "Default PyroNet Users"; + options.py.user.name = lib.mkOption { + type = lib.types.str; + default = "thehedgehog"; + description = "User for deploy-rs deployments."; + }; config = lib.mkIf cfg.enable { users.users.pyrox = {