diff --git a/modules/home/home/default.nix b/modules/home/home/default.nix
index c026274..3df24f2 100644
--- a/modules/home/home/default.nix
+++ b/modules/home/home/default.nix
@@ -4,6 +4,10 @@
   ...
 }:
 {
-  home.stateVersion = lib.mkDefault (osConfig.system.stateVersion or "24.11");
+  home = {
+    username = "philipp";
+    homeDirectory = "/home/philipp";
+    stateVersion = lib.mkDefault (osConfig.system.stateVersion or "24.11");
+  };
 
 }
diff --git a/modules/nixos/cli/neovim/default.nix b/modules/nixos/cli/neovim/default.nix
index 81cf366..b6c1c2b 100644
--- a/modules/nixos/cli/neovim/default.nix
+++ b/modules/nixos/cli/neovim/default.nix
@@ -14,6 +14,7 @@ in
     enable = mkBoolOpt false "Whether or not to enable neovim.";
   };
   config = mkIf cfg.enable {
+    environment.variables.EDITOR = "nvim";
     programs.nvf = {
       enable = true;
       settings = {
diff --git a/modules/nixos/cli/nh/default.nix b/modules/nixos/cli/nh/default.nix
index c9ee23e..fac140f 100644
--- a/modules/nixos/cli/nh/default.nix
+++ b/modules/nixos/cli/nh/default.nix
@@ -19,7 +19,7 @@ in
       enable = true;
       clean.enable = true;
       clean.extraArgs = "--keep-since 4d --keep 3";
-      flake = "/home/philipp/Documents/nix-config";
+      flake = "${config.home-manager.users.philipp.home.homeDirectory}/Documents/nix-config";
     };
   };
 
diff --git a/modules/nixos/system/sops/default.nix b/modules/nixos/system/sops/default.nix
index 310f234..1c59153 100644
--- a/modules/nixos/system/sops/default.nix
+++ b/modules/nixos/system/sops/default.nix
@@ -18,7 +18,7 @@ in
   };
 
   config = mkIf cfg.enable {
-    sops.age.keyFile = "/home/philipp/.config/sops/age/keys.txt";
+    sops.age.keyFile = "${config.users.users.philipp.home}/.config/sops/age/keys.txt";
   };
 
 }