4 files changed, 34 insertions, 10 deletions
diff --git a/modules/scripts/default.nix b/modules/scripts/default.nix
index b4a6106..6c239d2 100644
--- a/modules/scripts/default.nix
+++ b/modules/scripts/default.nix
@@ -46,7 +46,7 @@ let
     file-preview = {
       path = ./file-preview.sh;
       env = {
-        BAT = lib.getExe pkgs.bat;
+        BAT = lib.getExe config.programs.bat.package;
         FILE = lib.getExe pkgs.file;
         FFMPEG = lib.getExe' pkgs.ffmpeg-full "ffmpeg";
         FFPROBE = lib.getExe' pkgs.ffmpeg-full "ffprobe";
@@ -54,7 +54,7 @@ let
         PDFTOPPM = lib.getExe' pkgs.poppler-utils "pdftoppm";
       };
       deps = [
-        pkgs.bat
+        config.programs.bat.package
         pkgs.file
         pkgs.ffmpeg-full
         pkgs.ouch
@@ -74,12 +74,16 @@ let
           option = "tools.zathura.enable";
           value = true;
         }
+        {
+          option = "tools.bat.enable";
+          value = true;
+        }
       ];
     };
     file-preview-clean = {
       path = ./file-preview-clean.sh;
       env = { };
-      deps = [ pkgs.fzf ];
+      deps = [ config.programs.fzf.package ];
       conditions = [
         {
           option = "tools.fzf.enable";
@@ -90,11 +94,11 @@ let
     fzf-launcher = {
       path = ./fzf-launcher.sh;
       env = {
-        FZF = lib.getExe pkgs.fzf;
+        FZF = lib.getExe config.programs.fzf.package;
         SETSID = lib.getExe' pkgs.util-linux "setsid";
       };
       deps = [
-        pkgs.fzf
+        config.programs.fzf.package
         pkgs.util-linux
       ];
       conditions = [
@@ -142,13 +146,13 @@ let
         BTM = lib.getExe pkgs.bottom;
         NVTOP = lib.getExe pkgs.nvtopPackages.full;
         TMUX = lib.getExe pkgs.tmux;
-        KITTY = lib.getExe pkgs.kitty;
+        KITTY = lib.getExe config.programs.kitty.package;
       };
       deps = [
         pkgs.bottom
         pkgs.nvtopPackages.full
         pkgs.tmux
-        pkgs.kitty
+        config.programs.kitty.package
       ];
       conditions = [
         {
@@ -172,12 +176,12 @@ let
     vpn-connect = {
       path = ./vpn-connect.sh;
       env = {
-        FZF = lib.getExe pkgs.fzf;
+        FZF = lib.getExe config.programs.fzf.package;
         OPENVPN = lib.getExe pkgs.openvpn;
         SYSTEMD_RESOLVED = "${pkgs.openvpn}/libexec/update-systemd-resolved";
       };
       deps = [
-        pkgs.fzf
+        config.programs.fzf.package
         pkgs.openvpn
       ];
       conditions = [
@@ -254,7 +258,7 @@ in
 
     home.packages = [
       pkgs.file
-      pkgs.bat
+      config.programs.bat.package
     ]
     ++ lib.filter (x: x != null) (lib.mapAttrsToList (_: s: s.package) config.scripts);
   };
diff --git a/modules/tools/bat/default.nix b/modules/tools/bat/default.nix
new file mode 100644
index 0000000..4e575b8
--- /dev/null
+++ b/modules/tools/bat/default.nix
@@ -0,0 +1,18 @@
+{
+  config,
+  lib,
+  ...
+}:
+
+# Bluetui - Terminal UI for Bluetooth management
+{
+  options.tools.bat = {
+    enable = lib.mkEnableOption "Enables bat.";
+  };
+
+  config = lib.mkIf config.tools.bat.enable {
+    programs.bat = {
+      enable = true;
+    };
+  };
+}
diff --git a/modules/tools/default.nix b/modules/tools/default.nix
index 0319546..af9976d 100644
--- a/modules/tools/default.nix
+++ b/modules/tools/default.nix
@@ -3,6 +3,7 @@
 # Tools - Collection of tool configurations (browsers, editors, utilities, etc.)
 {
   imports = [
+    ./bat
     ./bluetui
     ./bottom
     ./brightnessctl
diff --git a/users/arpit.nix b/users/arpit.nix
index e5a3603..1052937 100644
--- a/users/arpit.nix
+++ b/users/arpit.nix
@@ -11,6 +11,7 @@
   desktop.enable = true;
 
   # Tools
+  tools.bat.enable = true;
   tools.bluetui.enable = true;
   tools.bottom.enable = true;
   tools.brightnessctl.enable = true;