diff --git a/modules/features/terminal/git.nix b/modules/features/terminal/git.nix index b957cac..721ec18 100644 --- a/modules/features/terminal/git.nix +++ b/modules/features/terminal/git.nix @@ -33,8 +33,8 @@ # user details user = { - name = "serenity-F"; - email = "serenity-F@noreply.codeberg.org"; + name = "${user-parts.git.username}"; + email = "${user-parts.git.email}"; # path to signing key signingKey = "/home/${user-parts.user.username}/.ssh/id_ed25519.pub"; diff --git a/modules/system/user-parts.nix b/modules/system/user-parts.nix index e1eca8e..d1ee253 100644 --- a/modules/system/user-parts.nix +++ b/modules/system/user-parts.nix @@ -25,43 +25,62 @@ { options.nixos.user-parts = { + user = lib.mkOption { type = lib.types.submodule { options = { + username = lib.mkOption { type = lib.types.str; default = "user"; }; + + avatar = lib.mkOption { + type = lib.types.str; + default = "avatar.png"; + }; + + home-directory = lib.mkOption { + type = lib.types.str; + }; + + default-locale = lib.mkOption { + type = lib.types.str; + default = "en_US.UTF-8"; + }; + }; }; default = { }; }; + shell = lib.mkOption { + type = lib.types.submodule { + options = { + user-shell = lib.mkOption { + type = lib.types.str; + default = "pkgs.fish"; + }; + }; + }; + }; + git = lib.mkOption { type = lib.types.submodule { options = { username = lib.mkOption { type = lib.types.str; - default = "DontBlameMe"; + default = "serenity-F"; }; email = lib.mkOption { type = lib.types.str; - default = "dontblameme@noreply.codeberg.org"; + default = "serenity-F@noreply.codeberg.org"; }; }; }; default = { }; }; - home-directory = lib.mkOption { - type = lib.types.str; - }; - - default-locale = lib.mkOption { - type = lib.types.str; - default = "en_US.UTF-8"; - }; - }; config = { diff --git a/modules/system/user.nix b/modules/system/user.nix index ba0e575..3060bfa 100644 --- a/modules/system/user.nix +++ b/modules/system/user.nix @@ -27,16 +27,20 @@ ]; - nixos.user-parts = { - user.username = "serenity"; - }; - # configure user here - #config.user-options = { - #username = "serenity"; - #dots = "/home/serenity/SerenityOS"; - # see `modules/features/stylix.nix` for theme declared above - #}; + nixos.user-parts = { + user = { + username = "serenity"; + avatar = "../../assets/media/avatars/carpet.jpg"; + home-directory = "/home/serenity/" + default-locale = "en_AU.UTF-8"; + }; + git = { + username = "serenity-F"; + email = "serenity-F@noreply.codeberg.org"; + }; + + }; # nixos user declaration users.users.${user-parts.user.username} = {