From e0316a18edbc10c63e7c6e79464c97da1622baf0 Mon Sep 17 00:00:00 2001
From: Jason Hilder <jhilder95@gmail.com>
Date: Wed, 1 Apr 2026 08:07:27 +0200
Subject: [PATCH] Small update/tweaks.

---
 config/fish/config.fish | 53 ++++++++---------------------------------
 config/gitu/config.toml |  2 +-
 install.sh              |  2 +-
 3 files changed, 12 insertions(+), 45 deletions(-)

diff --git a/config/fish/config.fish b/config/fish/config.fish
index 714a185..0765089 100644
--- a/config/fish/config.fish
+++ b/config/fish/config.fish
@@ -1,7 +1,6 @@
 # ==============================================================================
 # ENVIRONMENT VARIABLES
 # ==============================================================================
-
 # Disable fish greeting
 set -g fish_greeting
 
@@ -22,9 +21,9 @@ set -gx GOCACHE "$HOME/.go/cache"
 set -gx GOROOT /usr/local/go
 set -gx PATH /usr/local/go/bin $GOPATH/bin $PATH
 
+# ==============================================================================
 # FZF configuration
-# set -gx FZF_DEFAULT_COMMAND 'fdfind --exclude={.git,.cache,.xmake,.zig-cache,build,tmp,node_modules,elpa} --type f -H'
-
+# ==============================================================================
 set -gx FZF_DEFAULT_OPTS "
      --height 40%
      --layout=reverse
@@ -35,10 +34,11 @@ set -gx FZF_DEFAULT_OPTS "
      --color=fg:#ffffff,header:#f38ba8,info:#cba6ac,pointer:#f5e0dc
      --color=marker:#f5e0dc,fg+:#cdd6f4,prompt:#cba6ac,hl+:#f38ba8"
 
+set -gx FZF_DEFAULT_COMMAND 'fdfind --exclude={.git,.cache,.xmake,.zig-cache,build,tmp,node_modules,elpa} --type f -H'
+
 # ==============================================================================
 # PATH CONFIGURATION
 # ==============================================================================
-
 # Fish's 'fish_add_path' is smart: it checks if the dir exists and prevents duplicates.
 fish_add_path "$HOME/.local/bin"
 fish_add_path "$HOME/bin"
@@ -56,7 +56,6 @@ fish_add_path "$HOME/bin"
 # ==============================================================================
 # ALIASES & ABBREVIATIONS
 # ==============================================================================
-
 # List commands
 alias ls='ls -lh --color=auto --group-directories-first'
 alias ll='ls -lAh --color=auto --group-directories-first'
@@ -75,12 +74,13 @@ alias df='df -h'
 alias du='du -h'
 alias free='free -h'
 alias top='btop'
+alias cat='batcat --paging=never'
 
 # Application shortcuts
-# alias vim='nvim'
+alias vim='nvim'
 alias v='nvim'
 alias :q='exit'
-alias files='nemo .'
+alias files='nautilus .'
 alias lg='gitu'
 
 # Custom shortcuts
@@ -93,7 +93,6 @@ alias lspmake='bear -- make -B'
 # ==============================================================================
 # FUNCTIONS
 # ==============================================================================
-
 # Project Manager
 function pp
     set -l project_file "$HOME/.projects"
@@ -125,26 +124,6 @@ function pp
     end
 end
 
-# Build wrapper
-function build
-    if contains -- $argv[1] "-h" "--help"
-        echo "build - Wrapper function for project build.sh files"
-        echo "Usage: build [arguments...]"
-        return 0
-    end
-
-    if not test -f "./build.sh"
-        echo "Error: No build.sh found in current directory" >&2
-        return 1
-    end
-
-    if not test -x "./build.sh"
-        chmod +x "./build.sh"
-    end
-
-    ./build.sh $argv
-end
-
 # Extract archive
 function extract
     if test (count $argv) -ne 1
@@ -188,6 +167,9 @@ function extract
     end
 end
 
+# ==============================================================================
+# PROMPT COLORS
+# ==============================================================================
 set -l user_color (set_color green)
 set -l host_color (set_color blue)
 set -l path_color (set_color cyan)
@@ -203,18 +185,3 @@ set -g __fish_git_prompt_separator ' '
 set -g __fish_git_prompt_char_dirtystate '+'
 set -g __fish_git_prompt_char_stagedstate '●'
 set -g __fish_git_prompt_char_untrackedfiles ''
-
-# ==============================================================================
-# FZF PROJECT-AWARE COMMAND
-# ==============================================================================
-
-function __fzf_update_cmd --on-variable PWD
-    if test -f project.godot; or test -f ../project.godot
-        set -gx FZF_DEFAULT_COMMAND 'fdfind --type f -e gd -e cs -e gdshader -e shader -e tscn -e tres -e cfg --exclude .godot --exclude .import'
-    else
-        set -gx FZF_DEFAULT_COMMAND 'fdfind --exclude={.git,.cache,.xmake,.zig-cache,build,tmp,node_modules,elpa} --type f -H'
-    end
-end
-
-# Run once on shell start
-__fzf_update_cmd
diff --git a/config/gitu/config.toml b/config/gitu/config.toml
index 8e4cc79..b21215a 100644
--- a/config/gitu/config.toml
+++ b/config/gitu/config.toml
@@ -1,6 +1,6 @@
 [general]
 always_show_help.enabled = true
-# collapsed_sections = ["staged_changes"]
+collapsed_sections = ["staged_changes"]
 refresh_on_file_change.enabled = true
 stash_list_limit = 20
 recent_commits_limit = 100
diff --git a/install.sh b/install.sh
index fe1a039..204274e 100755
--- a/install.sh
+++ b/install.sh
@@ -149,7 +149,7 @@ if [ "$DO_INSTALL" = true ]; then
     REQUIRED_PACKAGES=(
         # system essentials
         wget curl git unzip
-        fzf fd-find btop direnv ripgrep tree
+        fzf fd-find btop direnv ripgrep tree bat
         build-essential make bear valgrind fish
         # php dependencies
         composer php-cli php-common php-curl