diff options
| author | Ethel Morgan <eth@ethulhu.co.uk> | 2020-05-29 21:50:38 +0100 |
|---|---|---|
| committer | Ethel Morgan <eth@ethulhu.co.uk> | 2020-05-29 21:50:38 +0100 |
| commit | 3fa100e7539e25e60d4094d43cb69ae663742556 (patch) | |
| tree | 8b135a85d7f62f9030ff3fb44b60b77075b5e5e2 | |
| parent | 433a9ffcbddda74b0449eba251246a60221ae7cd (diff) | |
move users.nix around
| -rw-r--r-- | nixos/modules/module-list.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/users/eth.nix (renamed from nixos/modules/users.nix) | 18 |
2 files changed, 9 insertions, 11 deletions
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 3985e25..e8f27d8 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -10,6 +10,6 @@ ./services/snapclient.nix ./services/ssh.nix ./services/upmpdcli.nix - ./users.nix + ./users/eth.nix ./yubikey.nix ] diff --git a/nixos/modules/users.nix b/nixos/modules/users/eth.nix index ea08cf5..c90652f 100644 --- a/nixos/modules/users.nix +++ b/nixos/modules/users/eth.nix @@ -2,7 +2,7 @@ with lib; let - cfg = config.eth.users; + cfg = config.eth.users.eth; defaultPackages = with pkgs; [ direnv @@ -15,24 +15,22 @@ let in { - options.eth.users = { - eth = { - enable = mkEnableOption "Create the user eth"; + options.eth.users.eth = { + enable = mkEnableOption "Create the user eth"; - extraPackages = mkOption { - type = types.listOf types.package; - default = []; - }; + extraPackages = mkOption { + type = types.listOf types.package; + default = []; }; }; config = { - users.users.eth = mkIf cfg.eth.enable { + users.users.eth = mkIf cfg.enable { isNormalUser = true; extraGroups = [ "wheel" ]; shell = pkgs.fish; - packages = defaultPackages ++ cfg.eth.extraPackages; + packages = defaultPackages ++ cfg.extraPackages; openssh.authorizedKeys.keys = [ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCqcW3HzqQxPUjZteAs5HmDbCEAtHcThnj7qfJacEXBmpO5srinU3mhV/EhrqcAMkEoEIS2az2uQQEsF13nEqDD1uZh/Q7qwEnZepzElgBOIToQ+Np2qziRExV3ROBddJfmD3XBTPc7wA5BohYku+eCsfR37ZrRTgKUIALhZ4MSRxgQqnhtgaxHpL2Nk6ZdxRHO1ISlcmiWhOETP0fj76zN4+CgSv4rkPdYxKYpWVT8XTdKgu6ENbAPbOBzplui9MmrdS17ZaWy0KrKCiyMjhA5qSsOxWLXKL9P8lRuuXkWAl5cpt3vWWKAOzlLV1UCUbtlBblyH2KkeIKfO8AC45wX keychain@eth.moe" "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDGf+geluXR5/hxK2OthfS+bG+7QbUVqV25bslT4KgMid+zkOVeWfA49n8/iuXUjYZmB0hP9oiFkM1wjFfC5JtET1OX3V8r0nuexXfhvG4gtWIk6Yw5HfPLv1qYYti4SrPKgQlP+C2i6WjHO6Y4VWSpJkgXgO+XvEa57fGSsjcy3rV6l/B56tpIhNchvwVxm1gHJnb4eZAKtQYcz8Pven2TFNFGLMMzQ7Y7JWAH80TDrdUywxfktaKmswo4rQ6i3zUKXrzaPuaH+egoNLqfZqM3+Q92PWs8bU2Y7uxXUQJXD32KuStRUwEz32A+O55nVVGTrnwKUUqnx9H04KCYBOVP backup@eth.moe" |