diff --git a/home-manager/home-bat.nix b/home-manager/home-bat.nix
new file mode 100644
index 0000000..cf64552
--- /dev/null
+++ b/home-manager/home-bat.nix
@@ -0,0 +1,16 @@
+pkgs:
+    {
+        enable = true;
+        extraPackages = with pkgs.bat-extras; [ batdiff batman batgrep batwatch ];
+        config = {
+            theme = "catppuccin-macchiato";
+        };
+        themes = {
+          catppuccin-macchiato = builtins.readFile (pkgs.fetchFromGitHub {
+            owner = "catppuccin";
+            repo = "sublime-text"; # Bat uses sublime syntax for its themes
+            rev = "3d8625d937d89869476e94bc100192aa220ce44a";
+            sha256 = "3ABUsfJpb6RO6AiuuSL5gwDofJIwC5tlEMzBrlY9/s0=";
+          } + "/Macchiato.tmTheme");
+        };
+    }
diff --git a/home-manager/home-fzf.nix b/home-manager/home-fzf.nix
new file mode 100644
index 0000000..89c0be1
--- /dev/null
+++ b/home-manager/home-fzf.nix
@@ -0,0 +1,8 @@
+{
+    enable = true;
+    defaultCommand = "fd --type f";
+    fileWidgetCommand = "fd --type f";
+    fileWidgetOptions = "--preview 'bat --color=always --style=numbers --line-range=:500 {}'";
+    changeDirWidgetCommand = "fd --type d";
+    tmux.enableShellIntegration = true;
+}
diff --git a/home-manager/home-tmux.nix b/home-manager/home-tmux.nix
index 3120d9e..f34d028 100644
--- a/home-manager/home-tmux.nix
+++ b/home-manager/home-tmux.nix
@@ -9,6 +9,5 @@
     extraConfig = ''
 bind-key -T copy-mode-vi 'v' send -X begin-selection
 bind-key -T copy-mode-vi 'y' send -X copy-selection-and-cancel
-set -g status off
     '';
 }
diff --git a/home-manager/home.nix b/home-manager/home.nix
index 0a88bac..f78283c 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -8,6 +8,7 @@
 
   home.sessionVariables.TEST = "foo";
   home.sessionVariables.RUST_SRC_PATH = "${pkgs.rust-bin.stable."1.68.0".rust-src}/lib/rustlib/src/rust/library";
+  home.sessionVariables.BAT_THEME = "${pkgs.rust-bin.stable."1.68.0".rust-src}/lib/rustlib/src/rust/library";
 
   home.packages = [
     # pkgs.apacheKafka
@@ -15,6 +16,7 @@
     pkgs.awscli
     pkgs.emacs
     pkgs.fd
+    pkgs.fend
     # pkgs.ghc
     # pkgs.go
     # pkgs.haskellPackages.cabal-install
@@ -41,6 +43,7 @@
     # pkgs.rustup
     # pkgs.sbcl
     # pkgs.source-code-pro
+    pkgs.tokei
     # pkgs.xonsh
     pkgs.yarn
     # pkgs.zellij