From f926e105891dc2b1e78864abb4889287c1fa14f5 Mon Sep 17 00:00:00 2001 From: pika Date: Tue, 23 Jul 2024 19:58:46 +0200 Subject: [PATCH] some changes --- aliases.fish | 65 ++++++++++++++++++++++++------------------------- init/tools.fish | 11 --------- 2 files changed, 32 insertions(+), 44 deletions(-) delete mode 100644 init/tools.fish diff --git a/aliases.fish b/aliases.fish index 13d1300..d885e1b 100644 --- a/aliases.fish +++ b/aliases.fish @@ -10,23 +10,23 @@ if command -v lsd >/dev/null 2>&1 else # ─< exa >────────────────────────────────────────────────────────────────────────────────── if command -v exa >/dev/null 2>&1 - alias ls="exa --icons --long --git" - alias l="exa --icons -l" - alias ll="exa --icons -laa" - alias tree="exa --icons -l -tree" + alias ls="exa --icons --long --git" + alias l="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 --long --git" - alias l="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 l="ls --color=always -lph" - alias ll="ls --color=always -lAph" - end + # ─< eza >────────────────────────────────────────────────────────────────────────────────── + if command -v eza >/dev/null 2>&1 + alias ls="eza --icons --long --git" + alias l="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 l="ls --color=always -lph" + alias ll="ls --color=always -lAph" + end end end @@ -81,13 +81,13 @@ if command -v fastfetch >/dev/null 2>&1 command fastfetch --config os >/dev/null 2>&1 # ─< check the status >───────────────────────────────────────────────────────────────────── switch $status - case 0 - alias f="fastfetch --config os" - # ─< unsuccessful, cloning repo >────────────────────────────────────────────────────────── - case '*' - git clone https://git.k4li.de/mirrors/fastfetch.git $HOME/.local/share/fastfetch >/dev/null 2>&1 - # ─< execute fish to reinitialize aliases >──────────────────────────────────────────────── - exec fish + case 0 + alias f="fastfetch --config os" + # ─< unsuccessful, cloning repo >────────────────────────────────────────────────────────── + case '*' + git clone https://git.k4li.de/mirrors/fastfetch.git $HOME/.local/share/fastfetch >/dev/null 2>&1 + # ─< execute fish to reinitialize aliases >──────────────────────────────────────────────── + exec fish end clear & f alias clear="clear & f" @@ -132,7 +132,7 @@ if command -v git >/dev/null 2>&1 alias gcm="git commit -m" alias gpu="git push --recurse-submodule=on-demand" if command -v lazygit >/dev/null 2>&1 - alias lg="lazygit" + alias lg="lazygit" end end @@ -142,8 +142,8 @@ end # ─< h stands for HUGO >────────────────────────────────────────────────────────────────── if command -v hugo >/dev/null 2>&1 - alias h='hugo' - alias hs='hugo server -D --noHTTPCache --disableFastRender' + alias h='hugo' + alias hs='hugo server -D --noHTTPCache --disableFastRender' end # ─< VSCodium >───────────────────────────────────────────────────────────────────────────── @@ -155,11 +155,10 @@ end # ─< neovide, the best frontend for any neovim-config >─────────────────────────────────── if test -d $HOME/.local/share/neovide/ - if command -v neovide >/dev/null 2>&1 - alias nvim='neovide --fork' - else - set -p neovide (bash -c 'find $HOME/ -name *neovide*.appimage') || set -p neovide "neovide" || exit 1 - alias nvim="$neovide" + if command -v neovide >/dev/null 2>&1 + alias nvim='neovide --fork' + else + set -p neovide (bash -c 'find $HOME/ -name *neovide*.appimage' >/dev/null 2>&1) || exit 1 + alias nvim="$neovide --fork" + end end -end - diff --git a/init/tools.fish b/init/tools.fish deleted file mode 100644 index 998c068..0000000 --- a/init/tools.fish +++ /dev/null @@ -1,11 +0,0 @@ -# ─< tools creation >─────────────────────────────────────────────────────────────────────── -set fish_greeting -set toolbox "The following tools are active: -" -set warnings "The following packages are NOT active: -" - -function tools - -end -