diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index b006053..f8df02d 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ inputs, ... }:
 {
   flake.modules.nixos.desktop =
     { pkgs, ... }:
@@ -31,14 +31,22 @@
         defaultFonts.monospace = [ "VictorMono Nerd Font Mono" ];
       };
 
-  gtk = {
-    enable = true;
-    cursorTheme = {
-      package = pkgs.bibata-cursors;
-      name = "Bibata-Modern-Ice";
-      size = 24;
+      home-manager.sharedModules = [
+        inputs.self.modules.homeManager.desktop
+      ];
     };
-  };
+
+  flake.modules.homeManager.desktop =
+    { pkgs, ... }:
+    {
+      gtk = {
+        enable = true;
+        cursorTheme = {
+          package = pkgs.bibata-cursors;
+          name = "Bibata-Modern-Ice";
+          size = 24;
+        };
+      };
     };
 
   # TODO: Persist ~/.config/cosmic after setup
diff --git a/modules/hosts/dnsc-machine/default.nix b/modules/hosts/dnsc-machine/default.nix
index 504cb10..b1604d7 100644
--- a/modules/hosts/dnsc-machine/default.nix
+++ b/modules/hosts/dnsc-machine/default.nix
@@ -21,6 +21,7 @@ in
       desktop
       terminal
       gaming
+      browser
 
       {
         imports = [ ./_hardware-configuration.nix ];
diff --git a/modules/neovim/default.nix b/modules/neovim/default.nix
index 86fe610..9efb882 100644
--- a/modules/neovim/default.nix
+++ b/modules/neovim/default.nix
@@ -20,23 +20,23 @@
     };
     
   flake.modules.homeManager.neovim = { pkgs, ... }: {
-    imports = [ inputs.nixvim.homeModules.nixvim ];
+    imports = [
+      inputs.nixvim.homeModules.nixvim
+      ./_colorscheme.nix
+      ./_completion.nix
+      ./_editing.nix
+      ./_formatter.nix
+      ./_keybindings.nix
+      ./_lsp.nix
+      ./_options.nix
+      ./_picker.nix
+    ];
     programs.nixvim = {
       enable = true;
       defaultEditor = true;
       package = pkgs.neovim-unwrapped;
       vimAlias = true;
       vimdiffAlias = true;
-      imports = [
-      	./_colorscheme.nix
-	./_completion.nix
-	./_editing.nix
-	./_formatter.nix
-	./_keybindings.nix
-	./_lsp.nix
-	./_options.nix
-	./_picker.nix
-      ];
     };
   };
 }