diff options
| -rw-r--r-- | cli/.config/nvim/lua/plugins.lua | 2 | ||||
| -rw-r--r-- | cli/.config/nvim/lua/settings.lua | 2 | ||||
| -rw-r--r-- | cli/.config/zsh/functions.zsh | 6 | ||||
| -rw-r--r-- | cli/.config/zsh/settings.zsh | 2 | ||||
| -rw-r--r-- | gui/.config/kitty/kitty.conf | 2 | ||||
| -rw-r--r-- | gui/.config/wezterm/overrides.lua | 7 | ||||
| -rw-r--r-- | gui/.config/wezterm/wezterm.lua | 9 |
7 files changed, 17 insertions, 13 deletions
diff --git a/cli/.config/nvim/lua/plugins.lua b/cli/.config/nvim/lua/plugins.lua index 8732537..d405ddd 100644 --- a/cli/.config/nvim/lua/plugins.lua +++ b/cli/.config/nvim/lua/plugins.lua @@ -23,7 +23,7 @@ require('lazy').setup { --[[ plugin configs and maps ]] require('gitsigns').setup() require('gruvbox').setup { - terminal_colors = false + terminal_colors = true } require('orgmode').setup { org_agenda_files = '~/orgfiles/**/*', diff --git a/cli/.config/nvim/lua/settings.lua b/cli/.config/nvim/lua/settings.lua index 2932e4a..855737b 100644 --- a/cli/.config/nvim/lua/settings.lua +++ b/cli/.config/nvim/lua/settings.lua @@ -27,4 +27,4 @@ vim.o.imsearch = 0 local fsize = '11' if vim.loop.os_uname().sysname == 'Darwin' then fsize = '14' end -vim.o.guifont = 'Cascadia Mono NF:h' .. fsize +vim.o.guifont = 'Cascadia Mono PL:h' .. fsize diff --git a/cli/.config/zsh/functions.zsh b/cli/.config/zsh/functions.zsh index 0ba8735..778b11d 100644 --- a/cli/.config/zsh/functions.zsh +++ b/cli/.config/zsh/functions.zsh @@ -60,7 +60,7 @@ gup() { command git pull $@ } gwta() { command git worktree add $@ } gwtp() { command git worktree prune -v } groot() { cd $(command git rev-parse --show-toplevel) || return 0 } -gdiff() { command git diff --color $@; } +gdiff() { command git diff --color $@ } greset() { echo "OK to reset and clean teh repo?" read -sq _ @@ -91,8 +91,8 @@ if testbin grc; then cc configure cvs df dig gcc gmake id ip last lsof make mount \ mtr netstat ping ping6 ps tcpdump traceroute traceroute6 \ ) - for cmd in $cmds[@]; do - alias $cmd="command grc -es --colour=auto $cmd" + for cmd in $cmds; do + eval "$cmd() { command grc -es --colour=auto $cmd \$@ }" done unset cmds cmd fi diff --git a/cli/.config/zsh/settings.zsh b/cli/.config/zsh/settings.zsh index b8ab5da..121689c 100644 --- a/cli/.config/zsh/settings.zsh +++ b/cli/.config/zsh/settings.zsh @@ -9,7 +9,7 @@ HISTFILE=$HOME/.histfile.$UID export LESS='i M R' export PAGER=less -export EDITOR=vim +export EDITOR=nvim export TIME_STYLE=long-iso export SSH_AUTH_SOCK="$HOME/.ssh/ssh_auth_sock" export ALTERNATE_EDITOR= diff --git a/gui/.config/kitty/kitty.conf b/gui/.config/kitty/kitty.conf index 8203194..96b1021 100644 --- a/gui/.config/kitty/kitty.conf +++ b/gui/.config/kitty/kitty.conf @@ -1,5 +1,5 @@ # Use Ctrl+Alt+F5 to reload -font_family Cascadia Mono NF +font_family Cascadia Mono PL modify_font underline_position 1 font_size 14 cursor_blink_interval 0 diff --git a/gui/.config/wezterm/overrides.lua b/gui/.config/wezterm/overrides.lua index def888a..81cc8f8 100644 --- a/gui/.config/wezterm/overrides.lua +++ b/gui/.config/wezterm/overrides.lua @@ -13,7 +13,12 @@ local cursor_bg = '#cb4b16' -- fonts local fonts = wt.config_builder() -fonts.harfbuzz_features = {'calt=0', 'clig=0', 'liga=0', 'ss19'} +fonts.font = wt.font('Cascadia Mono PL') +fonts.harfbuzz_features = {'ss01', 'ss19', 'ss20'} +fonts.font_size = fn.set_by_os{ + Darwin = 14, + others = 11 +} -- theme local theme = wt.config_builder() diff --git a/gui/.config/wezterm/wezterm.lua b/gui/.config/wezterm/wezterm.lua index 874f11d..d4b726e 100644 --- a/gui/.config/wezterm/wezterm.lua +++ b/gui/.config/wezterm/wezterm.lua @@ -18,14 +18,13 @@ cfg.audible_bell = 'Disabled' cfg.check_for_updates = false -- fonts & text -cfg.harfbuzz_features = nil cfg.cursor_blink_rate = 0 cfg.bold_brightens_ansi_colors = false -cfg.font = wt.font('Cascadia Mono NF') -cfg.harfbuzz_features = {'ss01', 'ss19', 'ss20'} +cfg.font = wt.font('Fantasque Sans Mono') +cfg.harfbuzz_features = {'calt=0'} cfg.font_size = fn.set_by_os{ - Darwin = 14, - others = 11 + Darwin = 15, + others = 12 } -- visuals |