diff --git a/README.md b/README.md
index f48f44e..df9d30d 100644
--- a/README.md
+++ b/README.md
@@ -391,7 +391,7 @@ journalctl --user --follow
 
 While I was on a bike tour I did some config changes to update my NixOS servers using only my smartphone and Nitrokey (GPG smartcard):
 
-- `home-manager.users.yoda.programs.git.signing.signByDefault = false;`
+- `home-manager.users."yoda".programs.git.signing.signByDefault = false;`
 - Import `../../modules/git.nix` in `hosts/yodaNas/configuration.nix`
 - Import `./../modules/docker-pushrm.nix` in `hosts/yodaNas/configuration.nix`
 - In `hieve.nix`, set `allowLocalDeployment` to `true` for `yodaNas` and `yodaHedgehog`
diff --git a/hosts/pi3bplus/configuration.nix b/hosts/pi3bplus/configuration.nix
index 6f3f1cc..7e33ab0 100644
--- a/hosts/pi3bplus/configuration.nix
+++ b/hosts/pi3bplus/configuration.nix
@@ -56,7 +56,7 @@
     enable = true;
     settings.PasswordAuthentication = false;
   };
-  users.users.root.openssh.authorizedKeys.keys = [
+  users.users."root".openssh.authorizedKeys.keys = [
     (builtins.readFile ./assets/ssh/nitrokey.pub)
   ];
 
diff --git a/hosts/yodaHedgehog/ssh-client-root.nix b/hosts/yodaHedgehog/ssh-client-root.nix
index 811991d..8d3c3ed 100644
--- a/hosts/yodaHedgehog/ssh-client-root.nix
+++ b/hosts/yodaHedgehog/ssh-client-root.nix
@@ -1,6 +1,6 @@
 { config, pkgs, ... }:
 {
-  home-manager.users.root = { osConfig, config, pkgs, ... }: {
+  home-manager.users."root" = { osConfig, config, pkgs, ... }: {
 
     # SSH client configuration.
     programs.ssh = {
diff --git a/hosts/yodaYoga/BikeTripPlanner.nix b/hosts/yodaYoga/BikeTripPlanner.nix
index 9c8e465..dff878d 100644
--- a/hosts/yodaYoga/BikeTripPlanner.nix
+++ b/hosts/yodaYoga/BikeTripPlanner.nix
@@ -13,7 +13,7 @@
   ];
 
   # Download BikeTripPlanner Git repository.
-  home-manager.users.yoda = { osConfig, config, pkgs, ... }: {
+  home-manager.users."yoda" = { osConfig, config, pkgs, ... }: {
     home.file."readonly-git/BikeTripPlanner".source = (builtins.fetchGit {
       url = "https://github.com/langbein-daniel/BikeTripPlanner";
       #rev = "6d4daf18235189825b0c314901b1617ece6d8641";
diff --git a/iso-aarch64.nix b/iso-aarch64.nix
index b433f62..ae7a17f 100644
--- a/iso-aarch64.nix
+++ b/iso-aarch64.nix
@@ -34,7 +34,7 @@
     enable = true;
     settings.PasswordAuthentication = false;
   };
-  users.users.root.openssh.authorizedKeys.keys = [
+  users.users."root".openssh.authorizedKeys.keys = [
     (builtins.readFile ./assets/ssh/nitrokey.pub)
   ];
   hardware.enableRedistributableFirmware = true;
diff --git a/modules/android.nix b/modules/android.nix
index 02b4174..5a9105b 100644
--- a/modules/android.nix
+++ b/modules/android.nix
@@ -4,7 +4,7 @@
 
   # https://nixos.wiki/wiki/Android#adb_setup
   programs.adb.enable = true;
-  users.users.yoda.extraGroups = [ "adbusers" "plugdev" ];
+  users.users."yoda".extraGroups = [ "adbusers" "plugdev" ];
 
   # plugdev group: https://developer.android.com/studio/run/device
   # How to add user to new group: https://superuser.com/a/1352988
diff --git a/modules/ark.nix b/modules/ark.nix
index cc0a2a8..ae69e1d 100644
--- a/modules/ark.nix
+++ b/modules/ark.nix
@@ -36,7 +36,7 @@ in
    "unrar"
   ];
 
-  users.users.yoda = {
+  users.users."yoda" = {
     packages = with pkgs; [
       ark-with-unrar # Archive manager: Compress and decompress
     ];
diff --git a/modules/autostart.nix b/modules/autostart.nix
index 01fe35c..6db6b80 100644
--- a/modules/autostart.nix
+++ b/modules/autostart.nix
@@ -3,7 +3,7 @@
   # See also:
   #   Temporary workaround until https://github.com/nix-community/home-manager/issues/3447 is merged.
 
-  home-manager.users.yoda = { osConfig, config, pkgs, ... }: {
+  home-manager.users."yoda" = { osConfig, config, pkgs, ... }: {
     home.file."keepassxc" = {
       target = ".config/autostart/org.keepassxc.KeePassXC.desktop";
       source = (pkgs.keepassxc + "/share/applications/org.keepassxc.KeePassXC.desktop");
diff --git a/modules/base-minimal.nix b/modules/base-minimal.nix
index 8e3d095..7bcad62 100644
--- a/modules/base-minimal.nix
+++ b/modules/base-minimal.nix
@@ -51,7 +51,7 @@
 
   # Define a user account.
   # Don't forget to set a password with `passwd`.
-  users.users.yoda = {
+  users.users."yoda" = {
     isNormalUser = true;
     description = "Yoda";
     extraGroups = [ "wheel" ];
@@ -74,7 +74,7 @@
   # Options only for build.system.vm - they won’t get applied when building build.system.toplevel aka the normal system config.
   # https://discourse.nixos.org/t/wayland-compositors-an-build-vm-not-working/46486/2
   virtualisation.vmVariant = {
-    users.users.yoda.initialPassword = "asdf";
+    users.users."yoda".initialPassword = "asdf";
     virtualisation.qemu.options = [
       "-device virtio-vga-gl"
       "-display sdl,gl=on,show-cursor=off"
diff --git a/modules/base.nix b/modules/base.nix
index 0a7c91d..dfc6d5f 100644
--- a/modules/base.nix
+++ b/modules/base.nix
@@ -32,7 +32,7 @@
   # Enable networking.
   networking.networkmanager.enable = true;
   #
-  users.users.yoda = {
+  users.users."yoda" = {
     extraGroups = [ "networkmanager" ];
   };
 
diff --git a/modules/bash.nix b/modules/bash.nix
index e4651a4..1608b09 100644
--- a/modules/bash.nix
+++ b/modules/bash.nix
@@ -18,10 +18,10 @@ in
   # Required by home-manager programs.bash.enableCompletion
   environment.pathsToLink = [ "/share/bash-completion" ];
 
-  home-manager.users.yoda = { osConfig, config, pkgs, ... }: {
+  home-manager.users."yoda" = { osConfig, config, pkgs, ... }: {
     programs.bash = bash-config;
   };
-  home-manager.users.root = { osConfig, config, pkgs, ... }: {
+  home-manager.users."root" = { osConfig, config, pkgs, ... }: {
     programs.bash = bash-config;
   };
 }
diff --git a/modules/blackbox.nix b/modules/blackbox.nix
index 2d0bed8..daa53da 100644
--- a/modules/blackbox.nix
+++ b/modules/blackbox.nix
@@ -3,7 +3,7 @@
   # A direct integration in Nautilus is still in progress: https://gitlab.gnome.org/raggesilver/blackbox/-/issues/20
   # Thus, we use nautilus-open-any-terminal.
 
-  users.users.yoda = {
+  users.users."yoda" = {
     packages = with pkgs; [
        blackbox-terminal # Terminal emulator. Can show notifications for commands finished in the background.
        nautilus-open-any-terminal # For Nautilus (GNOME files) integration
@@ -11,7 +11,7 @@
   };
 
   programs.dconf.enable = true;
-  home-manager.users.yoda = { osConfig, config, pkgs, ... }: {
+  home-manager.users."yoda" = { osConfig, config, pkgs, ... }: {
     dconf.settings = {
       # For Nautilus (GNOME files) integration
       "com/github/stunkymonkey/nautilus-open-any-terminal" = {
diff --git a/modules/boxes.nix b/modules/boxes.nix
index bf70b55..2396018 100644
--- a/modules/boxes.nix
+++ b/modules/boxes.nix
@@ -7,7 +7,7 @@
 
   # Open issue: HiDPI support. https://gitlab.gnome.org/GNOME/gnome-boxes/-/issues/635
 
-  users.users.yoda = {
+  users.users."yoda" = {
     packages = with pkgs; [
       gnome-boxes # Virtual machines
     ];
@@ -16,7 +16,7 @@
   # libvirt is a dependency of GNOME Boxes
   # https://nixos.wiki/wiki/Libvirt
   virtualisation.libvirtd.enable = true;
-  users.users.yoda.extraGroups = [ "libvirtd" ];
+  users.users."yoda".extraGroups = [ "libvirtd" ];
 
   # Required for USB redirection to work, see
   #   https://github.com/NixOS/nixpkgs/issues/39129#issuecomment-382569032
diff --git a/modules/digikam-rawtherapee-hugin-gimp.nix b/modules/digikam-rawtherapee-hugin-gimp.nix
index 7595fbb..149878a 100644
--- a/modules/digikam-rawtherapee-hugin-gimp.nix
+++ b/modules/digikam-rawtherapee-hugin-gimp.nix
@@ -1,6 +1,6 @@
 { config, pkgs, ... }:
 {
-  users.users.yoda = {
+  users.users."yoda" = {
     packages = with pkgs; [
       # TODO: Temporary fix until exiftool fix is landed in NixOS stable
       # https://github.com/NixOS/nixpkgs/issues/332561
diff --git a/modules/dosbox-x.nix b/modules/dosbox-x.nix
index 313439c..fcf9947 100644
--- a/modules/dosbox-x.nix
+++ b/modules/dosbox-x.nix
@@ -1,6 +1,6 @@
 { config, pkgs, ... }:
 {
-  users.users.yoda = {
+  users.users."yoda" = {
     packages = with pkgs; [
       dosbox-x # Virtual machines with DOS-based Windows such as Windows 3.x and Windows 9x
     ];
diff --git a/modules/element-desktop.nix b/modules/element-desktop.nix
index 322242b..a39da2b 100644
--- a/modules/element-desktop.nix
+++ b/modules/element-desktop.nix
@@ -18,7 +18,7 @@
   # Workaround: Use Flatpak version ...
   # Discussion on GitHub: https://github.com/NixOS/nixpkgs/issues/343806 AMD GPUs and NixOS - 'Cannot find target for triple amdgcn-- Unable to find target for this triple (no targets are registered)'
 
-  users.users.yoda = {
+  users.users."yoda" = {
     packages = with pkgs; [
       # Matrix chat client.
       element-desktop
diff --git a/modules/file-roller.nix b/modules/file-roller.nix
index 0ef23a1..a57d5d3 100644
--- a/modules/file-roller.nix
+++ b/modules/file-roller.nix
@@ -1,6 +1,6 @@
 { lib, config, pkgs, ... }:
 {
-  users.users.yoda = {
+  users.users."yoda" = {
     packages = with pkgs; [
       file-roller # Archive manager: Compress and decompress
       lz4 # Add support to extract lz4 archives
diff --git a/modules/firefox.nix b/modules/firefox.nix
index 138dad7..03d8052 100644
--- a/modules/firefox.nix
+++ b/modules/firefox.nix
@@ -1,6 +1,6 @@
 { config, pkgs, lib, ... }:
 {
-  users.users.yoda = {
+  users.users."yoda" = {
     packages = with pkgs; [
       firefox # Web browser
     ];
@@ -14,7 +14,7 @@
   # Required for dconf.settings
   programs.dconf.enable = true;
 
-  home-manager.users.yoda = { osConfig, config, pkgs, ... }: {
+  home-manager.users."yoda" = { osConfig, config, pkgs, ... }: {
     dconf.settings = {
       "org/gnome/shell" = {
         favorite-apps = ["firefox.desktop"];
diff --git a/modules/freetube.nix b/modules/freetube.nix
index d7ad972..c6c640f 100644
--- a/modules/freetube.nix
+++ b/modules/freetube.nix
@@ -1,6 +1,6 @@
 { config, pkgs, lib, ... }:
 {
-  users.users.yoda = {
+  users.users."yoda" = {
     packages = with pkgs; [
       unstable.freetube # YouTube client.
     ];
diff --git a/modules/fwupd-gnome.nix b/modules/fwupd-gnome.nix
index 2fa4909..d5f65b1 100644
--- a/modules/fwupd-gnome.nix
+++ b/modules/fwupd-gnome.nix
@@ -3,7 +3,7 @@
   # Enable firmware update daemon
   services.fwupd.enable = true;
 
-  users.users.yoda = {
+  users.users."yoda" = {
     packages = with pkgs; [
       # Install firmware on devices supported by fwupd.
       gnome-firmware
diff --git a/modules/fzf.nix b/modules/fzf.nix
index 80a3a8e..78c0fc4 100644
--- a/modules/fzf.nix
+++ b/modules/fzf.nix
@@ -17,19 +17,19 @@ let
   };
 in
 {
-  home-manager.users.yoda = { osConfig, config, pkgs, ... }: {
+  home-manager.users."yoda" = { osConfig, config, pkgs, ... }: {
     programs.fzf = fzf-config;
   };
-  home-manager.users.root = { osConfig, config, pkgs, ... }: {
+  home-manager.users."root" = { osConfig, config, pkgs, ... }: {
     programs.fzf = fzf-config;
   };
 
-  users.users.yoda = {
+  users.users."yoda" = {
     packages = with pkgs; [
       fd
     ];
   };
-  users.users.root = {
+  users.users."root" = {
     packages = with pkgs; [
       fd
     ];
diff --git a/modules/games.nix b/modules/games.nix
index c2dd6f6..8b4439e 100644
--- a/modules/games.nix
+++ b/modules/games.nix
@@ -42,7 +42,7 @@
     "dotnet-sdk-6.0.428"
   ];
 
-  users.users.yoda = {
+  users.users."yoda" = {
     packages = with pkgs; [
       #
       # Sandbox
diff --git a/modules/ghostwriter.nix b/modules/ghostwriter.nix
index b18a37f..6b625e0 100644
--- a/modules/ghostwriter.nix
+++ b/modules/ghostwriter.nix
@@ -1,6 +1,6 @@
 { config, pkgs, lib, ... }:
 {
-  users.users.yoda = {
+  users.users."yoda" = {
     packages = with pkgs; [
       libsForQt5.ghostwriter # Markdown editor
     ];
@@ -9,7 +9,7 @@
   # This fixes blurry fonts with fractional scaling on Wayland.
   environment.sessionVariables.QT_QPA_PLATFORM = lib.mkIf (config.services.xserver.displayManager.gdm.wayland) "wayland";
 
-  home-manager.users.yoda = { osConfig, config, pkgs, ... }: {
+  home-manager.users."yoda" = { osConfig, config, pkgs, ... }: {
     home.file.".config/kde.org/ghostwriter.conf" = {
       text = ''
         [Application]
diff --git a/modules/git.nix b/modules/git.nix
index d8bc743..cb1b78b 100644
--- a/modules/git.nix
+++ b/modules/git.nix
@@ -1,12 +1,12 @@
 { config, pkgs, ... }:
 {
-  users.users.yoda = {
+  users.users."yoda" = {
     packages = with pkgs; [
       git
     ];
   };
 
-  home-manager.users.yoda = { osConfig, config, pkgs, ... }: {
+  home-manager.users."yoda" = { osConfig, config, pkgs, ... }: {
     programs.git = {
       enable = true;
       userName = "Daniel Langbein";
diff --git a/modules/gnome-config.nix b/modules/gnome-config.nix
index b40f6eb..61f8ff7 100644
--- a/modules/gnome-config.nix
+++ b/modules/gnome-config.nix
@@ -23,7 +23,7 @@
 
   programs.dconf.enable = true;
 
-  home-manager.users.yoda = { osConfig, config, pkgs, lib, ... }: {
+  home-manager.users."yoda" = { osConfig, config, pkgs, lib, ... }: {
     home.file = {
       # Templates to create new Files with Nautilus.
       # It is also possible to group them by category
diff --git a/modules/gnome-extensions.nix b/modules/gnome-extensions.nix
index 4e75c86..43654d1 100644
--- a/modules/gnome-extensions.nix
+++ b/modules/gnome-extensions.nix
@@ -11,7 +11,7 @@
 
   programs.dconf.enable = true;
 
-  users.users.yoda = {
+  users.users."yoda" = {
     packages = with pkgs.gnomeExtensions; [
       caffeine
       #openweather
@@ -26,7 +26,7 @@
   # If on X11: Enable dependency of "x11-gestures".
   services.touchegg.enable = lib.mkIf (! config.services.xserver.displayManager.gdm.wayland) true;
 
-  home-manager.users.yoda = { osConfig, config, pkgs, ... }: {
+  home-manager.users."yoda" = { osConfig, config, pkgs, ... }: {
 # TODO: Alternative
 #    home.packages = with pkgs.gnomeExtensions; [
 #      caffeine
diff --git a/modules/gnome-fractional-scaling.nix b/modules/gnome-fractional-scaling.nix
index f6c24af..ae85c31 100644
--- a/modules/gnome-fractional-scaling.nix
+++ b/modules/gnome-fractional-scaling.nix
@@ -22,7 +22,7 @@
 
   programs.dconf.enable = true;
 
-  home-manager.users.yoda = { osConfig, config, pkgs, ... }: {
+  home-manager.users."yoda" = { osConfig, config, pkgs, ... }: {
     dconf.settings = {
       "org/gnome/mutter" = {
         experimental-features = ["scale-monitor-framebuffer" "xwayland-native-scaling"];
diff --git a/modules/gnome-terminal.nix b/modules/gnome-terminal.nix
index 59de5f0..8a0c732 100644
--- a/modules/gnome-terminal.nix
+++ b/modules/gnome-terminal.nix
@@ -1,6 +1,6 @@
 { config, pkgs, ... }:
 {
-  users.users.yoda = {
+  users.users."yoda" = {
     packages = with pkgs; [
       #gnome.gnome-terminal # Terminal emulator
       nautilus-open-any-terminal # For Nautilus (GNOME files) integration
@@ -10,7 +10,7 @@
   # For Nautilus (GNOME files) integration
   programs.dconf.enable = true;
 
-  home-manager.users.yoda = { osConfig, config, pkgs, ... }: {
+  home-manager.users."yoda" = { osConfig, config, pkgs, ... }: {
     dconf.settings = {
       # For Nautilus (GNOME files) integration
       "com/github/stunkymonkey/nautilus-open-any-terminal" = {
diff --git a/modules/gnome-wallpaper.nix b/modules/gnome-wallpaper.nix
index ac309b2..85faa4d 100644
--- a/modules/gnome-wallpaper.nix
+++ b/modules/gnome-wallpaper.nix
@@ -4,7 +4,7 @@
 
   programs.dconf.enable = true;
 
-  home-manager.users.yoda = { osConfig, config, pkgs, ... }: {
+  home-manager.users."yoda" = { osConfig, config, pkgs, ... }: {
     dconf.settings = {
         "org/gnome/desktop/background" = {
             "picture-uri" = "/home/yoda/.config/background";
diff --git a/modules/headless.nix b/modules/headless.nix
index 8d1955d..46466bb 100644
--- a/modules/headless.nix
+++ b/modules/headless.nix
@@ -1,6 +1,6 @@
 { config, pkgs, ... }:
 {
-  users.users.yoda = {
+  users.users."yoda" = {
     packages = with pkgs; [
       #zenith # Terminal resource monitor / task manager
       btop   # Terminal resource monitor / task manager
diff --git a/modules/home-manager.nix b/modules/home-manager.nix
index aea57ac..6224779 100644
--- a/modules/home-manager.nix
+++ b/modules/home-manager.nix
@@ -19,12 +19,12 @@ in
   # https://nix-community.github.io/home-manager/index.html#sec-install-nixos-module
   home-manager.useGlobalPkgs = true;
 
-  home-manager.users.yoda = { osConfig, config, pkgs, ... }: {
+  home-manager.users."yoda" = { osConfig, config, pkgs, ... }: {
     # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
     # Switching to a higher state version typically requires performing some manual steps, such as data conversion or moving files.
     home.stateVersion = "24.11";
   };
-  home-manager.users.root = { osConfig, config, pkgs, ... }: {
+  home-manager.users."root" = { osConfig, config, pkgs, ... }: {
     # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
     # Switching to a higher state version typically requires performing some manual steps, such as data conversion or moving files.
     home.stateVersion = "24.11";
diff --git a/modules/jetbrains-ide.nix b/modules/jetbrains-ide.nix
index 9c165e7..ec8390d 100644
--- a/modules/jetbrains-ide.nix
+++ b/modules/jetbrains-ide.nix
@@ -41,14 +41,14 @@ in
     # TODO: Currently markdown previews are broken anyways because of issues with the sandboxed webbrowser on NixOS
   ];
 
-  users.users.yoda = {
+  users.users."yoda" = {
     packages = with pkgs; [
       jetbrains."${version}"
     ];
   };
 
   programs.dconf.enable = true;
-  home-manager.users.yoda = { osConfig, config, pkgs, lib, ... }: {
+  home-manager.users."yoda" = { osConfig, config, pkgs, lib, ... }: {
     dconf.settings = {
       "org/gnome/shell" = {
         favorite-apps = ["${version}.desktop"];
diff --git a/modules/joplin-desktop.nix b/modules/joplin-desktop.nix
index 3558001..9deb2f5 100644
--- a/modules/joplin-desktop.nix
+++ b/modules/joplin-desktop.nix
@@ -3,7 +3,7 @@
   # TODO: Only if display scaling != 1
   environment.sessionVariables.NIXOS_OZONE_WL = lib.mkIf (config.services.xserver.displayManager.gdm.wayland) "1";
 
-  users.users.yoda = {
+  users.users."yoda" = {
     packages = with pkgs; [
       joplin-desktop # Markdown notes
     ];
diff --git a/modules/nitrokey-gpg-smartcard.nix b/modules/nitrokey-gpg-smartcard.nix
index 0f34dd2..7bbcc40 100644
--- a/modules/nitrokey-gpg-smartcard.nix
+++ b/modules/nitrokey-gpg-smartcard.nix
@@ -121,7 +121,7 @@
   #  pinentry-gnome
   #];
 
-  #users.users.yoda = {
+  #users.users."yoda" = {
   #  packages = with pkgs; [
   #    #pinentry-curses
   #    pinentry-gnome
@@ -146,7 +146,7 @@
   # Smartcard daemon.
   services.pcscd.enable = true;
 
-  home-manager.users.yoda = { osConfig, config, pkgs, ... }: {
+  home-manager.users."yoda" = { osConfig, config, pkgs, ... }: {
 
     # Disable GNOME Keyring. See comment above.
     #
diff --git a/modules/obsidian.nix b/modules/obsidian.nix
index 867ce4c..6079f24 100644
--- a/modules/obsidian.nix
+++ b/modules/obsidian.nix
@@ -10,14 +10,14 @@
     "obsidian"
   ];
 
-  users.users.yoda = {
+  users.users."yoda" = {
     packages = with pkgs; [
       obsidian # Markdown notes
     ];
   };
 
   programs.dconf.enable = true;
-  home-manager.users.yoda = { osConfig, config, pkgs, lib, ... }: {
+  home-manager.users."yoda" = { osConfig, config, pkgs, lib, ... }: {
     dconf.settings = {
       "org/gnome/shell" = {
         favorite-apps = ["obsidian.desktop"];
diff --git a/modules/print-and-scan.nix b/modules/print-and-scan.nix
index 4a69159..652396e 100644
--- a/modules/print-and-scan.nix
+++ b/modules/print-and-scan.nix
@@ -58,7 +58,7 @@
     extraBackends = [ pkgs.hplip ];
   };
 
-  users.users.yoda = {
+  users.users."yoda" = {
     extraGroups = [ "scanner" "lp" ];
     packages = with pkgs; [
       simple-scan # GNOME Document Scanner
diff --git a/modules/programs-base.nix b/modules/programs-base.nix
index ccaf877..ddbfaf0 100644
--- a/modules/programs-base.nix
+++ b/modules/programs-base.nix
@@ -6,7 +6,7 @@
     ./signal-desktop.nix
   ];
 
-  users.users.yoda = {
+  users.users."yoda" = {
     packages = with pkgs; [
       #zenith # Terminal resource monitor / task manager
       btop   # Terminal resource monitor / task manager
diff --git a/modules/programs-gnome.nix b/modules/programs-gnome.nix
index 79e4eb8..6ff067c 100644
--- a/modules/programs-gnome.nix
+++ b/modules/programs-gnome.nix
@@ -7,7 +7,7 @@
     ./blackbox.nix # Terminal emulator.
   ];
 
-  users.users.yoda = {
+  users.users."yoda" = {
     packages = with pkgs; [
       gnome-tweaks
       dconf-editor
diff --git a/modules/programs-kde.nix b/modules/programs-kde.nix
index ab2e542..d58ae1b 100644
--- a/modules/programs-kde.nix
+++ b/modules/programs-kde.nix
@@ -11,7 +11,7 @@
     "dotnet-runtime-6.0.36"
   ];
 
-  users.users.yoda = {
+  users.users."yoda" = {
     packages = with pkgs; [
       # Preinstalled
       #   kdePackages.ark # Archive manager
diff --git a/modules/programs.nix b/modules/programs.nix
index 16c2992..309493a 100644
--- a/modules/programs.nix
+++ b/modules/programs.nix
@@ -4,7 +4,7 @@
     ./thunderbird.nix # email
   ];
 
-  users.users.yoda = {
+  users.users."yoda" = {
     packages = with pkgs; [
       #
       # CLI apps
diff --git a/modules/rnote.nix b/modules/rnote.nix
index bc120bf..d307925 100644
--- a/modules/rnote.nix
+++ b/modules/rnote.nix
@@ -1,13 +1,13 @@
 { config, pkgs, lib, ... }:
 {
-  users.users.yoda = {
+  users.users."yoda" = {
     packages = with pkgs; [
       unstable.rnote # Handwritten notes
     ];
   };
 
   programs.dconf.enable = true;
-  home-manager.users.yoda = { osConfig, config, pkgs, lib, ... }: {
+  home-manager.users."yoda" = { osConfig, config, pkgs, lib, ... }: {
     dconf.settings = {
       "org/gnome/shell" = {
         favorite-apps = lib.mkIf (osConfig.networking.hostName == "yodaTab") ["com.github.flxzt.rnote.desktop"];
diff --git a/modules/signal-desktop.nix b/modules/signal-desktop.nix
index febd5cd..6165230 100644
--- a/modules/signal-desktop.nix
+++ b/modules/signal-desktop.nix
@@ -1,6 +1,6 @@
 { config, pkgs, lib, ... }:
 {
-  users.users.yoda = {
+  users.users."yoda" = {
     packages = with pkgs; [
       signal-desktop # Signal client
     ];
@@ -23,7 +23,7 @@
     })
   ];
 
-  home-manager.users.yoda = { osConfig, config, pkgs, ... }: {
+  home-manager.users."yoda" = { osConfig, config, pkgs, ... }: {
     dconf.settings = {
       "org/gnome/shell" = {
         favorite-apps = ["signal-desktop.desktop"];
diff --git a/modules/spaceFM.nix b/modules/spaceFM.nix
index 96f5c0b..445d1c5 100644
--- a/modules/spaceFM.nix
+++ b/modules/spaceFM.nix
@@ -1,6 +1,6 @@
 { config, pkgs, lib, ... }:
 {
-  users.users.yoda = {
+  users.users."yoda" = {
     packages = with pkgs; [
       spaceFM
     ];
diff --git a/modules/ssh-client.nix b/modules/ssh-client.nix
index 00a131d..4ace94c 100644
--- a/modules/ssh-client.nix
+++ b/modules/ssh-client.nix
@@ -1,6 +1,6 @@
 { config, pkgs, ... }:
 {
-  home-manager.users.yoda = { osConfig, config, pkgs, ... }: {
+  home-manager.users."yoda" = { osConfig, config, pkgs, ... }: {
 
     # SSH client configuration.
     programs.ssh = {
diff --git a/modules/syncthing.nix b/modules/syncthing.nix
index f2e7a55..ba03e54 100644
--- a/modules/syncthing.nix
+++ b/modules/syncthing.nix
@@ -14,7 +14,7 @@
 #  };
 
   # We run Syncthing as user service.
-  home-manager.users.yoda = { osConfig, config, pkgs, ... }: {
+  home-manager.users."yoda" = { osConfig, config, pkgs, ... }: {
     services.syncthing = {
       enable = true;
     };
diff --git a/modules/thunderbird.nix b/modules/thunderbird.nix
index f8f2157..22d6c43 100644
--- a/modules/thunderbird.nix
+++ b/modules/thunderbird.nix
@@ -8,7 +8,7 @@ in
   # https://github.com/dr460nf1r3/dr460nixed/blob/main/home-manager/email.nix
   # https://github.com/yurrriq/dotfiles/blob/main/machines/nixps/home.nix
 
-  home-manager.users.yoda = { osConfig, config, pkgs, ... }: {
+  home-manager.users."yoda" = { osConfig, config, pkgs, ... }: {
     accounts.email.accounts = {
       "personal" = {
         address = "daniel@systemli.org";
diff --git a/modules/tor-browser.nix b/modules/tor-browser.nix
index 634ae37..0de210d 100644
--- a/modules/tor-browser.nix
+++ b/modules/tor-browser.nix
@@ -1,6 +1,6 @@
 { config, pkgs, lib, ... }:
 {
-  users.users.yoda = {
+  users.users."yoda" = {
     packages = with pkgs; [
       tor-browser-bundle-bin # Tor web browser.
     ];
diff --git a/modules/uni-vpn.nix b/modules/uni-vpn.nix
index e8cb835..328b34e 100644
--- a/modules/uni-vpn.nix
+++ b/modules/uni-vpn.nix
@@ -9,7 +9,7 @@
     ./t-telesec.nix
   ];
 
-  users.users.yoda = {
+  users.users."yoda" = {
     packages = with pkgs; [
       networkmanager-openconnect # Openconnect VPN
     ];
diff --git a/modules/veracrypt.nix b/modules/veracrypt.nix
index 661cbcf..ad50715 100644
--- a/modules/veracrypt.nix
+++ b/modules/veracrypt.nix
@@ -11,7 +11,7 @@
     "veracrypt"
   ];
 
-  users.users.yoda = {
+  users.users."yoda" = {
     packages = with pkgs; [
       veracrypt # Encrypted filesystem
     ];
diff --git a/modules/virt-manager.nix b/modules/virt-manager.nix
index 04720ea..9b2602d 100644
--- a/modules/virt-manager.nix
+++ b/modules/virt-manager.nix
@@ -5,7 +5,7 @@
   # libvirt is a dependency of Virt-manager
   # https://nixos.wiki/wiki/Libvirt
   virtualisation.libvirtd.enable = true;
-  users.users.yoda.extraGroups = [ "libvirtd" ];
+  users.users."yoda".extraGroups = [ "libvirtd" ];
 
   # Required for USB redirection to work with GNOME boxes. Maybe this is also required for virt-Manager?
   # See
@@ -18,7 +18,7 @@
   # TODO: nixpkgs virtio-win
   programs.virt-manager.enable = true;
   programs.dconf.enable = true;
-  home-manager.users.yoda = { osConfig, config, pkgs, ... }: {
+  home-manager.users."yoda" = { osConfig, config, pkgs, ... }: {
     dconf.settings = {
       "org/virt-manager/virt-manager/connections" = {
         autoconnect = ["qemu:///system"];
diff --git a/modules/vlc-dvd-blu-ray.nix b/modules/vlc-dvd-blu-ray.nix
index d8f159e..af6d127 100644
--- a/modules/vlc-dvd-blu-ray.nix
+++ b/modules/vlc-dvd-blu-ray.nix
@@ -44,7 +44,7 @@ let
   vlc = pkgs.vlc.override { inherit libbluray; };
 in
 {
-  users.users.yoda = {
+  users.users."yoda" = {
     packages = [
       vlc # Video (DVD, Blu-ray) and audio player
       pkgs.dvdbackup # Create ackups of personal DVDs
diff --git a/modules/xdg.nix b/modules/xdg.nix
index d98f6bc..f26dc32 100644
--- a/modules/xdg.nix
+++ b/modules/xdg.nix
@@ -7,7 +7,7 @@
 
 #  # Inside the following Home Manager configuration block,
 #  # `config` refers to Home Manager configuration.
-#  home-manager.users.yoda = { osConfig, config, pkgs, ... }: {
+#  home-manager.users."yoda" = { osConfig, config, pkgs, ... }: {
 #    xdg = {
 #      enable = true;
 #      # This updates the desktop database. https://github.com/nix-community/home-manager/blob/0e0e9669547e45ea6cca2de4044c1a384fd0fe55/modules/misc/xdg-mime.nix#L45-L58
diff --git a/modules/zsh.nix b/modules/zsh.nix
index 724b52b..143d67b 100644
--- a/modules/zsh.nix
+++ b/modules/zsh.nix
@@ -57,14 +57,14 @@ in
 
   # Inside the following Home Manager configuration block,
   # `config` refers to Home Manager configuration.
-  home-manager.users.yoda = { osConfig, config, pkgs, ... }: {
+  home-manager.users."yoda" = { osConfig, config, pkgs, ... }: {
     programs.zsh = zsh-config // {
-      # nix-repl: config.home-manager.users.yoda.programs.zsh.history.path
+      # nix-repl: config.home-manager.users."yoda".programs.zsh.history.path
       # -> ~/.local/share/.histfile
       history.path = "${config.xdg.dataHome}/.histfile";
     };
   };
-  home-manager.users.root = { osConfig, config, pkgs, ... }: {
+  home-manager.users."root" = { osConfig, config, pkgs, ... }: {
     programs.zsh = zsh-config // {
       history.path = "${config.xdg.dataHome}/.histfile";
     };