From ea12f1671800e273a344c221fae6f1bd6c1ef52f Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Wed, 26 Feb 2025 09:57:55 +0100
Subject: [PATCH] home/git: fzf -> skim, coreutils -> uutils

---
 home/programs/git/default.nix                       | 4 ++--
 home/programs/git/scripts/git-fixup-interactive.sh  | 2 +-
 home/programs/git/scripts/git-switch-interactive.sh | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/home/programs/git/default.nix b/home/programs/git/default.nix
index d807f70..125758e 100644
--- a/home/programs/git/default.nix
+++ b/home/programs/git/default.nix
@@ -339,12 +339,12 @@ in
     })
     (pkgs.writeShellApplication {
       name = "git-fixup-interactive";
-      runtimeInputs = with pkgs; [ cfg.package gnused gnugrep fzf ];
+      runtimeInputs = with pkgs; [ cfg.package gnused gnugrep skim ];
       text = lib.fileContents ./scripts/git-fixup-interactive.sh;
     })
     (pkgs.writeShellApplication {
       name = "git-switch-interactive";
-      runtimeInputs = with pkgs; [ cfg.package fzf gnused coreutils ];
+      runtimeInputs = with pkgs; [ cfg.package skim gnused gnugrep uutils-coreutils-noprefix ];
       text = lib.fileContents ./scripts/git-switch-interactive.sh;
       excludeShellChecks = [
         "SC2001" # (style): See if you can use ${variable//search/replace} instead. (sed invocation)
diff --git a/home/programs/git/scripts/git-fixup-interactive.sh b/home/programs/git/scripts/git-fixup-interactive.sh
index 018df6d..38ae4fd 100644
--- a/home/programs/git/scripts/git-fixup-interactive.sh
+++ b/home/programs/git/scripts/git-fixup-interactive.sh
@@ -9,7 +9,7 @@ FORK_POINT=$(git merge-base --fork-point "$TARGET_BRANCH")
 
 COMMITS_SINCE_FORK_POINT=$(git log --format=format:'%s' "$FORK_POINT"..HEAD | grep -v -E '^fixup!')
 
-RESULT=$(fzf <<<"$COMMITS_SINCE_FORK_POINT")
+RESULT=$(sk <<<"$COMMITS_SINCE_FORK_POINT")
 
 if [ "$RESULT" == "" ]; then
   echo "Doing nothing..."
diff --git a/home/programs/git/scripts/git-switch-interactive.sh b/home/programs/git/scripts/git-switch-interactive.sh
index 600a92b..3fb9204 100644
--- a/home/programs/git/scripts/git-switch-interactive.sh
+++ b/home/programs/git/scripts/git-switch-interactive.sh
@@ -6,7 +6,7 @@ if [ -n "${1:-}" ]; then
 fi
 
 BRANCHES=$(cat <(git branch) <(git branch --remotes) | grep --invert-match '^\*\|HEAD ->' | sed 's|^\s*||')
-CHOSEN_BRANCH=$(fzf --reverse --info=inline --preview 'git show --color {}' <<<"$BRANCHES")
+CHOSEN_BRANCH=$(sk --reverse --info=inline --preview 'git show --color {}' <<<"$BRANCHES")
 
 CLEAN_BRANCH_NAME=$(sed 's|^\s*||' <<<"$CHOSEN_BRANCH")
 for REMOTE in $(git remote); do