fix bug

.gitignore

@@ -0,0 +1,27 @@
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk

config/bash/aliases.bash

@@ -2,31 +2,58 @@
 alias dotfiles="bash ~/.dotfiles/bin/dotfiles/main.sh"
 alias colors="bash ~/.dotfiles/bin/colors/colors.sh"
 
-# Command replacements
-alias exa='command exa --group-directories-first -laFh --grid --git --icons'
-alias cat=bat
-alias man=batman
-alias lg=lazygit
-alias matrix='cmatrix -aBf'
-alias fast='fast -u --single-line'
-
-alias ping='c_prettyping'
-alias traceroute='c_mtr'
-
 # History
 alias h="history -15"    # last 10 history commands
 alias hc="history -c"    # clear history
 alias hg="history | rg " # +command
 
-# SSH Public Keys
-alias sshpubkey="pbcopy < ~/.ssh/id_ed25519.pub | echo 'SSH Public Key copied to pasteboard.'"
-
 # IP addresses
 alias pubip="dig +short txt ch whoami.cloudflare @1.0.0.1"
 alias locip="sudo ifconfig | grep -Eo 'inet (addr:)?([0-9]*\\.){3}[0-9]*' | grep -Eo '([0-9]*\\.){3}[0-9]*' | grep -v '127.0.0.1'"
 
-# Update Neovim NVChad
-alias nupdate="nvim -c \"NvChadUpdate\""
-
 # Update LunarVim
 alias lvupdate="lvim +LvimUpdate +q"
+
+# Command replacements
+alias j="z"
+
+alias ls='exa'
+alias la="exa -a"
+alias ll="exa -l --icons"
+alias lla="exa --group-directories-first -laFh --grid --icons"
+alias llg="exa --group-directories-first -laFh --grid --git --icons"
+
+alias mamba='micromamba'
+
+alias cat=bat
+alias grep='grep  --color=auto --exclude-dir={.git}'
+
+alias man=batman
+
+alias lg=lazygit
+alias g='git'
+alias ga='git add'
+alias gaa='git add --all'
+alias gb='git branch'
+alias gc='git commit -v'
+alias gc!='git commit -v --amend'
+alias gca='git commit -v -a'
+alias gca!='git commit -v -a --amend'
+alias gco='git checkout'
+alias gd='git diff'
+alias gl='git pull'
+alias glg='git log --stat'
+alias glog='git log --oneline --decorate --graph'
+alias gm='git merge'
+alias gp='git push'
+alias gst='git status'
+
+alias ps="procs"
+alias du="dust"
+
+alias preview="fzf --preview 'bat --color \"always\" {}'"
+
+alias ping='c_prettyping'
+
+alias adl="aria2c"
+alias ydl="youtube-dl"

config/fish/config.fish

@@ -12,24 +12,13 @@ set fish_color_valid_path
 funcsave fcd >/dev/null
 funcsave mkcd >/dev/null
 funcsave c_prettyping >/dev/null
-funcsave c_mtr >/dev/null
-funcsave flushdns >/dev/null
 funcsave ql >/dev/null
 funcsave sreload >/dev/null
-funcsave treload >/dev/null
 funcsave supdate >/dev/null
 funcsave pupdate >/dev/null
 
 # Aliases
 alias ping c_prettyping
-alias traceroute c_mtr
-
-# Check if the machine is running on Windows WSL
-if test (grep -qi Microsoft /proc/version)
-    # Add HDD aliases for WSL cd into mounted drives
-    alias C "cd /mnt/c"
-    alias D "cd /mnt/d"
-end
 
 # Source starship
 starship init fish | source

config/fish/export.fish

@@ -10,13 +10,11 @@ set -gx LANGUAGE en_US.UTF-8
 set -gx LC_ALL en_US.UTF-8
 set -gx LC_CTYPE en_US.UTF-8
 
-# Set default terminal
-#set -gx TERM alacritty
-
-set -gx PATH "/usr/local/sbin:~/.local/bin:$PATH:~/.cargo/bin"
+#set -gx PATH "/usr/local/sbin:~/.local/bin:$PATH:~/.cargo/bin"
 
 # Add Path
-fish_add_path "./bin"
+fish_add_path "~/.bin"
+fish_add_path "~/.cargo/bin"
 fish_add_path "/usr/local/bin"
 fish_add_path "/usr/local/sbin"
 fish_add_path "/usr/local/opt/"

config/fish/functions/pupdate.fish

@@ -6,5 +6,4 @@ function pupdate --description 'Updates starship shell prompt'
 		case Darwin
 			brew upgrade starship
 	end
-	tmux display-message "Starship Prompt Update Complete"
 end

config/fish/functions/supdate.fish

@@ -6,5 +6,4 @@ function supdate --description 'Updates fish shell'
 		case Darwin
 			brew upgrade fish
 	end
-	tmux display-message "Fish Shell Update Complete"
 end

config/zsh/.zshrc

@@ -109,48 +109,5 @@ rga-fzf() {
 	echo "opening $file" &&
 	xdg-open "$file"
 }
-## alias ##
-alias c="clear"
-alias h="history -E -10"
-alias resource="source ~/.zshrc"
-alias j="z"
-
-alias ls="exa --group-directories-first"
-alias la="exa -a"
-alias ll="exa -l"
-alias lla="exa -la"
-
-alias less="bat"
-alias more="bat"
-
-alias ps="procs"
-alias du="dust"
-alias ping='prettyping --nolegend'
-
-alias adl="aria2c"
-alias ydl="youtube-dl"
-
-alias preview="fzf --preview 'bat --color \"always\" {}'"
-
-alias grep='grep  --color=auto --exclude-dir={.git}'
-
-alias mamba='micromamba'
-
-alias g='git'
-alias ga='git add'
-alias gaa='git add --all'
-alias gb='git branch'
-alias gc='git commit -v'
-alias gc!='git commit -v --amend'
-alias gca='git commit -v -a'
-alias gca!='git commit -v -a --amend'
-alias gco='git checkout'
-alias gd='git diff'
-alias gl='git pull'
-alias glg='git log --stat'
-alias glog='git log --oneline --decorate --graph'
-alias gm='git merge'
-alias gp='git push'
-alias gst='git status'
 
 test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh"

system/macos/setup_shell.sh

@@ -25,8 +25,11 @@ brew_install "Fisher" "fisher"
 print_title "Installing Fish Packages"
 fisher_install "Fisher" "jorgebucaran/fisher"
 fisher_install "FZF" "PatrickF1/fzf.fish"
+fisher_install "Autojump" "jethrokuan/z"
+fisher_install "Autopair" "jorgebucaran/autopair.fish"
 fisher_install "Puffer Fish" "nickeb96/puffer-fish"
 fisher_install "Done" "franciscolourenco/done"
+fisher_install "Abbreviation-tips" "gazorby/fish-abbreviation-tips"
 fisher_install "Fish SSH Agent" "danhper/fish-ssh-agent"
 
 #==================================

system/pop/setup_shell.sh

@@ -31,6 +31,9 @@ print_result $? "Fisher" "true"
 #==================================
 print_title "Installing Fish Packages"
 fisher_install "FZF" "PatrickF1/fzf.fish"
+fisher_install "Autojump" "jethrokuan/z"
+fisher_install "Autopair" "jorgebucaran/autopair.fish"
+fisher_install "Abbreviation-tips" "gazorby/fish-abbreviation-tips"
 fisher_install "Puffer Fish" "nickeb96/puffer-fish"
 fisher_install "Done" "franciscolourenco/done"
 fisher_install "Fish SSH Agent" "danhper/fish-ssh-agent"