From f205624af7fe48d16e89ab248e9a56bbb72c84c8 Mon Sep 17 00:00:00 2001 From: Fuwn Date: Mon, 21 Oct 2024 02:59:30 -0700 Subject: options: add primary user attribute --- modules/desktop/software/services/plex.nix | 2 +- modules/options/default.nix | 6 ++++++ modules/pc/security/doas.nix | 3 ++- modules/pc/software/users.nix | 9 +++++++-- 4 files changed, 16 insertions(+), 4 deletions(-) (limited to 'modules') diff --git a/modules/desktop/software/services/plex.nix b/modules/desktop/software/services/plex.nix index 1d2d1b1..38922a4 100644 --- a/modules/desktop/software/services/plex.nix +++ b/modules/desktop/software/services/plex.nix @@ -2,7 +2,7 @@ { services.plex = { enable = true; - user = "ebisu"; + user = config.modules.primaryUser; }; environment.etc.crypttab.text = '' diff --git a/modules/options/default.nix b/modules/options/default.nix index c8a78c9..4401826 100644 --- a/modules/options/default.nix +++ b/modules/options/default.nix @@ -1,6 +1,12 @@ +{ lib, ... }: { imports = [ ./containers.nix ./nix.nix ]; + + options.modules.primaryUser = lib.options.mkOption { + default = null; + type = lib.types.str; + }; } diff --git a/modules/pc/security/doas.nix b/modules/pc/security/doas.nix index af717ca..5b7112f 100644 --- a/modules/pc/security/doas.nix +++ b/modules/pc/security/doas.nix @@ -1,3 +1,4 @@ +{ config, ... }: { security.doas = { enable = true; @@ -6,7 +7,7 @@ keepEnv = true; # persist = true; noPass = true; - users = [ "ebisu" ]; + users = [ config.modules.primaryUser ]; } ]; }; diff --git a/modules/pc/software/users.nix b/modules/pc/software/users.nix index 729cff9..cce07ac 100644 --- a/modules/pc/software/users.nix +++ b/modules/pc/software/users.nix @@ -1,4 +1,9 @@ -{ pkgs, secrets, ... }: +{ + config, + pkgs, + secrets, + ... +}: let initialHashedPassword = secrets.initial_hashed_password; in @@ -13,7 +18,7 @@ in shell = pkgs.bash; }; - ebisu = { + ${config.modules.primaryUser} = { inherit initialHashedPassword; isNormalUser = true; -- cgit v1.2.3