merge conflicts

This commit is contained in:
pika 2024-08-02 13:22:30 +02:00
parent 374e5e3cf8
commit 667118794c
2 changed files with 25 additions and 68 deletions

View file

@ -1,44 +1,5 @@
#!/bin/fish #!/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) >─────────────────────────────────────────────────────────── # ─< t stands for trash(-cli) >───────────────────────────────────────────────────────────
function _trash function _trash
@ -59,7 +20,6 @@ if command -v lsd >/dev/null 2>&1
alias ls="lsd -l -1 -h1 --almost-all --git" alias ls="lsd -l -1 -h1 --almost-all --git"
alias l="lsd -1" alias l="lsd -1"
alias ll="lsd -1 --almost-all" alias ll="lsd -1 --almost-all"
alias clearl="command clear && l"
alias tree="lsd --tree" alias tree="lsd --tree"
else else
# ─< exa >────────────────────────────────────────────────────────────────────────────────── # ─< exa >──────────────────────────────────────────────────────────────────────────────────
@ -84,10 +44,7 @@ else
end end
end end
# ─< set alias for clearl >───────────────────────────────────────────────────────────────── alias clearl="command clear && l"
if alias l >/dev/null 2>&1
alias clearl="command clear && l"
end
# ─< colored everything >─────────────────────────────────────────────────────────────────── # ─< colored everything >───────────────────────────────────────────────────────────────────
alias ip="ip --color=always" alias ip="ip --color=always"

View file

@ -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 # oh-my-posh init fish --config ~/.config/fish/themes/zen.toml | source
else else
_bobfish _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 end
function main function main