diff --git a/configs/nixos/_users/admin/default.nix b/configs/nixos/_users/admin/default.nix index 2418f57b..459c90d5 100644 --- a/configs/nixos/_users/admin/default.nix +++ b/configs/nixos/_users/admin/default.nix @@ -13,7 +13,6 @@ in openssh.authorizedKeys.keyFiles = [ ../../../home-manager/foo-dogsquared/files/ssh-key.pub ../../../home-manager/foo-dogsquared/files/ssh-key-2.pub - ../../ni/files/ssh-key.pub ]; }; @@ -33,9 +32,4 @@ in # This is also a trusted user for the Nix daemon. nix.settings.trusted-users = [ name ]; - - # Allow the user to easily enter into several services such as the database - # services to allowing some debugging. - services.postgresql.ensureUsers = [{ inherit name; }]; - services.mysql.ensureUsers = [{ inherit name; }]; } diff --git a/configs/nixos/_users/plover/default.nix b/configs/nixos/_users/plover/default.nix index 068df0f7..3d40710a 100644 --- a/configs/nixos/_users/plover/default.nix +++ b/configs/nixos/_users/plover/default.nix @@ -8,20 +8,22 @@ in { users.users.${user} = { home = "/home/${user}"; - hashedPassword = "$6$gpgBrL3.RAGa9NBp$93Ac5ZW53KcgbA9q4awVKA.bVArP7Hw1NbyakT30Mav.7obIuN17WWijT.EaBSJU6ArvdXTehC3xZ9/9oZPDR0"; - extraGroups = [ "wheel" "wireshark" ]; + hashedPassword = "$y$j9T$43ExH5GLbEGwgnNGhmcTD/$qXoZE5Cm9O2Z3zMM/VyCZ18qN2Hc9.KvCnVz6tmjVVD"; + extraGroups = [ "wheel" ]; useDefaultShell = true; isNormalUser = true; description = "The go-to user for server systems."; + openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGo3tfNQjWZ5pxlqREfBgQJxdNzGHKJIy5hDS9Z+Hpth plover.foodogsquared.one" + ]; + openssh.authorizedKeys.keyFiles = [ ../../../home-manager/foo-dogsquared/files/ssh-key.pub ../../../home-manager/foo-dogsquared/files/ssh-key-2.pub ]; }; - programs.wireshark.enable = true; - home-manager.users.${user} = { imports = [ homeManagerUser ]; };