Merge branch 'master' of https://github.com/js0ny/dotfiles

tools/fish/conf.d/0init.fish

@@ -31,6 +31,9 @@ else if test -d /home/linuxbrew/.linuxbrew/bin # Linux
     set -gx PATH /home/linuxbrew/.linuxbrew/bin $PATH
 end
 
+if command -v brew > /dev/null
+    set -gx HOMEBREW_NO_ENV_HINTS
+end
 
 # Azure CLI
 if command -v az > /dev/null
@@ -102,6 +105,7 @@ if command -v gem > /dev/null
             set -gx PATH $dir $PATH
         end
     end
+    set -gx PATH $HOME/.local/share/gem/ruby/3.3.0/bin $PATH
 end
 # Spacemacs
 if command -v emacs > /dev/null
@@ -135,3 +139,18 @@ if status is-interactive
         set IPYTHONDIR $XDG_CONFIG_HOME/ipython
     end
 end
+
+# Coursier: Scala dependency manager
+if command -v coursier > /dev/null
+    set -gx PATH "$PATH:$XDG_DATA_HOME/coursier/bin"
+end
+# pnpm
+set -gx PNPM_HOME "$XDG_DATA_HOME/pnpm"
+if not string match -q -- $PNPM_HOME $PATH
+  set -gx PATH "$PNPM_HOME" $PATH
+end
+# pnpm end
+
+test -d /opt/miniconda3 && source /opt/miniconda3/etc/fish/conf.d/conda.fish
+
+test -f /opt/miniconda3/etc/fish/conf.d/conda.fish && source /opt/miniconda3/etc/fish/conf.d/conda.fish

tools/fish/conf.d/alias.fish

@@ -69,4 +69,11 @@ if command -v pacman > /dev/null
     abbr --add paci "sudo pacman -S"
     abbr --add pacr "sudo pacman -R"
     abbr --add pacu "sudo pacman -Syu"
+    abbr --add pacs "sudo pacman -Ss"
+end
+
+if test "$TERM" = "xterm-ghostty" -o "$TERM" = "xterm-kitty"
+    abbr --add icat "kitten icat"
+else if test "$TERM_PROGRAM" = "WezTerm"
+    abbr --add icat "wezterm imgcat"
 end

tools/fish/conf.d/keymap.fish

@@ -25,4 +25,4 @@ bind -M default 'i' forward-char
 bind -M default -m insert l repaint-mode
 bind -M default -m insert L beginning-of-line repaint-mode
 
-# TODO: Add more key bindings here
+fzf --fish | source

tools/fish/conf.d/prompt.fish

@@ -8,6 +8,6 @@
 # ln -sf $DOTFILES/tools/fish ~/.config/fish
 
 if command -v starship > /dev/null
-    set -gx STARSHIP_CONFIG $DOTFILES/tools/starship/starship_fish.toml
+    set -gx STARSHIP_CONFIG "~/.dotfiles/tools/starship/starship_fish.toml"
     starship init fish | source
 end

tools/fish/config.fish

@@ -16,9 +16,22 @@ if status is-interactive
         # macOS Specific
         abbr --add clip pbcopy
         abbr --add paste pbpaste
+        # Use GNU Coreutils
+        alias cp=gcp
+        alias ln=gln
+        alias mkdir=gmkdir
+        alias mv=gmv
+        alias rm=grm
+        alias rmdir=grmdir
+        alias touch=gtouch
+
     case "Linux"
         # Linux Specific
     case '*'
         # Default / Fallback case
     end
 end
+
+# bun
+set --export BUN_INSTALL "$HOME/.bun"
+set --export PATH $BUN_INSTALL/bin $PATH