diff --git a/hosts/common/common.nix b/hosts/common/common.nix
index 731525a..ab9850d 100644
--- a/hosts/common/common.nix
+++ b/hosts/common/common.nix
@@ -7,8 +7,8 @@
       ../../modules/nix/pipewire.nix
       ../../modules/nix/locales.nix
       ../../modules/nix/hardware/grub.nix
-      ../../modules/nix/nvf.nix
-      ../../modules/nix/nh.nix
+      ../../modules/nix/base-cli/nvf.nix
+      ../../modules/nix/base-cli/nh.nix
     ];
 
   smayzy.virt.enable = true;
diff --git a/modules/nix/nh.nix b/modules/nix/base-cli/nh.nix
similarity index 100%
rename from modules/nix/nh.nix
rename to modules/nix/base-cli/nh.nix
diff --git a/modules/nix/nvf.nix b/modules/nix/base-cli/nvf.nix
similarity index 100%
rename from modules/nix/nvf.nix
rename to modules/nix/base-cli/nvf.nix