From d8585b25bd7b62db4c87d246e66c37b57f51ed9b Mon Sep 17 00:00:00 2001 From: Von Random Date: Mon, 19 Jun 2023 18:34:20 +0300 Subject: [PATCH] powerline, fonts --- cli/.config/fish/conf.d/prompt.fish | 2 +- cli/.config/fish/functions/prompt.user.fish | 2 +- cli/.config/nvim/lua/plugins.lua | 3 +-- cli/.config/zsh/powerline.zsh | 2 +- cli/.tmux.conf | 2 +- gui/.config/kitty/kitty.conf | 15 ++------------- gui/.wezterm.lua | 6 +++--- 7 files changed, 10 insertions(+), 22 deletions(-) diff --git a/cli/.config/fish/conf.d/prompt.fish b/cli/.config/fish/conf.d/prompt.fish index a37f007..b09d372 100644 --- a/cli/.config/fish/conf.d/prompt.fish +++ b/cli/.config/fish/conf.d/prompt.fish @@ -1,4 +1,4 @@ -set prompt_sep \ue0bc +set prompt_sep \ue0b0 set prompt_bang \n\ (set_color brred)\u266a\ set git_sign \ue0a0 set color_fg brwhite diff --git a/cli/.config/fish/functions/prompt.user.fish b/cli/.config/fish/functions/prompt.user.fish index 102c768..1bc2cc3 100644 --- a/cli/.config/fish/functions/prompt.user.fish +++ b/cli/.config/fish/functions/prompt.user.fish @@ -1,5 +1,5 @@ function prompt.user - if test -n "$SSH_CLIENT" || string match -qe root "$USER" + if test -n "$SSH_CONNECTION" || string match -qe root "$USER" prompt.add black $USER@$hostname end end diff --git a/cli/.config/nvim/lua/plugins.lua b/cli/.config/nvim/lua/plugins.lua index 230605a..a2eebf2 100644 --- a/cli/.config/nvim/lua/plugins.lua +++ b/cli/.config/nvim/lua/plugins.lua @@ -28,8 +28,7 @@ if require('packer_init').init(plugins) then return end require('lualine').setup{ options = { icons_enabled = false, - component_separators = { left = '\u{2022}', right = '\u{2022}' }, - section_separators = { left = '\u{e0bc}', right = '\u{e0be}' } + component_separators = { left = '\u{2022}', right = '\u{2022}' } } } diff --git a/cli/.config/zsh/powerline.zsh b/cli/.config/zsh/powerline.zsh index 35c544b..7fd7732 100644 --- a/cli/.config/zsh/powerline.zsh +++ b/cli/.config/zsh/powerline.zsh @@ -7,7 +7,7 @@ prompt_wt="$USERNAME@$HOST" prompt_fifo=~/.zsh_gitstatus_$$ prompt_blimit=12 typeset -A prompt_symbols=( - sep_a $'\ue0bc' + sep_a $'\ue0b0' ellipsis $'\u2026' git $'\ue0a0' git_unstaged '~' diff --git a/cli/.tmux.conf b/cli/.tmux.conf index b4d75a8..54e51dd 100644 --- a/cli/.tmux.conf +++ b/cli/.tmux.conf @@ -35,7 +35,7 @@ set -g message-style "bg=blue,fg=white" set -g message-command-style "bg=red,fg=white" set -g status on set -g status-style "fg=black,bg=white" -set -g status-format[0] "#[fg=brightred,bg=black,italics] #h[#S] #[default]\ue0bc #{W: #I:#W ,#[reverse] #I:#W #[noreverse]} #[align=right]\ue0be#[reverse] %a %e %k:%M " +set -g status-format[0] "#[fg=brightred,bg=black,italics] #h[#S] #[default]\ue0b0 #{W: #I:#W ,#[reverse] #I:#W #[noreverse]} #[align=right]\ue0b2#[reverse] %a %e %k:%M " set -g status-interval 2 set -g status-position "bottom" set -g status-justify "left" diff --git a/gui/.config/kitty/kitty.conf b/gui/.config/kitty/kitty.conf index 8c62da2..a02e0ed 100644 --- a/gui/.config/kitty/kitty.conf +++ b/gui/.config/kitty/kitty.conf @@ -1,17 +1,6 @@ # I am config -font_family Cascadia Mono PL -font_features CascadiaMonoPL-Regular +ss19 -font_features CascadiaMonoPLRoman-ExtraLight +ss19 -font_features CascadiaMonoPLRoman-Light +ss19 -font_features CascadiaMonoPLRoman-SemiLight +ss19 -font_features CascadiaMonoPLRoman-SemiBold +ss19 -font_features CascadiaMonoPLRoman-Bold +ss19 -font_features CascadiaMonoPL-Italic +ss19 +ss01 -font_features CascadiaMonoPLItalic-ExtraLigh +ss19 +ss01 -font_features CascadiaMonoPLItalic-Light +ss19 +ss01 -font_features CascadiaMonoPLItalic-SemiBold +ss19 +ss01 -font_features CascadiaMonoPLItalic-Bold +ss19 +ss01 -font_features CascadiaMonoPLItalic-SemiLight +ss19 +ss01 +font_family vcascadia +disable_ligatures always modify_font underline_position 1 font_size 14 box_drawing_scale 0.1, 0.5, 1, 1.5 diff --git a/gui/.wezterm.lua b/gui/.wezterm.lua index 1a76451..d0c17bb 100644 --- a/gui/.wezterm.lua +++ b/gui/.wezterm.lua @@ -1,7 +1,7 @@ local wt = require('wezterm') local act = wt.action -local font = 'Cascadia Mono PL' -local font_features = { 'ss01=1', 'ss02=1', 'ss19=1' } +local font = 'vcascadia' +local harfbuzz_features = null local fontsizes = { Darwin = 14, others = 11 } local theme = 'GruvboxDark' local overrides = { @@ -103,7 +103,7 @@ return { audible_bell = 'Disabled', font = wt.font(font), font_size = set_by_os(fontsizes), - harfbuzz_features = font_features, + harfbuzz_features = harfbuzz_features, color_scheme = theme, cursor_blink_rate = 0, check_for_updates = false,