diff --git a/home/hosts/andromache/default.nix b/home/hosts/andromache/default.nix
index cca983f..745e1c0 100644
--- a/home/hosts/andromache/default.nix
+++ b/home/hosts/andromache/default.nix
@@ -37,12 +37,12 @@ in
       enable = true;
       enableCompletion = true;
       initExtra = ''
-        for f in /home/h/.bashrc.d/*; do
+        for f in /home/${username}/.bashrc.d/*; do
           [ -f "$f" ] && source "$f"
         done
 
-        source /home/h/.bash_aliases/all
-        source /home/h/.bash_aliases/lang-js
+        source /home/${username}/.bash_aliases/all
+        source /home/${username}/.bash_aliases/lang-js
 
         # host-specific config goes here
         # ...
diff --git a/home/hosts/astyanax/default.nix b/home/hosts/astyanax/default.nix
index 1f91626..7b75eb5 100644
--- a/home/hosts/astyanax/default.nix
+++ b/home/hosts/astyanax/default.nix
@@ -32,12 +32,12 @@ in
       enable = true;
       enableCompletion = true;
       initExtra = ''
-        for f in /home/h/.bashrc.d/*; do
+        for f in /home/${username}/.bashrc.d/*; do
           [ -f "$f" ] && source "$f"
         done
 
-        source /home/h/.bash_aliases/all
-        source /home/h/.bash_aliases/lang-js
+        source /home/${username}/.bash_aliases/all
+        source /home/${username}/.bash_aliases/lang-js
 
         # host-specific config goes here
         # ...
diff --git a/home/modules/keepassxc.nix b/home/modules/keepassxc.nix
index d8fc692..f8259d2 100644
--- a/home/modules/keepassxc.nix
+++ b/home/modules/keepassxc.nix
@@ -7,5 +7,5 @@
       Browser.Enabled = true;
     };
   };
-  # programs.firefox.nativeMessagingHosts = [ pkgs.keepassxc ]; # FIXME: Resolve 'Access error for config file /home/h/.config/keepassxc/keepassxc.ini' error
+  # programs.firefox.nativeMessagingHosts = [ pkgs.keepassxc ]; # FIXME: Resolve 'Access error for config file $HOME/.config/keepassxc/keepassxc.ini' error
 }
diff --git a/hosts/vm/default.nix b/hosts/vm/default.nix
index 494aea8..2749ed5 100644
--- a/hosts/vm/default.nix
+++ b/hosts/vm/default.nix
@@ -33,7 +33,7 @@ in
     })
   ];
 
-  secrets.username = "h";
+  secrets.username = username;
 
   environment.systemPackages = [ inputs.nvim.packages.x86_64-linux.nvim ];