Housekeeping

config/fish/config.fish

@@ -43,17 +43,14 @@ set -gx FZF_DEFAULT_COMMAND 'fdfind --exclude={.git,.cache,.xmake,.zig-cache,bui
 # 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"
-fish_add_path /usr/local/bin
-fish_add_path "$HOME/.local/apps/nvim/bin"
-fish_add_path "$HOME/.npm-global/bin"
 fish_add_path /var/lib/flatpak/exports/bin
-fish_add_path "$HOME/.local/share/flatpak/exports/bin"
+fish_add_path /usr/local/bin
 fish_add_path /usr/local/go/bin
 fish_add_path $GOPATH/bin
-fish_add_path "$HOME/.local/bin"
 fish_add_path "$HOME/bin"
+fish_add_path "$HOME/.local/bin"
+fish_add_path "$HOME/.local/share/flatpak/exports/bin"
+fish_add_path "$HOME/.npm-global/bin"
 
 # ==============================================================================
 # ALIASES & ABBREVIATIONS
@@ -75,30 +72,31 @@ alias ln='ln -i'
 alias df='df -h'
 alias du='du -h'
 alias free='free -h'
-alias top='btop'
-alias cat='batcat --theme="gruvbox-dark" --paging=never '
+alias bat='batcat --theme="gruvbox-dark" --paging=never '
 
 # Application shortcuts
 alias nvim='/usr/local/nvim_012/bin/nvim'
 alias vim='nvim'
+alias vi='nvim'
 alias v='nvim'
 alias :q='exit'
-alias files='nautilus .'
+alias files='nemo .'
 alias lg='gitu'
 alias ldk='lazydocker'
 
 # Custom shortcuts
-alias uz='7z'
-alias dotman='bash ~/.dotfiles/install.sh'
 alias reload='source ~/.config/fish/config.fish'
+alias dotman='bash ~/.dotfiles/install.sh'
 alias myip='curl ipinfo.io/ip; echo ""'
 alias lspmake='bear -- make -B'
-alias services-up='docker compose -f /home/jason/Documents/Compose/local-services/docker-compose.yaml up -d'
-alias services-down='docker compose -f /home/jason/Documents/Compose/local-services/docker-compose.yaml down'
 alias tc='tmux attach'
 alias td='tmux detach'
 alias db='lazysql'
 
+# Docker shortcuts
+alias services-up='docker compose -f /home/jason/Documents/Compose/local-services/docker-compose.yaml up -d'
+alias services-down='docker compose -f /home/jason/Documents/Compose/local-services/docker-compose.yaml down'
+
 # ==============================================================================
 # FUNCTIONS
 # ==============================================================================
@@ -133,49 +131,6 @@ function pp
     end
 end
 
-# Extract archive
-function extract
-    if test (count $argv) -ne 1
-        echo "Usage: extract <archive>"
-        return 1
-    end
-
-    if test -f $argv[1]
-        switch $argv[1]
-            case '*.tar.bz2'
-                tar xjf $argv[1]
-            case '*.tar.gz'
-                tar xzf $argv[1]
-            case '*.bz2'
-                bunzip2 $argv[1]
-            case '*.rar'
-                unrar x $argv[1]
-            case '*.gz'
-                gunzip $argv[1]
-            case '*.tar'
-                tar xf $argv[1]
-            case '*.tbz2'
-                tar xjf $argv[1]
-            case '*.tgz'
-                tar xzf $argv[1]
-            case '*.zip'
-                unzip $argv[1]
-            case '*.Z'
-                uncompress $argv[1]
-            case '*.7z'
-                7z x $argv[1]
-            case '*.xz'
-                unxz $argv[1]
-            case '*.lzma'
-                unlzma $argv[1]
-            case '*'
-                echo "'$argv[1]' cannot be extracted via extract()"
-        end
-    else
-        echo "'$argv[1]' is not a valid file"
-    end
-end
-
 # ==============================================================================
 # PROMPT COLORS
 # ==============================================================================

config/tmux/tmux.conf

@@ -13,7 +13,7 @@ set-option -g prefix C-f
 bind-key C-f send-prefix
 
 # reload config file
-bind r source-file ~/.tmux.conf
+bind r source-file ~/.config/tmux/tmux.conf
 
 # switch panes using Alt-arrow without prefix
 setw -g mode-keys vi
@@ -22,7 +22,6 @@ bind -n C-l select-pane -R
 bind -n C-k select-pane -U
 bind -n C-j select-pane -D
 
-
 bind h select-pane -L
 bind l select-pane -R
 bind k select-pane -U
@@ -41,23 +40,20 @@ bind m command-prompt "new-session -s %1"
 # split panes using | and -
 unbind '"'
 unbind %
-
-bind '`' split-window -h -l 40% -c "#{pane_current_path}"
-bind '\' split-window -v -l 35% -c "#{pane_current_path}"
+bind 'v' split-window -h -l 45% -c "#{pane_current_path}"
+bind 't' split-window -v -l 40% -c "#{pane_current_path}"
 
 bind j run-shell -b "~/.local/bin/tmux-toggle-term float"
 bind g run-shell 'tmux popup -d "#{pane_current_path}" -xC -yC -w90% -h90% -E gitu'
 bind e run-shell 'tmux popup -d "#{pane_current_path}" -xC -yC -w90% -h90% -E "~/.local/bin/tmux-lf"'
 
 ## STATUS BAR ##################################################################
-
 ## Status bar design
 set -g status-justify centre
 set -g status-position top
-set -g status-bg '#191927'
+set -g status-bg '#16161D'
 set -g status-fg '#c5c9c5'
-
 ## Show PREFIX on right side when c-b
-set -g status-left '#[fg=colour232,bg="#af875f",bold]#{?client_prefix, <PK> ,}#[fg="#1c1c1c",bg="#767676",bold][#S] '
+set -g status-left '#[fg=colour232,bg="#af875f",bold]#{?client_prefix, [PFX] ,}#[fg="#1c1c1c",bg="#767676",bold][#S] '
 set -g status-left-length 20
 set -g status-right ''