improve bat + exa config

2 files changed, 30 insertions, 8 deletions

diff --git a/users/seth/programs/default.nix b/users/seth/programs/default.nix
index 7c9adf6..b3bd2e3 100644
--- a/users/seth/programs/default.nix
+++ b/users/seth/programs/default.nix
@@ -6,10 +6,8 @@
   ];
 
   home.packages = with pkgs; [
-    bat
     btop
     llvmPackages_15.clang
-    exa
     fd
     gh
     lld
diff --git a/users/seth/shell/default.nix b/users/seth/shell/default.nix
index fd9f3a0..3c3f30b 100644
--- a/users/seth/shell/default.nix
+++ b/users/seth/shell/default.nix
@@ -1,12 +1,38 @@
-{config, ...}: {
+{
+  config,
+  pkgs,
+  ...
+}: {
   imports = [
     ./bash.nix
     ./fish.nix
   ];
 
-  programs.starship = {
-    enable = true;
-    enableFishIntegration = true;
+  programs = {
+    bat = {
+      enable = true;
+      config = {
+        theme = "catppuccin";
+      };
+      themes = {
+        catppuccin = builtins.readFile (pkgs.fetchFromGitHub {
+            owner = "catppuccin";
+            repo = "bat";
+            rev = "ba4d16880d63e656acced2b7d4e034e4a93f74b1";
+            sha256 = "sha256-6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw=";
+          }
+          + "/Catppuccin-mocha.tmTheme");
+      };
+    };
+    exa = {
+      enable = true;
+      enableAliases = true;
+      icons = true;
+    };
+    starship = {
+      enable = true;
+      enableFishIntegration = true;
+    };
   };
 
   xdg.configFile."starship.toml".source = ./starship.toml;
@@ -23,8 +49,6 @@
     };
 
     shellAliases = {
-      ls = "exa --icons";
-      la = "ls -a";
       diff = "diff --color=auto";
       g = "git";
       gs = "g status";