Compare commits

...

3 Commits

4 changed files with 143 additions and 11 deletions

View File

@@ -14,6 +14,11 @@ stores:
- .env - .env
- .functions - .functions
- .prompt - .prompt
fish:
target: ~/.config/fish
files:
- config.fish
- aliases.fish
fun: fun:
target: "~" target: "~"
files: files:

View File

@@ -1,15 +1,15 @@
# Custom Bash Aliases # Custom Bash Aliases
## system services # system services
alias restart="sudo systemctl restart" alias restart="sudo systemctl restart"
alias status="sudo systemctl status" alias status="sudo systemctl status"
## navigation # navigation
alias ..='cd ..' alias ..='cd ..'
alias ...='cd ../../' alias ...='cd ../../'
alias ....='cd ../../../' alias ....='cd ../../../'
## system information # system information
alias connections="sudo netstat -tunlp" alias connections="sudo netstat -tunlp"
alias ports='netstat -tulanp' alias ports='netstat -tulanp'
alias path='echo -e ${PATH//:/\\n}' alias path='echo -e ${PATH//:/\\n}'
@@ -17,39 +17,44 @@ alias free='free -m -l -t'
alias psmem='ps auxf | sort -nr -k 4 | head -10' alias psmem='ps auxf | sort -nr -k 4 | head -10'
alias pscpu='ps auxf | sort -nr -k 3 | head -10' alias pscpu='ps auxf | sort -nr -k 3 | head -10'
## system logs # system logs
alias logtail="tail -n 200 /var/log/syslog" alias logtail="tail -n 200 /var/log/syslog"
## system administration # system administration
alias upgrade="sudo apt update && sudo apt upgrade -y" alias upgrade="sudo apt update && sudo apt upgrade -y"
alias syscat='systemctl cat' alias syscat='systemctl cat'
alias sysls='systemctl list-unit-files --type=service --state=enabled' alias sysls='systemctl list-unit-files --type=service --state=enabled'
alias syslsa='systemctl list-unit-files --type=service' alias syslsa='systemctl list-unit-files --type=service'
## safe defaults # safe defaults
alias rm='rm -I --preserve-root' alias rm='rm -I --preserve-root'
alias chown='chown --preserve-root' alias chown='chown --preserve-root'
alias chmod='chmod --preserve-root' alias chmod='chmod --preserve-root'
alias chgrp='chgrp --preserve-root' alias chgrp='chgrp --preserve-root'
## apps # alias `git` and add completion
alias g='git' alias g='git'
# enable tab completion for 'g' by marking as alias for 'git' # enable tab completion for 'g' by marking as alias for 'git'
if type _git &> /dev/null; then if type _git &> /dev/null; then
complete -o default -o nospace -F _git g; complete -o default -o nospace -F _git g;
fi fi
alias bat='batcat' # bat[cat] setup -- check for command name and alias accordingly
if command -v batcat &> /dev/null && ! command -v bat &> /dev/null; then
alias bat='batcat'
fi
# use `bat` for help command (override bash built-in)
alias bathelp='bat --plain --language=help' alias bathelp='bat --plain --language=help'
help() { help() {
"$@" --help 2>&1 | bathelp "$@" --help 2>&1 | bathelp
} }
## text editing # text editing
alias edit="emacs" alias edit="emacs"
alias sedit="sudo emacs" alias sedit="sudo emacs"
## ls helpers # ls helpers
alias l="ls -lFh --color" alias l="ls -lFh --color"
alias la="ls -AF --color" # exclude . and .. alias la="ls -AF --color" # exclude . and ..
alias lsd="ls -lFh --color | grep --color=never '^d'" # only directories alias lsd="ls -lFh --color | grep --color=never '^d'" # only directories
@@ -61,7 +66,7 @@ alias grep='grep --color=auto'
alias fgrep='fgrep --color=auto' alias fgrep='fgrep --color=auto'
alias egrep='egrep --color=auto' alias egrep='egrep --color=auto'
## misc utils # misc utils
alias ip="dig +short myip.opendns.com @resolver1.opendns.com" alias ip="dig +short myip.opendns.com @resolver1.opendns.com"
alias ping='ping -c 5' alias ping='ping -c 5'
alias reload="exec ${SHELL} -l" # reload the shell alias reload="exec ${SHELL} -l" # reload the shell

