diff --git a/flake.nix b/flake.nix
index b67ef1c..4c2a642 100644
--- a/flake.nix
+++ b/flake.nix
@@ -23,7 +23,7 @@
     }:
     let
       system = "x86_64-linux";
-      username = import ./username.nix;
+      username = "andreas";
       overlay-unstable = final: prev: {
         unstable = import nixpkgs-unstable {
           system = "x86_64-linux";
@@ -41,7 +41,7 @@
       };
       mkComputer = configurationNix: homeManagerRole: extraModules: nixpkgs.lib.nixosSystem {
         inherit system pkgs;
-        specialArgs = { inherit self system inputs; };
+        specialArgs = { inherit self system inputs username; };
         modules = (
           [
             # System configuration for this host
@@ -55,7 +55,7 @@
               home-manager.useGlobalPkgs = true;
               home-manager.useUserPackages = true;
               home-manager.users.${username}.imports = [
-                (import homeManagerRole { inherit self pkgs; })
+                (import homeManagerRole { inherit pkgs username; })
               ];
             }
           ] ++ extraModules
diff --git a/home-manager/common/default.nix b/home-manager/common/default.nix
index 102c5e4..78f5ad3 100644
--- a/home-manager/common/default.nix
+++ b/home-manager/common/default.nix
@@ -1,7 +1,4 @@
-{ self, ... }:
-let
-  username = import "${self}/username.nix";
-in
+{ username, ... }:
 {
   # Home Manager needs a bit of information about you and the
   # paths it should manage.
diff --git a/home-manager/desktop.nix b/home-manager/desktop.nix
index 2950311..5a37014 100644
--- a/home-manager/desktop.nix
+++ b/home-manager/desktop.nix
@@ -1,7 +1,7 @@
-{ self, pkgs, ... }:
+{ pkgs, username, ... }:
 {
   imports = [
-    (import ./common { inherit self; })
+    (import ./common { inherit username; })
     ./software/work-desktop
     ./software/autorandr
     ./software/czkawka
diff --git a/home-manager/software/vagrant-wsl/default.nix b/home-manager/software/vagrant-wsl/default.nix
index 6718d91..0b7f288 100644
--- a/home-manager/software/vagrant-wsl/default.nix
+++ b/home-manager/software/vagrant-wsl/default.nix
@@ -1,7 +1,4 @@
-{ pkgs, ... }:
-let
-  username = import ../../username.nix;
-in
+{ pkgs, username, ... }:
 {
   home.packages = with pkgs; [
     vagrant
diff --git a/modules/code-server/default.nix b/modules/code-server/default.nix
index f513453..ca4f3fe 100644
--- a/modules/code-server/default.nix
+++ b/modules/code-server/default.nix
@@ -1,7 +1,4 @@
-{ self, pkgs, ... }:
-let
-  username = import "${self}/username.nix";
-in
+{ pkgs, username, ... }:
 {
   services.code-server = {
     enable = true;
diff --git a/modules/common/default.nix b/modules/common/default.nix
index 61d5d5c..319fd94 100644
--- a/modules/common/default.nix
+++ b/modules/common/default.nix
@@ -1,7 +1,4 @@
-{ self, pkgs, ... }:
-let
-  username = import "${self}/username.nix";
-in
+{ self, pkgs, username, ... }:
 {
   imports = [
     "${self}/modules/cli"
diff --git a/modules/docker/default.nix b/modules/docker/default.nix
index fd1aebe..a00415e 100644
--- a/modules/docker/default.nix
+++ b/modules/docker/default.nix
@@ -1,7 +1,4 @@
-{ self, pkgs, ... }:
-let
-  username = import "${self}/username.nix";
-in
+{ pkgs, username, ... }:
 {
   virtualisation.docker =
     {
diff --git a/modules/droidcam/default.nix b/modules/droidcam/default.nix
index 50ef807..ab28b93 100644
--- a/modules/droidcam/default.nix
+++ b/modules/droidcam/default.nix
@@ -1,7 +1,4 @@
-{ self, pkgs, ... }:
-let
-  username = import "${self}/username.nix";
-in
+{ pkgs, username, ... }:
 {
   programs.droidcam.enable = true;
   # required for USB connection
diff --git a/modules/eog/default.nix b/modules/eog/default.nix
index c73c40e..8767cd8 100644
--- a/modules/eog/default.nix
+++ b/modules/eog/default.nix
@@ -1,7 +1,4 @@
-{ self, pkgs, ... }:
-let
-  username = import "${self}/username.nix";
-in
+{ pkgs, username, ... }:
 {
   environment.systemPackages = with pkgs; [
     gnome.eog
diff --git a/modules/espanso/default.nix b/modules/espanso/default.nix
index ed4c1a9..8be825e 100644
--- a/modules/espanso/default.nix
+++ b/modules/espanso/default.nix
@@ -1,7 +1,4 @@
-{ self, pkgs, ... }:
-let
-  username = import "${self}/username.nix";
-in
+{ pkgs, username, ... }:
 {
   services.espanso.enable = true;
   home-manager.users.${username} = {
diff --git a/modules/nix-direnv/default.nix b/modules/nix-direnv/default.nix
index e241b5a..e27e20d 100644
--- a/modules/nix-direnv/default.nix
+++ b/modules/nix-direnv/default.nix
@@ -1,7 +1,4 @@
-{ self, pkgs, ... }:
-let
-  username = import "${self}/username.nix";
-in
+{ pkgs, username, ... }:
 {
   nix.extraOptions = ''
     keep-outputs = true
diff --git a/modules/restic/default.nix b/modules/restic/default.nix
index 8208ef9..9a14b49 100644
--- a/modules/restic/default.nix
+++ b/modules/restic/default.nix
@@ -1,7 +1,4 @@
-{ self, ... }:
-let
-  username = import "${self}/username.nix";
-in
+{ username, ... }:
 {
   services.restic.backups.${username} = {
     user = username;
diff --git a/modules/steam/default.nix b/modules/steam/default.nix
index ac114c2..3047474 100644
--- a/modules/steam/default.nix
+++ b/modules/steam/default.nix
@@ -1,7 +1,4 @@
-{ self, ... }:
-let
-  username = import "${self}/username.nix";
-in
+{ username, ... }:
 {
   programs.steam.enable = true;
   hardware.steam-hardware.enable = true;
diff --git a/modules/xonsh/default.nix b/modules/xonsh/default.nix
index 41831b1..540ac73 100644
--- a/modules/xonsh/default.nix
+++ b/modules/xonsh/default.nix
@@ -1,7 +1,4 @@
-{ self, pkgs, ... }:
-let
-  username = import "${self}/username.nix";
-in
+{ pkgs, username, ... }:
 {
   programs.xonsh = {
     enable = true;
diff --git a/username.nix b/username.nix
deleted file mode 100644
index 8769a49..0000000
--- a/username.nix
+++ /dev/null
@@ -1 +0,0 @@
-"andreas"