Small update/tweaks.

This commit is contained in:
Jason Hilder 2026-04-01 08:07:27 +02:00
parent aa5857eb87
commit e0316a18ed
3 changed files with 12 additions and 45 deletions

View File

@ -1,7 +1,6 @@
# ============================================================================== # ==============================================================================
# ENVIRONMENT VARIABLES # ENVIRONMENT VARIABLES
# ============================================================================== # ==============================================================================
# Disable fish greeting # Disable fish greeting
set -g fish_greeting set -g fish_greeting
@ -22,9 +21,9 @@ set -gx GOCACHE "$HOME/.go/cache"
set -gx GOROOT /usr/local/go set -gx GOROOT /usr/local/go
set -gx PATH /usr/local/go/bin $GOPATH/bin $PATH set -gx PATH /usr/local/go/bin $GOPATH/bin $PATH
# ==============================================================================
# FZF configuration # 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 " set -gx FZF_DEFAULT_OPTS "
--height 40% --height 40%
--layout=reverse --layout=reverse
@ -35,10 +34,11 @@ set -gx FZF_DEFAULT_OPTS "
--color=fg:#ffffff,header:#f38ba8,info:#cba6ac,pointer:#f5e0dc --color=fg:#ffffff,header:#f38ba8,info:#cba6ac,pointer:#f5e0dc
--color=marker:#f5e0dc,fg+:#cdd6f4,prompt:#cba6ac,hl+:#f38ba8" --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 # PATH CONFIGURATION
# ============================================================================== # ==============================================================================
# Fish's 'fish_add_path' is smart: it checks if the dir exists and prevents duplicates. # 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/.local/bin"
fish_add_path "$HOME/bin" fish_add_path "$HOME/bin"
@ -56,7 +56,6 @@ fish_add_path "$HOME/bin"
# ============================================================================== # ==============================================================================
# ALIASES & ABBREVIATIONS # ALIASES & ABBREVIATIONS
# ============================================================================== # ==============================================================================
# List commands # List commands
alias ls='ls -lh --color=auto --group-directories-first' alias ls='ls -lh --color=auto --group-directories-first'
alias ll='ls -lAh --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 du='du -h'
alias free='free -h' alias free='free -h'
alias top='btop' alias top='btop'
alias cat='batcat --paging=never'
# Application shortcuts # Application shortcuts
# alias vim='nvim' alias vim='nvim'
alias v='nvim' alias v='nvim'
alias :q='exit' alias :q='exit'
alias files='nemo .' alias files='nautilus .'
alias lg='gitu' alias lg='gitu'
# Custom shortcuts # Custom shortcuts
@ -93,7 +93,6 @@ alias lspmake='bear -- make -B'
# ============================================================================== # ==============================================================================
# FUNCTIONS # FUNCTIONS
# ============================================================================== # ==============================================================================
# Project Manager # Project Manager
function pp function pp
set -l project_file "$HOME/.projects" set -l project_file "$HOME/.projects"
@ -125,26 +124,6 @@ function pp
end end
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 # Extract archive
function extract function extract
if test (count $argv) -ne 1 if test (count $argv) -ne 1
@ -188,6 +167,9 @@ function extract
end end
end end
# ==============================================================================
# PROMPT COLORS
# ==============================================================================
set -l user_color (set_color green) set -l user_color (set_color green)
set -l host_color (set_color blue) set -l host_color (set_color blue)
set -l path_color (set_color cyan) 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_dirtystate '+'
set -g __fish_git_prompt_char_stagedstate '●' set -g __fish_git_prompt_char_stagedstate '●'
set -g __fish_git_prompt_char_untrackedfiles '' 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

View File

@ -1,6 +1,6 @@
[general] [general]
always_show_help.enabled = true always_show_help.enabled = true
# collapsed_sections = ["staged_changes"] collapsed_sections = ["staged_changes"]
refresh_on_file_change.enabled = true refresh_on_file_change.enabled = true
stash_list_limit = 20 stash_list_limit = 20
recent_commits_limit = 100 recent_commits_limit = 100

View File

@ -149,7 +149,7 @@ if [ "$DO_INSTALL" = true ]; then
REQUIRED_PACKAGES=( REQUIRED_PACKAGES=(
# system essentials # system essentials
wget curl git unzip 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 build-essential make bear valgrind fish
# php dependencies # php dependencies
composer php-cli php-common php-curl composer php-cli php-common php-curl