90
fish/aliases.fish Normal file
View File

@@ -0,0 +1,90 @@
# Custom aliases, ported from bash ~/.aliases
# system services
alias restart 'sudo systemctl restart'
alias sysstatus 'sudo systemctl status' # `status` is a reserved fish builtin
# navigation (fish also cds on a bare directory path like `..` or `../..`)
alias .. 'cd ..'
alias ... 'cd ../..'
alias .... 'cd ../../..'
# system information
alias connections 'sudo netstat -tunlp'
alias ports 'netstat -tulanp'
function pathls --description 'Print PATH one entry per line'
printf '%s\n' $PATH
end
alias free 'free -m -l -t'
function psmem --description 'Top 10 processes by memory'
ps auxf | sort -nr -k 4 | head -10
end
function pscpu --description 'Top 10 processes by CPU'
ps auxf | sort -nr -k 3 | head -10
end
# system logs
alias logtail 'tail -n 200 /var/log/syslog'
# system administration
alias upgrade 'sudo apt update && sudo apt upgrade -y'
alias syscat 'systemctl cat'
alias sysls 'systemctl list-unit-files --type=service --state=enabled'
alias syslsa 'systemctl list-unit-files --type=service'
# safe defaults
alias rm 'rm -I --preserve-root'
alias chown 'chown --preserve-root'
alias chmod 'chmod --preserve-root'
alias chgrp 'chgrp --preserve-root'
# git (no completion setup needed like with bash)
alias g git
# check for existence of batcat command before aliasing
if command -q batcat; and not command -q bat
alias bat batcat
end
# overrides built-in `help` command
alias bathelp 'bat --plain --language=help'
function help --description "Show a command's --help through bat"
$argv --help 2>&1 | bathelp
end
# text editing
alias edit emacs
alias sedit 'sudo emacs'
# ls helpers (override system-wide fish config aliases)
if command -q eza
# use `eza` if available; -a hides . and .. like ls -A
set -l eza_opts --color=auto --icons=auto --group-directories-first
alias ls "eza $eza_opts" # preferred listing
alias l "eza -lF $eza_opts" # long format
alias la "eza -a $eza_opts" # all files and dirs
alias ll "eza -alF $eza_opts" # long format, all files
alias lt "eza -aT $eza_opts" # tree listing
alias lsd "eza -lD $eza_opts" # only directories
alias l. "eza -a | grep -e '^\.'" # only dotfiles
else
# fallback to `ls`
alias ls 'command ls --color' # always color
alias l 'ls -lFh'
alias la 'ls -AF' # exclude . and ..
alias ll 'ls -AlFh'
function lsd --description 'List only directories'
command ls -lFh --color=always $argv | grep --color=never '^d'
end
end
# always enable colored grep output
alias grep 'grep --color=auto'
alias fgrep 'fgrep --color=auto'
alias egrep 'egrep --color=auto'
# misc utils
alias ip 'dig +short myip.opendns.com @resolver1.opendns.com'
alias ping 'ping -c 5'
alias reload 'exec fish -l' # reload the shell

32
fish/config.fish Normal file
View File

@@ -0,0 +1,32 @@
# this config file runs last after all ./conf.d/* files
# system-wide fish config
source /usr/share/cachyos-fish-config/cachyos-config.fish
# overwrite greeting
# potentially disabling fastfetch
#function fish_greeting
# smth smth
#end
# load custom aliases that clobber system-wide sourced in above config
test -r ~/.config/fish/aliases.fish; and source ~/.config/fish/aliases.fish
# common bin directories
fish_add_path --global --prepend ~/.local/bin ~/bin
# opencode
fish_add_path /home/adrian/.opencode/bin
# Go code paths
fish_add_path /usr/local/go/bin
fish_add_path "$(go env GOPATH)/bin"
# fun scripts
if string match -qir '^(1|y|yes|true|on)$' -- "$HAVE_FUN"
and test -r ~/.config/fish/fun.fish
source ~/.config/fish/fun.fish
end
# init oh-my-posh with custom theme
oh-my-posh init fish --config '~/.omp/themes/custom.json' | source