diff --git a/nixos/common/common.nix b/nixos/common/common.nix
index 8c516434..fa2b2a85 100644
--- a/nixos/common/common.nix
+++ b/nixos/common/common.nix
@@ -76,6 +76,8 @@
     };
   };
 
+
+
   # Debloat
   documentation = {
     enable = lib.mkForce false;
diff --git a/nixos/common/default.nix b/nixos/common/default.nix
index 7d08263b..0144463a 100644
--- a/nixos/common/default.nix
+++ b/nixos/common/default.nix
@@ -6,8 +6,12 @@
   nix.nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
   nix.registry.nixpkgs.flake = inputs.nixpkgs;
 
-  home-manager.sharedModules =
-    [ ./hm-modules inputs.nixvim.homeManagerModules.nixvim ];
+  home-manager = {
+    useGlobalPkgs = true;
+    useUserPackages = true;
+    extraSpecialArgs = { inherit inputs; };
+    sharedModules = [ ./hm-modules inputs.nixvim.homeManagerModules.nixvim ];
+  };
 
   vault-secrets = let
     inherit (config.networking) domain hostName;
diff --git a/nixos/common/desktop/home.nix b/nixos/common/desktop/home.nix
index 6ec552f1..efbc7cf1 100644
--- a/nixos/common/desktop/home.nix
+++ b/nixos/common/desktop/home.nix
@@ -6,12 +6,6 @@ let
   };
   my-python-packages = ps: with ps; [ pandas requests numpy ];
 in {
-  programs.home-manager.enable = true;
-
-  home.username = "victor";
-  home.homeDirectory = "/home/victor";
-  home.stateVersion = "23.05";
-
   home.packages = with pkgs; [
     (python3.withPackages my-python-packages)
     btop
@@ -38,7 +32,6 @@ in {
 
   # Enable my own hm modules
   themes.v.catppuccin.enable = true;
-  programs.v.nvim.enable = true;
   programs.v.vscode.enable = true;
 
   programs.riff = {
@@ -67,13 +60,6 @@ in {
     difftastic.enable = true;
   };
 
-  programs.tmux = {
-    enable = true;
-    shortcut = "b";
-    terminal = "screen-256color";
-    clock24 = true;
-  };
-
   programs.firefox.enable = true;
 
   programs.chromium = {
diff --git a/nixos/common/users/victor.nix b/nixos/common/users/victor.nix
index 3718bdcd..51477333 100644
--- a/nixos/common/users/victor.nix
+++ b/nixos/common/users/victor.nix
@@ -21,4 +21,21 @@
     extraGroups =
       [ "systemd-journal" "wheel" "networkmanager" "libvirtd" "dialout" ];
   };
+
+  home-manager.users.victor = {
+    programs.home-manager.enable = true;
+
+    home.username = "victor";
+    home.homeDirectory = "/home/victor";
+    home.stateVersion = "23.05";
+
+    programs.v.nvim.enable = true;
+
+    programs.tmux = {
+      enable = true;
+      shortcut = "b";
+      terminal = "screen-256color";
+      clock24 = true;
+    };
+  };
 }
diff --git a/nixos/hosts/olympus/bastion/configuration.nix b/nixos/hosts/olympus/bastion/configuration.nix
index 77705739..81273483 100644
--- a/nixos/hosts/olympus/bastion/configuration.nix
+++ b/nixos/hosts/olympus/bastion/configuration.nix
@@ -69,7 +69,5 @@ in {
     pinentryFlavor = "curses";
   };
 
-  home-manager.useGlobalPkgs = true;
-  home-manager.useUserPackages = true;
   home-manager.users.victor = import ./home.nix;
 }
diff --git a/nixos/hosts/olympus/bastion/home.nix b/nixos/hosts/olympus/bastion/home.nix
index fad23ec8..a65de8e8 100644
--- a/nixos/hosts/olympus/bastion/home.nix
+++ b/nixos/hosts/olympus/bastion/home.nix
@@ -1,9 +1,4 @@
 _: {
-  programs.home-manager.enable = true;
-  home.username = "victor";
-  home.homeDirectory = "/home/victor";
-  home.stateVersion = "22.05";
-
   programs.direnv = {
     enable = true;
     nix-direnv = { enable = true; };