From 8fe5a249b0c20f092aecd72b2c167b673c7027ab Mon Sep 17 00:00:00 2001 From: grassblock Date: Wed, 24 Jul 2024 15:36:48 +0800 Subject: [PATCH] add config for kitty + update fish shell config --- home/private_dot_config/kitty/kitty.conf | 20 +++++++ home/private_dot_config/kitty/nord.conf | 43 +++++++++++++++ .../private_fish/config.fish | 25 +++++++-- .../private_fish/fmotd/motd-fallback.jsonc | 52 ++++++++++++++++++ .../private_fish/fmotd/motd.jsonc | 54 +++++++++++++++++++ 5 files changed, 190 insertions(+), 4 deletions(-) create mode 100644 home/private_dot_config/kitty/kitty.conf create mode 100644 home/private_dot_config/kitty/nord.conf create mode 100644 home/private_dot_config/private_fish/fmotd/motd-fallback.jsonc create mode 100644 home/private_dot_config/private_fish/fmotd/motd.jsonc diff --git a/home/private_dot_config/kitty/kitty.conf b/home/private_dot_config/kitty/kitty.conf new file mode 100644 index 0000000..a1adcd8 --- /dev/null +++ b/home/private_dot_config/kitty/kitty.conf @@ -0,0 +1,20 @@ +# nord theme +include ./nord.conf + +# bg opacity & blur +background_opacity 0.8 +background_blur 16 + +# fonts +font_family SpaceMono Nerd Font +bold_font auto +italic_font auto +bold_italic_font auto + +# tab bar +tab_bar_margin_height 2.0 2.0 +tab_bar_style powerline +tab_powerline_style angled + +# links +mouse_map ctrl+left click grabbed,ungrabbed mouse_handle_click selection link prompt diff --git a/home/private_dot_config/kitty/nord.conf b/home/private_dot_config/kitty/nord.conf new file mode 100644 index 0000000..54f3a96 --- /dev/null +++ b/home/private_dot_config/kitty/nord.conf @@ -0,0 +1,43 @@ +# Nord Colorscheme for Kitty +# Based on: +# - https://gist.github.com/marcusramberg/64010234c95a93d953e8c79fdaf94192 +# - https://github.com/arcticicestudio/nord-hyper + +foreground #D8DEE9 +background #2E3440 +selection_foreground #000000 +selection_background #FFFACD +url_color #0087BD +cursor #81A1C1 + +# black +color0 #3B4252 +color8 #4C566A + +# red +color1 #BF616A +color9 #BF616A + +# green +color2 #A3BE8C +color10 #A3BE8C + +# yellow +color3 #EBCB8B +color11 #EBCB8B + +# blue +color4 #81A1C1 +color12 #81A1C1 + +# magenta +color5 #B48EAD +color13 #B48EAD + +# cyan +color6 #88C0D0 +color14 #8FBCBB + +# white +color7 #E5E9F0 +color15 #ECEFF4 diff --git a/home/private_dot_config/private_fish/config.fish b/home/private_dot_config/private_fish/config.fish index f436184..206e53e 100644 --- a/home/private_dot_config/private_fish/config.fish +++ b/home/private_dot_config/private_fish/config.fish @@ -2,13 +2,27 @@ if status is-interactive # Commands to run in interactive sessions can go here end +# zellij init for alacritty +if string match -q -- alacritty $TERM + set -gx ZELLIJ_AUTO_EXIT true + eval (zellij setup --generate-auto-start fish | string collect) +end +# zellij init for alacritty end + # starship custom conf set -gx STARSHIP_CONFIG $__fish_config_dir/starship.toml # starship custom conf end starship init fish | source # greeting function fish_greeting - cat $__fish_config_dir/motd + echo "" + if [ $TERM = xterm-kitty ] + fastfetch -c $__fish_config_dir/fmotd/motd.jsonc + else + fastfetch -c $__fish_config_dir/fmotd/motd-fallback.jsonc + end + echo -e "\nWelcome to fish@$TERM, $USER!" + #cat $__fish_config_dir/motd end # greeting end # pnpm @@ -44,6 +58,9 @@ rvm default set PATH $PATH /home/grassblock/.local/bin # pipx end -# 0x0 start - -#0x0 end +# >>> mamba initialize >>> +# !! Contents within this block are managed by 'mamba init' !! +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 <<< diff --git a/home/private_dot_config/private_fish/fmotd/motd-fallback.jsonc b/home/private_dot_config/private_fish/fmotd/motd-fallback.jsonc new file mode 100644 index 0000000..ae4c8ba --- /dev/null +++ b/home/private_dot_config/private_fish/fmotd/motd-fallback.jsonc @@ -0,0 +1,52 @@ +{ + "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json", + "logo": { + "type": "small" + }, + "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/fmotd/motd.jsonc b/home/private_dot_config/private_fish/fmotd/motd.jsonc new file mode 100644 index 0000000..0588d43 --- /dev/null +++ b/home/private_dot_config/private_fish/fmotd/motd.jsonc @@ -0,0 +1,54 @@ +{ + "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json", + "logo": { + "type": "auto", + "source": "/home/grassblock/Pictures/1017124-new.png", + "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}███" + } + ] +}