From 358502ea3a9dac277061efa6bb81d788a89020b5 Mon Sep 17 00:00:00 2001 From: Von Random Date: Thu, 5 Sep 2024 18:33:30 +0300 Subject: [PATCH 1/4] bash, zsh: escape fixterm escape --- cli/.bashrc | 2 +- cli/.config/zsh/functions.zsh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cli/.bashrc b/cli/.bashrc index 810c3a9..61c0ff5 100644 --- a/cli/.bashrc +++ b/cli/.bashrc @@ -18,7 +18,7 @@ PS1='\[\e[0m\][ \u@\h \[\e[34m\]\w\[\e[0m\] ]\n\$ ' unalias ls ld ll 2>/dev/null beep() { printf "\007"; } -fixterm() { printf "c"; } +fixterm() { printf "\u001bc"; } diff() { command diff --color "$@"; } tailf() { command less +F "$@"; } diff --git a/cli/.config/zsh/functions.zsh b/cli/.config/zsh/functions.zsh index 778b11d..60858cd 100644 --- a/cli/.config/zsh/functions.zsh +++ b/cli/.config/zsh/functions.zsh @@ -35,7 +35,7 @@ fsf() { } beep() { printf $'\007' } -fixterm() { printf $'c' } +fixterm() { printf $'\u001bc' } diff() { command diff --color $@ } tailf() { command less +F $@ } From 7a99575d9ae9781234353517555897b51fd4aec5 Mon Sep 17 00:00:00 2001 From: Von Random Date: Thu, 5 Sep 2024 18:33:30 +0300 Subject: [PATCH 2/4] alacritty: fonts --- gui/.config/alacritty/alacritty.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gui/.config/alacritty/alacritty.toml b/gui/.config/alacritty/alacritty.toml index 70f1002..143a9b7 100644 --- a/gui/.config/alacritty/alacritty.toml +++ b/gui/.config/alacritty/alacritty.toml @@ -34,10 +34,10 @@ shape = "Block" [font] builtin_box_drawing = true -size = 16 +size = 13 [font.normal] -family = "FantasqueSansM Nerd Font" +family = "IBM Plex Mono" [[keyboard.bindings]] action = "Paste" From f94d1d4187c4769319c78c673171b71bc5dc0a8a Mon Sep 17 00:00:00 2001 From: Von Random Date: Thu, 5 Sep 2024 18:33:30 +0300 Subject: [PATCH 3/4] shells: disable icons in eza --- cli/.config/fish/functions/ls.fish | 2 +- cli/.config/zsh/functions.zsh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cli/.config/fish/functions/ls.fish b/cli/.config/fish/functions/ls.fish index 9e4460a..7c353e3 100644 --- a/cli/.config/fish/functions/ls.fish +++ b/cli/.config/fish/functions/ls.fish @@ -1,3 +1,3 @@ function ls - command eza --icons --group-directories-first $argv + command eza --group-directories-first $argv end diff --git a/cli/.config/zsh/functions.zsh b/cli/.config/zsh/functions.zsh index 60858cd..211b2d1 100644 --- a/cli/.config/zsh/functions.zsh +++ b/cli/.config/zsh/functions.zsh @@ -76,7 +76,7 @@ else fi if testbin eza; then - ls() { command eza --icons --group-directories-first $@ } + ls() { command eza --group-directories-first $@ } ll() { ls -alg $@ } ld() { ls -dlg $@ } else From 70761a528c6432d4a57825d0561e69b2fc3a2ad8 Mon Sep 17 00:00:00 2001 From: Von Random Date: Thu, 5 Sep 2024 18:33:30 +0300 Subject: [PATCH 4/4] wezterm: back to Cascadia Mono --- gui/.config/wezterm/overrides.lua | 8 ++------ gui/.config/wezterm/wezterm.lua | 4 ++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/gui/.config/wezterm/overrides.lua b/gui/.config/wezterm/overrides.lua index 81cc8f8..d53d22a 100644 --- a/gui/.config/wezterm/overrides.lua +++ b/gui/.config/wezterm/overrides.lua @@ -13,12 +13,8 @@ local cursor_bg = '#cb4b16' -- fonts local fonts = wt.config_builder() -fonts.font = wt.font('Cascadia Mono PL') -fonts.harfbuzz_features = {'ss01', 'ss19', 'ss20'} -fonts.font_size = fn.set_by_os{ - Darwin = 14, - others = 11 -} +fonts.font = wt.font('IBM Plex Mono') +fonts.harfbuzz_features = {'ss03'} -- theme local theme = wt.config_builder() diff --git a/gui/.config/wezterm/wezterm.lua b/gui/.config/wezterm/wezterm.lua index 7a14246..b7b854c 100644 --- a/gui/.config/wezterm/wezterm.lua +++ b/gui/.config/wezterm/wezterm.lua @@ -20,8 +20,8 @@ cfg.check_for_updates = false -- fonts & text cfg.cursor_blink_rate = 0 cfg.bold_brightens_ansi_colors = false -cfg.font = wt.font('IBM Plex Mono') -cfg.harfbuzz_features = {'ss03'} +cfg.font = wt.font('Cascadia Mono PL') +cfg.harfbuzz_features = {'ss01', 'ss19', 'ss20'} cfg.font_size = fn.set_by_os{ Darwin = 14, others = 11