diff --git a/home/private_dot_config/private_fish/config.fish b/home/private_dot_config/private_fish/config.fish index 4904aa9..49e1ba0 100644 --- a/home/private_dot_config/private_fish/config.fish +++ b/home/private_dot_config/private_fish/config.fish @@ -1,5 +1,6 @@ if status is-interactive # Commands to run in interactive sessions can go here + # zellij init for alacritty if string match -q -- alacritty $TERM set -gx ZELLIJ_AUTO_EXIT true @@ -23,12 +24,8 @@ end # greeting function fish_greeting echo "" -# custom motd by fastfetch - if [ $TERM = xterm-kitty ] ; or [ $TERM = xterm-ghostty ] - fastfetch -c $__fish_config_dir/fmotd/motd.jsonc - else - fastfetch -c $__fish_config_dir/fmotd/motd-fallback.jsonc - end + # changed logo to ascii art so additional fallback is not needed + fastfetch -c $__fish_config_dir/motds/motd.jsonc echo -e "\nHellllllo from fish@$TERM, $USER!" #cat $__fish_config_dir/motd end @@ -46,7 +43,7 @@ set -gx PATH "/home/grassblock/.local/share/npm/bin" $PATH # ssh agent with rbw set -gx SSH_ASKPASS_REQUIRE prefer -set -gx SSH_ASKPASS "$HOME/.local/bin/bw-askpass" +set -gx SSH_ASKPASS "$HOME/.local/bin/rbw-ssh-askpass" # Created by `pipx` on 2023-10-13 01:41:55 set PATH $PATH /home/grassblock/.local/bin @@ -58,7 +55,6 @@ set -gx MAMBA_EXE "/usr/bin/micromamba" set -gx MAMBA_ROOT_PREFIX "/home/grassblock/.local/share/micromamba" $MAMBA_EXE shell hook --shell fish --root-prefix $MAMBA_ROOT_PREFIX | source # <<< mamba initialize <<< -# micromamba has outdated dependency,,,, # asdf set -gx ASDF_CONFIG_FILE $XDG_CONFIG_HOME/asdf/asdfrc @@ -69,7 +65,10 @@ source /opt/asdf-vm/asdf.fish # alias alias wget "wget --hsts-file="$XDG_DATA_HOME/wget-hsts"" alias "yarn" "yarn $1 --use-yarnrc $XDG_CONFIG_HOME/yarn/config" -alias "ssh" "kitten ssh" +if [ $TERM = xterm-kitty ] + alias "ssh" "kitten ssh" +end alias "nya" "echo nya && meow" alias bat="bat --theme=\$( test $(darkman get) = 'dark' && echo Nord || echo ansi)" +alias hg="kitten hyperlinked-grep" # alias end diff --git a/home/private_dot_config/private_fish/fmotd/ascii_art b/home/private_dot_config/private_fish/fmotd/ascii_art deleted file mode 100644 index 055d621..0000000 --- a/home/private_dot_config/private_fish/fmotd/ascii_art +++ /dev/null @@ -1,6 +0,0 @@ -  ............   -................ -..::=*..::*=.::: -. =@*--=%#-*@-.. -=+#@%*@@@@#%@#+= -#%%%%%%%%%@%%@@# diff --git a/home/private_dot_config/private_fish/fmotd/motd-fallback.jsonc b/home/private_dot_config/private_fish/fmotd/motd-fallback.jsonc deleted file mode 100644 index 7315ec9..0000000 --- a/home/private_dot_config/private_fish/fmotd/motd-fallback.jsonc +++ /dev/null @@ -1,54 +0,0 @@ -{ - "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json", - "logo": { - "type": "file-raw", - "source": "~/.config/fish/fmotd/ascii_art", - "height": 6 - }, - "display": { - "separator": " ", - "color": { - "keys": "magenta" - }, - "size": { - "ndigits": 0, - "maxPrefix": "MB" - } - }, - "modules": [ - { - "type": "title", - "color": { - "user": "green", - "at": "red", - "host": "blue" - } - }, - { - "type": "os", - "key": "󰌢", - "format": "{2} {8}" - }, - { - "type": "kernel", - "key": "󰘨" - }, - { - "type": "memory", - "key": "" - }, - { - "type": "packages", - "key": "󰏖" - }, - { - "type": "uptime", - "key": "󰅐" - }, - { - "type": "custom", - "key": "", - "format": "{#31}███{#32}███{#33}███{#34}███{#35}███{#36}███" - } - ] -} diff --git a/home/private_dot_config/private_fish/motds/aperture-small b/home/private_dot_config/private_fish/motds/aperture-small new file mode 100644 index 0000000..937f61c --- /dev/null +++ b/home/private_dot_config/private_fish/motds/aperture-small @@ -0,0 +1,7 @@ + 8X+MMM=2MMX +$8MM1@= $2=== +7X8-M $3M@M +7MH:@ 4.X@@ +7MMM/ $XM;= + 6M@HX$%-5:X4MM. + 6:-5HMMM4= diff --git a/home/private_dot_config/private_fish/fmotd/motd.jsonc b/home/private_dot_config/private_fish/motds/motd.jsonc similarity index 70% rename from home/private_dot_config/private_fish/fmotd/motd.jsonc rename to home/private_dot_config/private_fish/motds/motd.jsonc index 0588d43..2dbbf70 100644 --- a/home/private_dot_config/private_fish/fmotd/motd.jsonc +++ b/home/private_dot_config/private_fish/motds/motd.jsonc @@ -1,8 +1,20 @@ { "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json", "logo": { - "type": "auto", - "source": "/home/grassblock/Pictures/1017124-new.png", + "type": "file", + "source": "~/.config/fish/motds/aperture-small", + // original: https://github.com/fastfetch-cli/fastfetch/blob/dev/src/logo/ascii/aperture.txt + // resized using script https://codegolf.stackexchange.com/a/241446 + "padding": { + "top": 0, + "left": 1 + }, + "color": { + "1": "blue", + "2": "blue", + "3": "blue", + "8": "blue" + }, "height": 6 }, "display": {