diff --git a/nixos/common/desktop/default.nix b/nixos/common/desktop/default.nix
index e9bf197..a3e5693 100644
--- a/nixos/common/desktop/default.nix
+++ b/nixos/common/desktop/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }: {
+{ pkgs, lib, inputs, ... }: {
   # Bootloader.
   boot = {
     kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
@@ -14,6 +14,13 @@
     };
   };
 
+  home-manager = {
+    useGlobalPkgs = true;
+    useUserPackages = true;
+    users.victor = import ./home.nix;
+    extraSpecialArgs = { inherit inputs; };
+  };
+
   # Enable my config for the gnome desktop environment
   services.v.gnome.enable = true;
 
@@ -86,17 +93,6 @@
   };
 
   programs.adb.enable = true;
-
-  # Debloat
-  documentation = {
-    enable = false;
-    doc.enable = false;
-    man.enable = false;
-    info.enable = false;
-    nixos.enable = false;
-  };
-  system.disableInstallerTools = true;
-
   # Networking
   networking.networkmanager.enable = true;
   networking.firewall.checkReversePath = false;
diff --git a/nixos/common/desktop/home.nix b/nixos/common/desktop/home.nix
index 7a64942..6ec552f 100644
--- a/nixos/common/desktop/home.nix
+++ b/nixos/common/desktop/home.nix
@@ -6,7 +6,14 @@ 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
     calibre
     celluloid
@@ -16,13 +23,11 @@ in {
     gimp
     inputs.comma.packages.${pkgs.system}.default
     inputs.webcord.packages.${pkgs.system}.default
-    # jetbrains.clion
     kdenlive
     mullvad-vpn
     neofetch
     nixfmt
     nixpkgs-review
-    (python3.withPackages my-python-packages)
     plex-media-player
     rustup
     solo2-cli
@@ -54,7 +59,6 @@ in {
     userName = "Victor";
     userEmail = "victor@xirion.net";
     lfs.enable = true;
-    # delta.enable = true;
     extraConfig = {
       push.autoSetupRemote = true;
       init.defaultBranch = "main";
@@ -72,6 +76,11 @@ in {
 
   programs.firefox.enable = true;
 
+  programs.chromium = {
+    enable = true;
+    package = pkgs.ungoogled-chromium;
+  };
+
   programs.direnv = {
     enable = true;
     nix-direnv.enable = true;
diff --git a/nixos/hosts/olympus/eevee/configuration.nix b/nixos/hosts/olympus/eevee/configuration.nix
index bf240a9..70b4cc4 100644
--- a/nixos/hosts/olympus/eevee/configuration.nix
+++ b/nixos/hosts/olympus/eevee/configuration.nix
@@ -41,10 +41,7 @@
   environment.sessionVariables.NIXOS_OZONE_WL = "1";
 
   home-manager = {
-    useGlobalPkgs = true;
-    useUserPackages = true;
     users.victor = import ./home;
-    extraSpecialArgs = { inherit inputs; };
   };
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
diff --git a/nixos/hosts/olympus/eevee/home/default.nix b/nixos/hosts/olympus/eevee/home/default.nix
index ce2eaae..2e78a54 100644
--- a/nixos/hosts/olympus/eevee/home/default.nix
+++ b/nixos/hosts/olympus/eevee/home/default.nix
@@ -1,12 +1,4 @@
 _: {
-  programs.home-manager.enable = true;
-
-  home.username = "victor";
-  home.homeDirectory = "/home/victor";
-  home.stateVersion = "23.05";
-
-  imports = [ ../../../../common/desktop/home.nix ];
-
   dconf.settings."org/gnome/desktop/peripherals/mouse" = {
     accel-profile = "flat";
   };
diff --git a/nixos/hosts/thalassa/aoife/configuration.nix b/nixos/hosts/thalassa/aoife/configuration.nix
index 566477e..928e8c2 100644
--- a/nixos/hosts/thalassa/aoife/configuration.nix
+++ b/nixos/hosts/thalassa/aoife/configuration.nix
@@ -23,12 +23,7 @@
     };
   };
 
-  home-manager = {
-    useGlobalPkgs = true;
-    useUserPackages = true;
-    users.victor = import ./home;
-    extraSpecialArgs = { inherit inputs; };
-  };
+  home-manager.users.victor = import ./home;
 
   # Enable Ozone rendering for Chromium and Electron apps.
   environment.sessionVariables.NIXOS_OZONE_WL = "1";
diff --git a/nixos/hosts/thalassa/aoife/home/default.nix b/nixos/hosts/thalassa/aoife/home/default.nix
index cce6c37..b126d8e 100644
--- a/nixos/hosts/thalassa/aoife/home/default.nix
+++ b/nixos/hosts/thalassa/aoife/home/default.nix
@@ -1,12 +1,4 @@
 _: {
-  programs.home-manager.enable = true;
-
-  home.username = "victor";
-  home.homeDirectory = "/home/victor";
-  home.stateVersion = "23.05";
-
-  imports = [ ../../../../common/desktop/home.nix ];
-
   # Custom dconf settings
   dconf.settings."org/gnome/desktop/input-sources" = {
     xkb-options = [ "caps:swapescape" ];