From e9c77afd7328631aee9b362a0ecd3309b9ad38f4 Mon Sep 17 00:00:00 2001 From: Don Harper Date: Sat, 10 Aug 2024 11:29:14 -0500 Subject: [PATCH] hosts/workstation | update to match changes upstream --- hosts/workstation/default.nix | 44 +++++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/hosts/workstation/default.nix b/hosts/workstation/default.nix index c04164e..00fac77 100644 --- a/hosts/workstation/default.nix +++ b/hosts/workstation/default.nix @@ -53,13 +53,16 @@ in { }; # Select internationalisation properties. - i18n.defaultLocale = "en_US.utf8"; - i18n.inputMethod = { - enabled = "fcitx5"; - fcitx5.addons = with pkgs; [ - fcitx5-mozc - fcitx5-gtk - ]; + i18n = { + defaultLocale = "en_US.utf8"; + inputMethod = { + enabled = true; + type = "fcitx5"; + fcitx5.addons = with pkgs; [ + fcitx5-mozc + fcitx5-gtk + ]; + }; }; # Bootloader. @@ -219,14 +222,25 @@ in { ]; }; - users.users.don = { - isNormalUser = true; - initialPassword = "changeme"; - description = "Don Harper"; - extraGroups = ["networkmanager" "wheel" "scanner" "lp" "video" "mlocate" "disk"]; - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINd8AdVbQQ/Fmw+b9mI8EMYqIoRkwmSwAOtmlte3incL don@loki" - ]; + users = { + users = { + root = { + initialPassword = "changeme"; + description = "root of all evil"; + openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINd8AdVbQQ/Fmw+b9mI8EMYqIoRkwmSwAOtmlte3incL don@loki" + ]; + }; + don = { + isNormalUser = true; + initialPassword = "changeme"; + description = "Don Harper"; + extraGroups = ["networkmanager" "wheel" "scanner" "lp" "video" "mlocate" "disk"]; + openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINd8AdVbQQ/Fmw+b9mI8EMYqIoRkwmSwAOtmlte3incL don@loki" + ]; + }; + }; }; zramSwap = {