Simplify terminal imports

Certain programs should always be available on the system, so having
separate modules goes against ensuring a certain state.

terminal/bat/default.nix

@@ -1,5 +0,0 @@
-{
-  home-manager.sharedModules = [{
-    programs.bat = { enable = true; };
-  }];
-}

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; };
+  };
 }

terminal/htop/default.nix

@@ -1,9 +0,0 @@
-{ pkgs, ... }:
-
-{
-  programs.htop = {
-    enable = true;
-    package = pkgs."htop-vim";
-    settings = { tree_view = 1; };
-  };
-}