diff --git a/modules/default.nix b/modules/default.nix
index 6cc2320..2dac065 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -74,9 +74,9 @@
     displayManager.gdm.enable = true;
   };
 
-  users.users.twoneis = {
+  users.users.${config.username}= {
     isNormalUser = true;
-    description = "twoneis";
+    description = config.username;
     extraGroups = [ "networkmanager" "wheel" ];
   };
 
diff --git a/modules/games/default.nix b/modules/games/default.nix
index d616845..eccf367 100644
--- a/modules/games/default.nix
+++ b/modules/games/default.nix
@@ -2,7 +2,7 @@
   programs.steam.enable = true;
   programs.gamemode.enable = true;
 
-  home-manager.users.twoneis = {
+  home-manager.users.${config.username} = {
     home.packages = with pkgs; [
       prismlauncher
     ];
diff --git a/modules/home/default.nix b/modules/home/default.nix
index a363b07..9f82aed 100644
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -3,10 +3,10 @@
     useGlobalPkgs = true;
     useUserPackages = true;
 
-    users.twoneis = {
+    users.${config.username} = {
       home = {
         username = "twoneis";
-        homeDirectory = "/home/twoneis";
+        homeDirectory = "/home/${config.username}";
 
         stateVersion = config.hmStateVersion;
       };
diff --git a/modules/niri/default.nix b/modules/niri/default.nix
index f06da96..b30c237 100644
--- a/modules/niri/default.nix
+++ b/modules/niri/default.nix
@@ -1,7 +1,7 @@
 { lib, config, pkgs, ... }: lib.mkIf config.withNiri {
   programs.niri.enable = true;
 
-  home-manager.users.twoneis = {
+  home-manager.users.${config.username} = {
     home.packages = with pkgs; [
       brightnessctl
       swaybg
diff --git a/modules/user/firefox.nix b/modules/user/firefox.nix
index 1c38d73..9f7a031 100644
--- a/modules/user/firefox.nix
+++ b/modules/user/firefox.nix
@@ -1,5 +1,5 @@
 { lib, config, pkgs, ... }: lib.mkIf config.user {
-  home-manager.users.twoneis = {
+  home-manager.users.${config.username} = {
     programs.firefox = {
       enable = true;
       profiles = {
diff --git a/modules/user/programs.nix b/modules/user/programs.nix
index 0569158..6d5239c 100644
--- a/modules/user/programs.nix
+++ b/modules/user/programs.nix
@@ -13,7 +13,7 @@
       gvfs.enable = true;
     };
 
-    home-manager.users.twoneis = {
+    home-manager.users.${config.username} = {
       home.packages = with pkgs; [
         signal-desktop
         vesktop
diff --git a/modules/user/themes.nix b/modules/user/themes.nix
index df9d715..d60423b 100644
--- a/modules/user/themes.nix
+++ b/modules/user/themes.nix
@@ -1,5 +1,5 @@
-{ pkgs, ... }: {
-  home-manager.users.twoneis = {
+{ config, pkgs, ... }: {
+  home-manager.users.${config.username} = {
     home.packages = with pkgs; [
       adwaita-icon-theme
       adwaita-qt
diff --git a/modules/utils/default.nix b/modules/utils/default.nix
index 88ae821..c1c46d8 100644
--- a/modules/utils/default.nix
+++ b/modules/utils/default.nix
@@ -1,8 +1,8 @@
-{ pkgs, ... }: {
+{ config, pkgs, ... }: {
   programs.fish.enable = true;
   users.defaultUserShell = pkgs.fish;
 
-  home-manager.users.twoneis = {
+  home-manager.users.${config.username} = {
     home.packages = with pkgs; [
       man-pages
       man-pages-posix
diff --git a/modules/vm/default.nix b/modules/vm/default.nix
index 5adc1b2..fdc7323 100644
--- a/modules/vm/default.nix
+++ b/modules/vm/default.nix
@@ -1,5 +1,5 @@
 { lib, config, ... }: lib.mkIf config.withVM {
   virtualisation.libvirtd.enable = true;
   programs.virt-manager.enable = true;
-  users.users.twoneis.extraGroups = [ "libvirtd" ];
+  users.users.${config.username}.extraGroups = [ "libvirtd" ];
 }