diff --git a/home-manager/common/software/cli/nixvim.nix b/home-manager/common/software/cli/nixvim.nix
index 486b38d1..591d5147 100644
--- a/home-manager/common/software/cli/nixvim.nix
+++ b/home-manager/common/software/cli/nixvim.nix
@@ -1,5 +1,8 @@
 { lib, ... }: {
-  imports = [ ./nixvim/base.nix ]; 
+  imports = [ 
+    ./nixvim/base.nix 
+    ./nixvim/cmp.nix
+  ]; 
 
   programs.nixvim = {
     extraConfigLuaPost = ''
diff --git a/home-manager/common/software/cli/nixvim/base.nix b/home-manager/common/software/cli/nixvim/base.nix
index 3c3147bf..f9687c73 100644
--- a/home-manager/common/software/cli/nixvim/base.nix
+++ b/home-manager/common/software/cli/nixvim/base.nix
@@ -2,7 +2,6 @@
   imports = [
     ./alpha.nix
     ./keymaps.nix
-    ./cmp.nix
     inputs.nixvim.homeManagerModules.nixvim
   ] ++ lib.optional (builtins.isString theme) ../../../../../stylix/themes/${theme}/home-manager/nixvim.nix;
 
diff --git a/nixos/default.nix b/nixos/default.nix
index a2fa2c90..dd483c3f 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -21,6 +21,7 @@
     ./common/modules/networking.nix      # Initial Networking configs
     ./common/modules/nixos.nix           # NixOS related items
     ./common/modules/remote-builders.nix # Add remote builders
+    ./common/modules/hosts.nix           # Adblockers
 
     ./users/${username}
     ./hosts/${hostname}
diff --git a/nixos/hosts/nixos-framework/default.nix b/nixos/hosts/nixos-framework/default.nix
index 68622687..75be9c83 100644
--- a/nixos/hosts/nixos-framework/default.nix
+++ b/nixos/hosts/nixos-framework/default.nix
@@ -11,8 +11,6 @@
     # ../../common/modules/yubikey-auth.nix
     ../../common/modules/builder.nix
     ../../common/services/podman.nix
-
-    ../../common/modules/hosts.nix
   ];
 
   hardware.bluetooth.enable = true; # enables support for Bluetooth
diff --git a/nixos/small.nix b/nixos/small.nix
index ca861e0e..d76cb229 100644
--- a/nixos/small.nix
+++ b/nixos/small.nix
@@ -9,7 +9,6 @@
     ./common/services/tailscale.nix
     ./common/services/promtail.nix
     ./common/services/telegraf.nix
-    ./common/services/gnupg-agent.nix
     
     # Software
     ./common/software/cli/clean-hm.nix