ambroisie/nix-config
ambroisie/nix-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

modules: change username configuration option

Browse source 
It makes more sense to have a `my.user` option.
This commit is contained in:
Bruno BELANYI 2021-06-25 20:40:34 +02:00
parent 0ff730bf44
commit 76cac9af51
4 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
flake.nix
View file

@ -72,7 +72,7 @@
} }
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
({ config, ... }: { ({ config, ... }: {
home-manager.users.${config.my.username} = import ./home; home-manager.users.${config.my.user.name} = import ./home;
# Nix Flakes compatibility # Nix Flakes compatibility
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;

4
modules/default.nix
View file

@ -10,11 +10,13 @@
]; ];
options.my = with lib; { options.my = with lib; {
username = mkOption { user = {
name = mkOption {
type = types.str; type = types.str;
default = "ambroisie"; default = "ambroisie";
example = "alice"; example = "alice";
description = "my username"; description = "my username";
}; };
}; };
};
} }

2
modules/home.nix
View file

@ -1,7 +1,7 @@
# Simplify setting home options # Simplify setting home options
{ config, lib, ... }: { config, lib, ... }:
let let
actualPath = [ "home-manager" "users" config.my.username "my" "home" ]; actualPath = [ "home-manager" "users" config.my.user.name "my" "home" ];
aliasPath = [ "my" "home" ]; aliasPath = [ "my" "home" ];
in in
{ {

4
modules/system/users.nix
View file

@ -20,8 +20,8 @@ in
inherit (secrets.users.root) hashedPassword; inherit (secrets.users.root) hashedPassword;
}; };
${config.my.username} = { ${config.my.user.name} = {
inherit (secrets.users.${config.my.username}) hashedPassword; inherit (secrets.users.${config.my.user.name}) hashedPassword;
description = "Bruno BELANYI"; description = "Bruno BELANYI";
isNormalUser = true; isNormalUser = true;
shell = pkgs.zsh; shell = pkgs.zsh;