diff --git a/cli/default.nix b/cli/default.nix
deleted file mode 100644
index 6f92dee..0000000
--- a/cli/default.nix
+++ /dev/null
@@ -1,88 +0,0 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}:
-
-let
-  name = "cli";
-  cfg = config.nixowos.${name};
-in
-{
-  imports = [
-    ./yt-dlp.nix
-    ./tmux.nix
-    ./shell.nix
-    ./helix.nix
-    ./git.nix
-  ];
-
-  options.nixowos.${name} = {
-    enable = lib.mkEnableOption name;
-
-    extraPackages = lib.mkOption {
-      type = lib.types.listOf lib.types.package;
-      default =
-        with pkgs;
-        [
-          trash-cli
-          killall
-
-          fd
-          ripgrep
-
-          iftop
-          dust
-          compsize
-
-          ffmpeg
-
-          python3
-        ]
-        ++ (
-          if config.nixowos.graphical.nvidia.enable then
-            [
-              btop-cuda
-              nvtopPackages.nvidia
-            ]
-          else
-            [
-              btop-rocm
-              nvtopPackages.amd
-            ]
-        );
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    nixowos.${name} = lib.mkDefault {
-      yt-dlp.enable = true;
-      tmux.enable = true;
-      shell.enable = true;
-      helix.enable = true;
-      git.enable = true;
-    };
-
-    environment.systemPackages = cfg.extraPackages;
-
-    # enter dev env on cd
-    programs.direnv = lib.mkDefault {
-      enable = true;
-      # hide extra logging, that isn't particularly useful
-      # (for only using nix at least)
-      settings.global.hide_env_diff = true;
-    };
-
-    # cat replacement
-    programs.bat = lib.mkDefault {
-      enable = true;
-      # settings.theme = "ansi";
-      extraPackages = with pkgs.bat-extras; [
-        # for syntax highlighting manual pages
-        batman
-      ];
-    };
-
-  };
-}
diff --git a/defaults/shell.nix b/defaults/shell.nix
index 8684ac9..3c6a22e 100644
--- a/defaults/shell.nix
+++ b/defaults/shell.nix
@@ -10,7 +10,41 @@ let
   cfg = config.nixowos.defaults.${name};
 in
 {
-  options.nixowos.defaults.${name}.enable = lib.mkEnableOption name;
+  options.nixowos.defaults.${name} = {
+    enable = lib.mkEnableOption name;
+
+    extraPackages = lib.mkOption {
+      type = lib.types.listOf lib.types.package;
+      default =
+        with pkgs;
+        [
+          trash-cli
+          killall
+
+          fd
+          ripgrep
+
+          dust
+          compsize
+
+          ffmpeg
+
+          python3
+        ]
+        ++ (
+          if config.nixowos.nvidia.enable then
+            [
+              btop-cuda
+              nvtopPackages.nvidia
+            ]
+          else
+            [
+              btop-rocm
+              nvtopPackages.amd
+            ]
+        );
+    };
+  };
 
   config = lib.mkIf cfg.enable {
     # use Fish, the nicest shell :)
@@ -26,5 +60,15 @@ in
 
       nixos-rebuild = /* sh */ "nixos-rebuild --ask-sudo-password";
     };
+
+    environment.systemPackages = cfg.extraPackages;
+
+    # enter dev env on cd
+    programs.direnv = lib.mkDefault {
+      enable = true;
+      # hide extra logging, that isn't particularly useful
+      # (for only using nix at least)
+      settings.global.hide_env_diff = true;
+    };
   };
 }