From 2ffa01bc56da31043056213892bbcd42ceb07a24 Mon Sep 17 00:00:00 2001
From: Joe Frikker <jfrikker@gmail.com>
Date: Fri, 5 Jan 2024 16:24:48 -0500
Subject: [PATCH] bat, and no more rust

---
 home-manager/home-bat.nix  | 16 ++++++++++------
 home-manager/home-tmux.nix |  1 +
 home-manager/home.nix      | 14 +++++++++-----
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/home-manager/home-bat.nix b/home-manager/home-bat.nix
index f257c63..084a96c 100644
--- a/home-manager/home-bat.nix
+++ b/home-manager/home-bat.nix
@@ -3,14 +3,18 @@ pkgs:
         enable = true;
         extraPackages = with pkgs.bat-extras; [ batdiff batman batgrep batwatch ];
         config = {
+            style = "numbers";
             theme = "catppuccin-frappe";
         };
         themes = {
-          catppuccin-frappe = builtins.readFile (pkgs.fetchFromGitHub {
-            owner = "catppuccin";
-            repo = "sublime-text"; # Bat uses sublime syntax for its themes
-            rev = "3d8625d937d89869476e94bc100192aa220ce44a";
-            sha256 = "3ABUsfJpb6RO6AiuuSL5gwDofJIwC5tlEMzBrlY9/s0=";
-          } + "/Frappe.tmTheme");
+          catppuccin-frappe = {
+            src = pkgs.fetchFromGitHub {
+                owner = "catppuccin";
+                repo = "sublime-text"; # Bat uses sublime syntax for its themes
+                rev = "3d8625d937d89869476e94bc100192aa220ce44a";
+                sha256 = "3ABUsfJpb6RO6AiuuSL5gwDofJIwC5tlEMzBrlY9/s0=";
+            };
+            file = "Frappe.tmTheme";
+          };
         };
     }
diff --git a/home-manager/home-tmux.nix b/home-manager/home-tmux.nix
index 12c0cbd..f72dc9b 100644
--- a/home-manager/home-tmux.nix
+++ b/home-manager/home-tmux.nix
@@ -24,6 +24,7 @@ set -g @thumbs-unique enabled
     shell = pkgs.zsh + "/bin/zsh";
     shortcut = "Space";
     tmuxinator.enable = true;
+    terminal = "screen-256color";
     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
diff --git a/home-manager/home.nix b/home-manager/home.nix
index 917dc1b..06ce600 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -9,6 +9,10 @@
     # home.sessionVariables.BAT_THEME = "catppuccin-frappe";
     home.sessionVariables.EDITOR = "nvim";
     home.sessionVariables.RUST_SRC_PATH = "${pkgs.rust-bin.stable."1.68.0".rust-src}/lib/rustlib/src/rust/library";
+    
+    home.sessionPath=[
+        "~/.cargo/bin"
+    ];
 
     xdg.enable = true;
     # xdg.configFile."k9s/skin.yml" = {
@@ -76,9 +80,9 @@
         pkgs.ripgrep
         pkgs.rlwrap
         # pkgs.rust-analyzer
-        pkgs.rust-script
-        pkgs.rust-bin.stable."1.68.0".default
-        pkgs.rust-bin.stable."1.68.0".rust-analyzer
+        # pkgs.rust-script
+        # pkgs.rust-bin.stable."1.68.0".default
+        # pkgs.rust-bin.stable."1.68.0".rust-analyzer
         # pkgs.rustup
         pkgs.sbcl
         # pkgs.source-code-pro
@@ -105,7 +109,7 @@
 
 
     programs.bash.enable = true;
-    # programs.bat = import ./home-bat.nix pkgs;
+    programs.bat = import ./home-bat.nix pkgs;
     programs.btop.enable = true;
     programs.direnv.enable = true;
     programs.eza = import ./home-exa.nix;
@@ -114,7 +118,7 @@
     # programs.gh.enable = true;
     programs.git.enable = true;
     programs.git.delta.enable = true;
-    # programs.ion.enable = true;
+    programs.ion.enable = true;
     # programs.java.enable = true;
     # programs.java.package = pkgs.jdk17;
     programs.jq.enable = true;