diff --git a/terminal/bat/default.nix b/terminal/bat/default.nix
deleted file mode 100644
index 54232126..00000000
--- a/terminal/bat/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  home-manager.sharedModules = [{
-    programs.bat = { enable = true; };
-  }];
-}
diff --git a/terminal/default.nix b/terminal/default.nix
index a404b54a..6b234f2c 100644
--- a/terminal/default.nix
+++ b/terminal/default.nix
@@ -2,11 +2,9 @@
 
 {
   imports = [
-    ./bat
     ./fish
     ./git
     ./gpg
-    ./htop
     ./ncmpcpp
     ./neovim
     ./ranger
@@ -46,4 +44,14 @@
     librespeed-cli
     wiki-tui
   ];
+
+  home-manager.sharedModules = [{
+    programs.bat.enable = true;
+  }];
+
+  programs.htop = {
+    enable = true;
+    package = pkgs."htop-vim";
+    settings = { tree_view = 1; };
+  };
 }
diff --git a/terminal/htop/default.nix b/terminal/htop/default.nix
deleted file mode 100644
index bfffa9f0..00000000
--- a/terminal/htop/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ pkgs, ... }:
-
-{
-  programs.htop = {
-    enable = true;
-    package = pkgs."htop-vim";
-    settings = { tree_view = 1; };
-  };
-}