From c6214990e3f1277136664f6fc6e1d6a0db465db4 Mon Sep 17 00:00:00 2001
From: Joey Hafner <joey@jafner.net>
Date: Sat, 14 Sep 2024 15:07:15 -0700
Subject: [PATCH] Update from joey@joey-laptop: Add fzf-git-sh, pass
 pkgs-unstable to home-manager to facilitate

---
 nix/flake.nix             |  5 +++++
 nix/home-manager/home.nix | 24 +++++++++++++++++-------
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/nix/flake.nix b/nix/flake.nix
index 81cd885e..fe147f88 100644
--- a/nix/flake.nix
+++ b/nix/flake.nix
@@ -24,6 +24,8 @@
       lib = nixpkgs.lib;
       system = "x86_64-linux";
       pkgs = nixpkgs.legacyPackages.${system};
+      pkgs-stable = nixpkgs-stable.legacyPackages.${system};
+      pkgs-unstable = nixpkgs-unstable.legacyPackages.${system};
     in {
     nixosConfigurations = {
       joey-laptop = lib.nixosSystem {
@@ -40,6 +42,9 @@
     homeConfigurations = {
       joey = home-manager.lib.homeManagerConfiguration {
         pkgs = pkgs;
+        extraSpecialArgs = {
+          pkgs-unstable = pkgs-unstable;
+        };
         modules = [ ./home-manager/home.nix ];
       };
     };
diff --git a/nix/home-manager/home.nix b/nix/home-manager/home.nix
index 1e2266f4..d23881e0 100644
--- a/nix/home-manager/home.nix
+++ b/nix/home-manager/home.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, pkgs-unstable, ... }:
 
 {
   home.username = "joey";
@@ -7,14 +7,27 @@
   home.packages = with pkgs; [
     fastfetch
     tree 
+    bat
     wl-clipboard
-    fzf
     fd
     flatpak
+    fzf-git-sh
+    tmux
   ];
   home.file = {};
-  
+
+    
+
   # Programs
+  ## fzf
+  programs.fzf = {
+    enable = true;
+    package = pkgs-unstable.fzf;
+    defaultCommand = "fd --hidden --strip-cwd-prefix --exclude .git";
+    fileWidgetCommand = "$FZF_DEFAULT_COMMAND";
+    changeDirWidgetCommand = "fd --type=d --hidden --strip-cwd-prefix --exclude .git .";
+    enableZshIntegration = true;
+  };
   ## Hyprland
   programs.kitty.enable = true;
   #wayland.windowManager.hyprland = {
@@ -39,6 +52,7 @@
     autosuggestion.enable = true;
     syntaxHighlighting.enable = true;
     shellAliases = {
+      cat = "bat";
       nos = "sudo nixos-rebuild switch --flake .";
       hms = "home-manager switch --flake .";
       nu = "nos && hms";
@@ -63,10 +77,6 @@
       bindkey '^[w' kill-region # Delete
       bindkey '^I^I' autosuggest-accept # Tab, Tab
       bindkey '^[' autosuggest-clear # Esc
-      eval "$(fzf --zsh)"
-      export FZF_DEFAULT_COMMAND="fd --hidden --strip-cwd-prefix --exclude .git"
-      export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND"
-      export FZF_ALT_C_COMMAND="fd --type=d --hidden --strip-cwd-prefix --exclude .git"
       _fzf_compgen_path() {
         fd --hidden --exclude .git . "$1"
       }