diff --git a/config.fish b/config.fish index 567bd7c..ec12879 100644 --- a/config.fish +++ b/config.fish @@ -1,5 +1,5 @@ if status is-interactive -# ─< Commands to run in interactive sessions can go here >────────────── + # ─< Commands to run in interactive sessions can go here >────────────── end # ╭───────────────────────────────────────────────────╮ @@ -29,23 +29,23 @@ if command -v lsd >/dev/null 2>&1 alias ll="lsd -lA" alias tree="lsd --tree" else -# ─< exa >────────────────────────────────────────────────────────────────────────────────── -if command -v exa >/dev/null 2>&1 - alias ls="exa --icons -l" - alias ll="exa --icons -laa" - alias tree="exa --icons -l -tree" -else -# ─< eza >────────────────────────────────────────────────────────────────────────────────── -if command -v eza >/dev/null 2>&1 - alias ls="eza --icons -l" - alias ll="eza --icons -laa" - alias tree="eza --icons -l -tree" -else -# ─< if nothing works -- plain old ls >───────────────────────────────────────────────────── - alias ls="ls --color=always -lph" - alias ll="ls --color=always -lAph" -end -end + # ─< exa >────────────────────────────────────────────────────────────────────────────────── + if command -v exa >/dev/null 2>&1 + alias ls="exa --icons -l" + alias ll="exa --icons -laa" + alias tree="exa --icons -l -tree" + else + # ─< eza >────────────────────────────────────────────────────────────────────────────────── + if command -v eza >/dev/null 2>&1 + alias ls="eza --icons -l" + alias ll="eza --icons -laa" + alias tree="eza --icons -l -tree" + else + # ─< if nothing works -- plain old ls >───────────────────────────────────────────────────── + alias ls="ls --color=always -lph" + alias ll="ls --color=always -lAph" + end + end end # ─< colored everything >─────────────────────────────────────────────────────────────────── @@ -120,28 +120,28 @@ end if command -v fastfetch >/dev/null 2>&1 alias ff="fastfetch" alias clearff="command clear & fastfetch" -# ─< check for fastfetch module-existance >───────────────────────────────────────────────── + # ─< check for fastfetch module-existance >───────────────────────────────────────────────── command fastfetch --config os >/dev/null 2>&1 -# ─< check the status >───────────────────────────────────────────────────────────────────── - switch $status + # ─< check the status >───────────────────────────────────────────────────────────────────── + switch $status case 0 alias f="fastfetch --config os" -# ─< unsuccessfull, cloning repo >────────────────────────────────────────────────────────── + # ─< unsuccessfull, cloning repo >────────────────────────────────────────────────────────── case '*' git clone https://git.k4li.de/mirror/fastfetch $HOME/.local/share/fastfetch >/dev/null 2>&1 -# ─< execute fish to reinitialize aliasses >──────────────────────────────────────────────── + # ─< execute fish to reinitialize aliasses >──────────────────────────────────────────────── exec fish - end + end clear & f alias clear="clear & f" end # ─< set nmap-alias >─────────────────────────────────────────────────────────────────────── if command -v nmap >/dev/null 2>&1 - alias scanvuln="sudo nmap --script vuln -vvv" - alias sv="scanvuln" - alias portscan="sudo nmap -sT" - alias ps="portscan" + alias scanvuln="sudo nmap --script vuln -vvv" + alias sv="scanvuln" + alias portscan="sudo nmap -sT" + alias ps="portscan" end # ────────────────────────────────────────< functions >───────────────────────────────────── @@ -152,9 +152,9 @@ end # ─< starship >───────────────────────────────────────────────────────────────────────────── if command -v starship >/dev/null 2>&1 -function starship_transient_prompt_func - starship module character -end + function starship_transient_prompt_func + starship module character + end starship init fish | source enable_transience else @@ -163,10 +163,10 @@ end set colorscheme for bobthefish if test -d $HOME/.config/fish/functions/ - 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 + 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 set -a TOOLBOX "$warnings diff --git a/functions/setup.fish b/functions/setup.fish index 3482b0b..ff79ea5 100644 --- a/functions/setup.fish +++ b/functions/setup.fish @@ -3,103 +3,103 @@ # ╰────────────────────────────────────╯ function upin -# ─< check for sudo/root >────────────────────────────────────────────────────────────────── -if [ $USER = "root" ] - set sudo "" -else - if command -v sudo >/dev/null 2>&1 - set sudo "sudo" - end -end - -# ─────────────────────────< START | distro/packagemanger detection >───────────────────────── -# ─< DNF - Fedora >───────────────────────────────────────────────────── -if command -v dnf - set pkg "$sudo dnf" - set install "$pkg install" - set update "$pkg update && $pkg upgrade" - set search "$pkg search" - set remove "$pkg remove" - set -a ALIASSES "-- You're using DNF aliases!! --" -end - -# ─< APT/NALA - Debian >──────────────────────────────────────────────── -if command -v nala >/dev/null 2>&1 - set pkg "$sudo nala" - set install "$pkg update && $pkg install" - set update "$pkg update && $pkg upgrade" - set search "$pkg search" - set remove "$pkg remove" - set ALIASSES "-- You're using NALA aliases!! --" + # ─< check for sudo/root >────────────────────────────────────────────────────────────────── + if [ $USER = "root" ] + set sudo "" else -if command -v apt-get >/dsudo ev/null 2>&1 - set pkg "$sudo apt-get" - set install "$pkg update && $pkg install" - set update "$pkg update && $pkg upgrade" - set search "$pkg search" - set remove "$pkg remove" - set ALIASSES "-- You're using APT aliases!! --" -end -end + if command -v sudo >/dev/null 2>&1 + set sudo "sudo" + end + end -# ─< Pacman - Arch >──────────────────────────────────────────────────── -if command -v paru >/dev/null 2>&1 - set pkg "paru" - set install "$pkg -S" - set update "$pkg -Syu" - set search "$pkg -Ss" - set remove "$pkg -R" - set ALIASSES "-- You're using Arch!! - installed helper: paru --" -else -if command -v yay >/dev/null 2>&1 - set pkg "yay" - set install "$pkg -S" - set update "$pkg -Syu" - set search "$pkg -Ss" - set remove "$pkg -R" - set ALIASSES "-- You're using Arch!! - installed helper: yay --" -else - if command -v pacman >/dev/null 2>&1 - set pkg "$sudo pacman" - set install "$pkg -S" - set update "$pkg -Syu" - set search "$pkg -Ss" - set remove "$pkg -R" - set ALIASSES "-- by the PACMAN - You're using Arch!! --" -end -end -end + # ─────────────────────────< START | distro/packagemanger detection >───────────────────────── + # ─< DNF - Fedora >───────────────────────────────────────────────────── + if command -v dnf + set pkg "$sudo dnf" + set install "$pkg install" + set update "$pkg update && $pkg upgrade" + set search "$pkg search" + set remove "$pkg remove" + set -a ALIASSES "-- You're using DNF aliases!! --" + end -# ─< Zypper - OpenSuse >──────────────────────────────────────────────────────────────────── -if command -v zypper >/dev/null 2>&1 - set pkg "$sudo zypper" - set install "$pkg in" - set update "$pkg dup" - set search "$pkg se" - set remove "$pkg rm" - alias lock="$pkg al" - set ALIASSES "-- I see.. you're using OpenSUSE. i like <3 -- --- ZYPPER -- " -end + # ─< APT/NALA - Debian >──────────────────────────────────────────────── + if command -v nala >/dev/null 2>&1 + set pkg "$sudo nala" + set install "$pkg update && $pkg install" + set update "$pkg update && $pkg upgrade" + set search "$pkg search" + set remove "$pkg remove" + set ALIASSES "-- You're using NALA aliases!! --" + else + if command -v apt-get >/dsudo ev/null 2>&1 + set pkg "$sudo apt-get" + set install "$pkg update && $pkg install" + set update "$pkg update && $pkg upgrade" + set search "$pkg search" + set remove "$pkg remove" + set ALIASSES "-- You're using APT aliases!! --" + end + end -# ─< APK - Alpine >───────────────────────────────────────────────────────────────────────── -if command -v apk >/dev/null 2>&1 - set pkg "$sudo apk" - set install "$pkg add" - set update "$pkg update" - set search "$pkg search" - set ALIASSES "-- Alpine.. right, this fast os is evolving.. --" -end -if test -n "$install" -set FISH_INSTALL "$install" + # ─< Pacman - Arch >──────────────────────────────────────────────────── + if command -v paru >/dev/null 2>&1 + set pkg "paru" + set install "$pkg -S" + set update "$pkg -Syu" + set search "$pkg -Ss" + set remove "$pkg -R" + set ALIASSES "-- You're using Arch!! - installed helper: paru --" + else + if command -v yay >/dev/null 2>&1 + set pkg "yay" + set install "$pkg -S" + set update "$pkg -Syu" + set search "$pkg -Ss" + set remove "$pkg -R" + set ALIASSES "-- You're using Arch!! - installed helper: yay --" + else + if command -v pacman >/dev/null 2>&1 + set pkg "$sudo pacman" + set install "$pkg -S" + set update "$pkg -Syu" + set search "$pkg -Ss" + set remove "$pkg -R" + set ALIASSES "-- by the PACMAN - You're using Arch!! --" + end + end + end - set vars "install" "update" "search" "remove" -for env in $vars -if not test -z "$env" -alias "$env"="$$env" -end -end -end + # ─< Zypper - OpenSuse >──────────────────────────────────────────────────────────────────── + if command -v zypper >/dev/null 2>&1 + set pkg "$sudo zypper" + set install "$pkg in" + set update "$pkg dup" + set search "$pkg se" + set remove "$pkg rm" + alias lock="$pkg al" + set ALIASSES "-- I see.. you're using OpenSUSE. i like <3 -- + -- ZYPPER -- " + end + + # ─< APK - Alpine >───────────────────────────────────────────────────────────────────────── + if command -v apk >/dev/null 2>&1 + set pkg "$sudo apk" + set install "$pkg add" + set update "$pkg update" + set search "$pkg search" + set ALIASSES "-- Alpine.. right, this fast os is evolving.. --" + end + if test -n "$install" + set FISH_INSTALL "$install" + + set vars "install" "update" "search" "remove" + for env in $vars + if not test -z "$env" + alias "$env"="$$env" + end + end + end end @@ -122,64 +122,64 @@ end # │ FUNCTION: Define function gsa (to ask the user which submodule to clone to which path and which name │ # ╰──────────────────────────────────────────────────────────────────────────────────────────────────────╯ function gsa -set dir $PWD - echo "-- these are the current submodules --" - if command -v rg >/dev/null 2>&1 - echo "-- for $dir --" - rg -i submodule (echo $dir/.gitmodules) - end + set dir $PWD + echo "-- these are the current submodules --" + if command -v rg >/dev/null 2>&1 + echo "-- for $dir --" + rg -i submodule (echo $dir/.gitmodules) + end -# ─< Prompt the user to enter the repository URL to add as a submodule >──────────────────── - echo "-- enter the repository to add as a submodule --" - read repo + # ─< Prompt the user to enter the repository URL to add as a submodule >──────────────────── + echo "-- enter the repository to add as a submodule --" + read repo -# ─< Prompt the user to enter the branch to checkout (e.g., main, master) >───────────────── - echo "-- enter the branch to checkout (main/master..) --" - read branch + # ─< Prompt the user to enter the branch to checkout (e.g., main, master) >───────────────── + echo "-- enter the branch to checkout (main/master..) --" + read branch -# ─< Prompt the user to enter the relative path where the submodule will be cloned >──────── -# ─< Advise not to use the leading / or ./ >──────────────────────────────────────────────── - echo "-- enter the relative path, where the submodule will be cloned to. (!! do it like this: ./path/to/clone/to) --" - read -S path + # ─< Prompt the user to enter the relative path where the submodule will be cloned >──────── + # ─< Advise not to use the leading / or ./ >──────────────────────────────────────────────── + echo "-- enter the relative path, where the submodule will be cloned to. (!! do it like this: ./path/to/clone/to) --" + read -S path - echo "-- enter a name for the submodule --" - read -l name + echo "-- enter a name for the submodule --" + read -l name -# ─< Ask the user for confirmation if the constructed command looks correct >─────────────── - echo "git submodule add --branch $branch $repo $path" - echo "-- does this command look right to you? [y/n] --" - read -l comm + # ─< Ask the user for confirmation if the constructed command looks correct >─────────────── + echo "git submodule add --branch $branch $repo $path" + echo "-- does this command look right to you? [y/n] --" + read -l comm -# ─< Switch statement to handle the user's confirmation input >───────────────────────────── - switch $comm -# ─< If the user inputs 'y' or 'Y', execute the git submodule add command >───────────────── + # ─< Switch statement to handle the user's confirmation input >───────────────────────────── + switch $comm + # ─< If the user inputs 'y' or 'Y', execute the git submodule add command >───────────────── case 'y' 'Y' - git submodule add --branch $branch --name $name $repo $path - git submodule update --init --recursive - git add . - git commit -m "Addet $name as a submodule" - git push + git submodule add --branch $branch --name $name $repo $path + git submodule update --init --recursive + git add . + git commit -m "Addet $name as a submodule" + git push -# ─< If the user inputs 'n' or 'N', notify them to try again >────────────────────────────── + # ─< If the user inputs 'n' or 'N', notify them to try again >────────────────────────────── case 'n' 'N' - echo "-- all right, just try again :) --" - end + echo "-- all right, just try again :) --" + end end # ╭───────────────────────────────────────────────────╮ # │ FUNCTION: set tmux command to always work with ta │ # ╰───────────────────────────────────────────────────╯ if command -v tmux >/dev/null 2>&1 -function ta - if command tmux list-sessions >/dev/null 2>&1 - echo "Tmux session found. Entering it now! --" - sleep 0.5 - tmux a - else - echo "No Tmux session found. Creating one now! --" - tmux - end -end + function ta + if command tmux list-sessions >/dev/null 2>&1 + echo "Tmux session found. Entering it now! --" + sleep 0.5 + tmux a + else + echo "No Tmux session found. Creating one now! --" + tmux + end + end end # ╭────────────────────────────────────────────╮