diff --git a/aliases.fish b/aliases.fish index de9bbc3..b2e4cd5 100644 --- a/aliases.fish +++ b/aliases.fish @@ -1,44 +1,5 @@ #!/bin/fish -# ─< Function to echo text with bold black color >──────────────────────────────────────── -function black - echo -ne (set_color --bold black)"$argv"(set_color normal)"\n" -end - -# ─< Function to echo text with bold red color >────────────────────────────────────────── -function red - echo -ne (set_color --bold red)"$argv"(set_color normal)"\n" -end - -# ─< Function to echo text with bold green color >──────────────────────────────────────── -function green - echo -ne (set_color --bold green)"$argv"(set_color normal)"\n" -end - -# ─< Function to echo text with bold yellow color >─────────────────────────────────────── -function yellow - echo -ne (set_color --bold yellow)"$argv"(set_color normal)"\n" -end - -# ─< Function to echo text with bold blue color >───────────────────────────────────────── -function blue - echo -ne (set_color --bold blue)"$argv"(set_color normal)"\n" -end - -# ─< Function to echo text with bold magenta color >────────────────────────────────────── -function magenta - echo -ne (set_color --bold magenta)"$argv"(set_color normal)"\n" -end - -# ─< Function to echo text with bold cyan color >───────────────────────────────────────── -function cyan - echo -ne (set_color --bold cyan)"$argv"(set_color normal)"\n" -end - -# ─< Function to echo text with bold white color >──────────────────────────────────────── -function white - echo -ne (set_color --bold white)"$argv"(set_color normal)"\n" -end # ─< t stands for trash(-cli) >─────────────────────────────────────────────────────────── function _trash @@ -59,7 +20,6 @@ if command -v lsd >/dev/null 2>&1 alias ls="lsd -l -1 -h1 --almost-all --git" alias l="lsd -1" alias ll="lsd -1 --almost-all" - alias clearl="command clear && l" alias tree="lsd --tree" else # ─< exa >────────────────────────────────────────────────────────────────────────────────── @@ -84,10 +44,7 @@ else end end -# ─< set alias for clearl >───────────────────────────────────────────────────────────────── -if alias l >/dev/null 2>&1 - alias clearl="command clear && l" -end +alias clearl="command clear && l" # ─< colored everything >─────────────────────────────────────────────────────────────────── alias ip="ip --color=always" diff --git a/config.fish b/config.fish index bdb85cc..bac184e 100644 --- a/config.fish +++ b/config.fish @@ -1,17 +1,17 @@ if status is-interactive # ─< Commands to run in interactive sessions can go here >────────────── function _source - if test -d $HOME/.config/fish/init/ - source $HOME/.config/fish/init/setup.fish - # ────────────────────────────────────< setup some stuff >──────────────────────────────────── - upin - # dep_fisher - else - notify-send "no fish config.." - end - if test -e $HOME/.config/fish/aliases.fish - source $HOME/.config/fish/aliases.fish - end + if test -d $HOME/.config/fish/init/ + source $HOME/.config/fish/init/setup.fish + # ────────────────────────────────────< setup some stuff >──────────────────────────────────── + upin + # dep_fisher + else + notify-send "no fish config.." + end + if test -e $HOME/.config/fish/aliases.fish + source $HOME/.config/fish/aliases.fish + end end end @@ -25,15 +25,15 @@ end # ────────────────────────────────────────< sources >────────────────────────────────────── function _source if test -d $HOME/.config/fish/init/ - source $HOME/.config/fish/init/setup.fish - # ────────────────────────────────────< setup some stuff >──────────────────────────────────── - upin - # dep_fisher + source $HOME/.config/fish/init/setup.fish + # ────────────────────────────────────< setup some stuff >──────────────────────────────────── + upin + # dep_fisher else - notify-send "no fish config.." + notify-send "no fish config.." end if test -e $HOME/.config/fish/aliases.fish - source $HOME/.config/fish/aliases.fish + source $HOME/.config/fish/aliases.fish end end @@ -45,18 +45,18 @@ set -p EDITOR (which nvim) # ─< z stands for Zoxide >────────────────────────────────────────────────────────────────── function _zox if command -v zoxide >/dev/null 2>&1 - zoxide init fish | source + zoxide init fish | source end end # ─< set colorscheme for bobthefish >─────────────────────────────────────────────────────── function _bobfish if test -d $HOME/.config/fish/functions/bobthefish/ - source $HOME/.config/fish/functions/bobthefish/*.fish - set -g theme_nerd_fonts yes - set -g defaults_user (echo $USER) - # available options: dark, light, solarized(-dark/-light), base16(-dark/-light), zenburn, gruvbox(-light), dracula, nord, catppuccin-(latte/frappe/macchiato/mocha) - set -g theme_color_scheme catppuccin-mocha + source $HOME/.config/fish/functions/bobthefish/*.fish + set -g theme_nerd_fonts yes + set -g defaults_user (echo $USER) + # available options: dark, light, solarized(-dark/-light), base16(-dark/-light), zenburn, gruvbox(-light), dracula, nord, catppuccin-(latte/frappe/macchiato/mocha) + set -g theme_color_scheme catppuccin-mocha end end @@ -68,7 +68,7 @@ if command -v oh-my-posh >/dev/null 2>&1 # oh-my-posh init fish --config ~/.config/fish/themes/zen.toml | source else _bobfish - curl -s https://ohmyposh.dev/install.sh | bash -s -- -d /usr/bin/ + curl -s https://ohmyposh.dev/install.sh | sudo bash -s -- -d /usr/bin/ end function main