From 3ecdc02f33cb58b6bf313ca7ab2ddd94e49148e8 Mon Sep 17 00:00:00 2001 From: sinanmohd Date: Fri, 8 Mar 2024 19:19:07 +0530 Subject: userdata: user -> name, userFq -> nameFq --- home-manager/common/home.nix | 2 +- home-manager/common/modules/git.nix | 2 +- nixos/cez/configuration.nix | 2 +- nixos/cez/modules/sshfs.nix | 2 +- nixos/cez/modules/wayland.nix | 2 +- nixos/common/configuration.nix | 2 +- nixos/common/modules/dev.nix | 2 +- nixos/dspace/configuration.nix | 2 +- nixos/fscusat/modules/mirror/debian/default.nix | 2 +- nixos/kay/modules/cgit.nix | 2 +- nixos/kay/modules/mail.nix | 2 +- nixos/kay/modules/sftp.nix | 2 +- userdata.nix | 6 +++--- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/home-manager/common/home.nix b/home-manager/common/home.nix index b5886d4..8ec0757 100644 --- a/home-manager/common/home.nix +++ b/home-manager/common/home.nix @@ -1,5 +1,5 @@ { config, ... }: let - username = config.userdata.user; + username = config.userdata.name; in { imports = [ ./modules/git.nix ]; diff --git a/home-manager/common/modules/git.nix b/home-manager/common/modules/git.nix index df0407e..7337f7b 100644 --- a/home-manager/common/modules/git.nix +++ b/home-manager/common/modules/git.nix @@ -1,5 +1,5 @@ { config, ... }: let - userName = config.userdata.userFq; + userName = config.userdata.nameFq; userEmail = config.userdata.email; in { programs.git = { diff --git a/nixos/cez/configuration.nix b/nixos/cez/configuration.nix index 20d7d5b..720ee10 100644 --- a/nixos/cez/configuration.nix +++ b/nixos/cez/configuration.nix @@ -1,7 +1,7 @@ { config, pkgs, ... }: let - user = config.userdata.user; + user = config.userdata.name; in { imports = [ diff --git a/nixos/cez/modules/sshfs.nix b/nixos/cez/modules/sshfs.nix index 05a8b96..2431b96 100644 --- a/nixos/cez/modules/sshfs.nix +++ b/nixos/cez/modules/sshfs.nix @@ -2,7 +2,7 @@ let domain = config.userdata.domain; - user = config.userdata.user; + user = config.userdata.name; uid = config.users.users.${user}.uid; gid = config.users.groups.users.gid; in diff --git a/nixos/cez/modules/wayland.nix b/nixos/cez/modules/wayland.nix index c04d1bf..acc0191 100644 --- a/nixos/cez/modules/wayland.nix +++ b/nixos/cez/modules/wayland.nix @@ -1,7 +1,7 @@ { config, pkgs, lib, ... }: let - user = config.userdata.user; + user = config.userdata.name; in { # pkgs diff --git a/nixos/common/configuration.nix b/nixos/common/configuration.nix index 6c4d29b..7149c83 100644 --- a/nixos/common/configuration.nix +++ b/nixos/common/configuration.nix @@ -2,7 +2,7 @@ let host = config.networking.hostName; - user = config.userdata.user; + user = config.userdata.name; email = config.userdata.email; in { diff --git a/nixos/common/modules/dev.nix b/nixos/common/modules/dev.nix index 7223d08..285dfba 100644 --- a/nixos/common/modules/dev.nix +++ b/nixos/common/modules/dev.nix @@ -1,7 +1,7 @@ { config, pkgs, ... }: let - user = config.userdata.user; + user = config.userdata.name; in { users.users.${user}.packages = with pkgs; [ diff --git a/nixos/dspace/configuration.nix b/nixos/dspace/configuration.nix index 48334af..0a28af6 100644 --- a/nixos/dspace/configuration.nix +++ b/nixos/dspace/configuration.nix @@ -1,7 +1,7 @@ { config, ... }: let - user = config.userdata.user; + user = config.userdata.name; in { imports = [ diff --git a/nixos/fscusat/modules/mirror/debian/default.nix b/nixos/fscusat/modules/mirror/debian/default.nix index da56ade..c052bdd 100644 --- a/nixos/fscusat/modules/mirror/debian/default.nix +++ b/nixos/fscusat/modules/mirror/debian/default.nix @@ -1,5 +1,5 @@ { config, ... }: let - name = config.userdata.user; + name = config.userdata.name; email = config.userdata.email; in { imports = [ ./ftpsync.nix ]; diff --git a/nixos/kay/modules/cgit.nix b/nixos/kay/modules/cgit.nix index 2ef95fb..f8fb25c 100644 --- a/nixos/kay/modules/cgit.nix +++ b/nixos/kay/modules/cgit.nix @@ -2,7 +2,7 @@ let domain = config.userdata.domain; - user = config.userdata.user; + user = config.userdata.name; in { environment.systemPackages = with pkgs; [ diff --git a/nixos/kay/modules/mail.nix b/nixos/kay/modules/mail.nix index 63959b8..2de1f39 100644 --- a/nixos/kay/modules/mail.nix +++ b/nixos/kay/modules/mail.nix @@ -2,7 +2,7 @@ ipv6 = "2001:470:ee65::1337"; domain = config.userdata.domain; - username = config.userdata.user; + username = config.userdata.name; secret = "$argon2i$v=19$m=4096,t=3,p=1$SWV5aWU3YWUgZWFTNm9oc28gTGFvdDdlRG8ga2FTaWVjaDYgYWV0aDFHb28$O/sDv7oy9wUxFjvKoxB5o8ZnPvjYJo9DjX0C/AZQFF0"; email = [ "${username}@${domain}" diff --git a/nixos/kay/modules/sftp.nix b/nixos/kay/modules/sftp.nix index 07b1449..bbe055e 100644 --- a/nixos/kay/modules/sftp.nix +++ b/nixos/kay/modules/sftp.nix @@ -2,7 +2,7 @@ let storage = "/hdd/users"; - user = config.userdata.user; + user = config.userdata.name; pubKeys = config.users.users.${user}.openssh.authorizedKeys.keys; in { diff --git a/userdata.nix b/userdata.nix index ebcd1db..564f1f0 100644 --- a/userdata.nix +++ b/userdata.nix @@ -6,12 +6,12 @@ let in { options.userdata = { - user = mkOption { + name = mkOption { type = types.str; default = "sinan"; description = "Owner's username"; }; - userFq = mkOption { + nameFq = mkOption { type = types.str; default = "sinanmohd"; description = "Owner's fully qualified username"; @@ -23,7 +23,7 @@ in }; email = mkOption { type = types.str; - default = "${cfg.user}@${cfg.domain}"; + default = "${cfg.name}@${cfg.domain}"; description = "Owner's email"; }; }; -- cgit v1.2.3