From 42af23f04f8cdd9e8322ec30c6651ebe07d8030d Mon Sep 17 00:00:00 2001 From: Von Random Date: Thu, 23 May 2024 15:19:50 +0300 Subject: [PATCH 01/10] wezterm: close button --- gui/.config/wezterm/wezterm.lua | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gui/.config/wezterm/wezterm.lua b/gui/.config/wezterm/wezterm.lua index b7b854c..6a7df44 100644 --- a/gui/.config/wezterm/wezterm.lua +++ b/gui/.config/wezterm/wezterm.lua @@ -28,7 +28,13 @@ cfg.font_size = fn.set_by_os{ } -- visuals -cfg.window_decorations = 'RESIZE' +cfg.window_decorations = 'INTEGRATED_BUTTONS|RESIZE' +cfg.integrated_title_buttons = {'Close'} +cfg.integrated_title_button_style = 'Windows' +cfg.integrated_title_button_alignment = fn.set_by_os{ + Darwin = 'Left', + others = 'Right' +} cfg.xcursor_theme = 'Adwaita' cfg.use_fancy_tab_bar = false cfg.hide_tab_bar_if_only_one_tab = false From b643242e8cb853db0eee5753671ca1b762d6f246 Mon Sep 17 00:00:00 2001 From: Von Random Date: Fri, 24 May 2024 20:30:07 +0300 Subject: [PATCH 02/10] zsh: get rid of SSH_AUTH_SOCK value --- cli/.config/zsh/settings.zsh | 1 - 1 file changed, 1 deletion(-) diff --git a/cli/.config/zsh/settings.zsh b/cli/.config/zsh/settings.zsh index 121689c..9f3293f 100644 --- a/cli/.config/zsh/settings.zsh +++ b/cli/.config/zsh/settings.zsh @@ -11,7 +11,6 @@ export LESS='i M R' export PAGER=less export EDITOR=nvim export TIME_STYLE=long-iso -export SSH_AUTH_SOCK="$HOME/.ssh/ssh_auth_sock" export ALTERNATE_EDITOR= bindkey -e From 03d12add3074e0f7888c8d71d878b62dfac5566d Mon Sep 17 00:00:00 2001 From: Von Random Date: Mon, 27 May 2024 17:02:09 +0300 Subject: [PATCH 03/10] Xresources: dpi scaling --- lnx/.Xresources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lnx/.Xresources b/lnx/.Xresources index 7024895..cbc84b9 100644 --- a/lnx/.Xresources +++ b/lnx/.Xresources @@ -5,7 +5,7 @@ Xft.lcdfilter: true Xft.rgba: rgb Xft.hinting: true Xft.hintstyle: hintslight -Xft.dpi: 192 +Xft.dpi: 96 #define FONT xft:VascadiaMod:size=12 From 4a2562b4cd9c1e682d4cfc3d435c541ed7432b9e Mon Sep 17 00:00:00 2001 From: Von Random Date: Thu, 13 Jun 2024 14:58:20 +0300 Subject: [PATCH 04/10] nvim: remove some unused hotkeys --- cli/.config/nvim/lua/plugins.lua | 2 -- 1 file changed, 2 deletions(-) diff --git a/cli/.config/nvim/lua/plugins.lua b/cli/.config/nvim/lua/plugins.lua index d405ddd..7f8e193 100644 --- a/cli/.config/nvim/lua/plugins.lua +++ b/cli/.config/nvim/lua/plugins.lua @@ -47,8 +47,6 @@ map('n', 'L', 'Lazy') map('n', '?', 'Cheat40') map('n', '.', 'Telescope git_files') map('n', ',', 'Telescope buffers') -map('n', 'T', 'colorscheme solarized8|set bg=light') -map('n', 't', 'colorscheme gruvbox8|set bg=dark') --[[ theme ]] vim.o.termguicolors = true From 46a26852a34c02f92dd1d5b057cb9e9629a3e660 Mon Sep 17 00:00:00 2001 From: Von Random Date: Mon, 1 Jul 2024 10:59:35 +0300 Subject: [PATCH 05/10] vim: gruvbox; kitty: fantasque sans mono --- cli/.vimplugrc | 10 +++++----- gui/.config/kitty/kitty.conf | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cli/.vimplugrc b/cli/.vimplugrc index 1aa1f5d..1b8ab2b 100644 --- a/cli/.vimplugrc +++ b/cli/.vimplugrc @@ -4,7 +4,7 @@ autocmd BufRead *vimplugrc set ft=vim execute 'source' fnameescape(g:plug) plug#begin(g:plugdir) Plug 'junegunn/vim-plug' -Plug 'lifepillar/vim-solarized8' +Plug 'lifepillar/vim-gruvbox8' Plug 'hashivim/vim-terraform' Plug 'itchyny/lightline.vim' @@ -32,7 +32,7 @@ nmap ft :Filetypes # lightline g:lightline = { - colorscheme: 'solarized', + colorscheme: 'gruvbox8', separator: { left: '', right: ''}, subseparator: { left: '\u2022', right: '\u2022'} } @@ -45,9 +45,9 @@ if has('gui_running') map! endif -g:solarized_extra_hi_groups = 1 +g:gruvbox_plugin_hi_groups = 1 &t_8f = "\u1b[38;2;%lu;%lu;%lum" &t_8b = "\u1b[48;2;%lu;%lu;%lum" +&bg = 'dark' &tgc = 1 -&bg = 'light' -colorscheme solarized8 +colorscheme gruvbox8 diff --git a/gui/.config/kitty/kitty.conf b/gui/.config/kitty/kitty.conf index 96b1021..82a4d6a 100644 --- a/gui/.config/kitty/kitty.conf +++ b/gui/.config/kitty/kitty.conf @@ -1,7 +1,7 @@ # Use Ctrl+Alt+F5 to reload -font_family Cascadia Mono PL +font_family Fantasque Sans Mono modify_font underline_position 1 -font_size 14 +font_size 15 cursor_blink_interval 0 term xterm-256color From 2eb66d5a7ee6f343569cb40db3f956c2a864c447 Mon Sep 17 00:00:00 2001 From: Von Random Date: Tue, 2 Jul 2024 23:49:58 +0300 Subject: [PATCH 06/10] wezterm: ibm plex mono font --- gui/.config/wezterm/overrides.lua | 8 ++++---- gui/.config/wezterm/wezterm.lua | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/gui/.config/wezterm/overrides.lua b/gui/.config/wezterm/overrides.lua index a248ebe..81cc8f8 100644 --- a/gui/.config/wezterm/overrides.lua +++ b/gui/.config/wezterm/overrides.lua @@ -13,11 +13,11 @@ local cursor_bg = '#cb4b16' -- fonts local fonts = wt.config_builder() -fonts.font = wt.font('Fantasque Sans Mono') -fonts.harfbuzz_features = {'calt=0'} +fonts.font = wt.font('Cascadia Mono PL') +fonts.harfbuzz_features = {'ss01', 'ss19', 'ss20'} fonts.font_size = fn.set_by_os{ - Darwin = 15, - others = 12 + Darwin = 14, + others = 11 } -- theme diff --git a/gui/.config/wezterm/wezterm.lua b/gui/.config/wezterm/wezterm.lua index 6a7df44..c0c7302 100644 --- a/gui/.config/wezterm/wezterm.lua +++ b/gui/.config/wezterm/wezterm.lua @@ -20,8 +20,7 @@ cfg.check_for_updates = false -- fonts & text cfg.cursor_blink_rate = 0 cfg.bold_brightens_ansi_colors = false -cfg.font = wt.font('Cascadia Mono PL') -cfg.harfbuzz_features = {'ss01', 'ss19', 'ss20'} +cfg.font = wt.font('IBM Plex Mono') cfg.font_size = fn.set_by_os{ Darwin = 14, others = 11 From a1815ef7e24a33bd0abda652f08a384b957ca07f Mon Sep 17 00:00:00 2001 From: Von Random Date: Fri, 26 Jul 2024 18:03:56 +0300 Subject: [PATCH 07/10] wezterm: IBM Plex Mono slashed zero --- gui/.config/wezterm/wezterm.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/gui/.config/wezterm/wezterm.lua b/gui/.config/wezterm/wezterm.lua index c0c7302..7b94644 100644 --- a/gui/.config/wezterm/wezterm.lua +++ b/gui/.config/wezterm/wezterm.lua @@ -21,6 +21,7 @@ cfg.check_for_updates = false cfg.cursor_blink_rate = 0 cfg.bold_brightens_ansi_colors = false cfg.font = wt.font('IBM Plex Mono') +cfg.harfbuzz_features = {'ss03'} cfg.font_size = fn.set_by_os{ Darwin = 14, others = 11 From 22aa437ceb024d64d605e35563d6987264637532 Mon Sep 17 00:00:00 2001 From: Von Random Date: Wed, 31 Jul 2024 23:42:41 +0300 Subject: [PATCH 08/10] wezterm: remove close button --- gui/.config/wezterm/wezterm.lua | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/gui/.config/wezterm/wezterm.lua b/gui/.config/wezterm/wezterm.lua index 7b94644..7a14246 100644 --- a/gui/.config/wezterm/wezterm.lua +++ b/gui/.config/wezterm/wezterm.lua @@ -28,13 +28,7 @@ cfg.font_size = fn.set_by_os{ } -- visuals -cfg.window_decorations = 'INTEGRATED_BUTTONS|RESIZE' -cfg.integrated_title_buttons = {'Close'} -cfg.integrated_title_button_style = 'Windows' -cfg.integrated_title_button_alignment = fn.set_by_os{ - Darwin = 'Left', - others = 'Right' -} +cfg.window_decorations = 'RESIZE' cfg.xcursor_theme = 'Adwaita' cfg.use_fancy_tab_bar = false cfg.hide_tab_bar_if_only_one_tab = false From e4630b25d7084263955d6885596a980072ce492e Mon Sep 17 00:00:00 2001 From: Von Random Date: Thu, 8 Aug 2024 18:26:59 +0300 Subject: [PATCH 09/10] nvim: update deps --- cli/.config/nvim/lua/plugins.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cli/.config/nvim/lua/plugins.lua b/cli/.config/nvim/lua/plugins.lua index 7f8e193..83f786a 100644 --- a/cli/.config/nvim/lua/plugins.lua +++ b/cli/.config/nvim/lua/plugins.lua @@ -7,17 +7,18 @@ vim.opt.rtp:prepend(lazypath) --[[ plugins list ]] require('lazy').setup { - {'kdheepak/lazygit.nvim', dependencies = {'nvim-lua/plenary.nvim'}}, {'ellisonleao/gruvbox.nvim', priority = 1000, config = true}, {'nvim-orgmode/orgmode', event = 'VeryLazy', ft = {'org'}}, - {'nvim-telescope/telescope.nvim', dependencies = {'nvim-lua/plenary.nvim'}}, {'nvim-treesitter/nvim-treesitter', cmd = 'TSUpdate'}, {'w0rp/ale', cmd = 'ALEEnable', ft = {'bash', 'go', 'lua', 'python', 'sh', 'zsh'}}, + 'kdheepak/lazygit.nvim', + 'nvim-telescope/telescope.nvim', 'lewis6991/gitsigns.nvim', 'lifepillar/vim-cheat40', 'nvim-lualine/lualine.nvim', 'tpope/vim-rsi', 'tpope/vim-vinegar', + {'nvim-lua/plenary.nvim', lazy = true}, } --[[ plugin configs and maps ]] From a29ea2fdbe9e1584a43071f1ea6892ad4fd5b885 Mon Sep 17 00:00:00 2001 From: Von Random Date: Thu, 8 Aug 2024 18:28:29 +0300 Subject: [PATCH 10/10] nvim: update deps more --- cli/.config/nvim/lua/plugins.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/.config/nvim/lua/plugins.lua b/cli/.config/nvim/lua/plugins.lua index 83f786a..803cc42 100644 --- a/cli/.config/nvim/lua/plugins.lua +++ b/cli/.config/nvim/lua/plugins.lua @@ -9,10 +9,10 @@ vim.opt.rtp:prepend(lazypath) require('lazy').setup { {'ellisonleao/gruvbox.nvim', priority = 1000, config = true}, {'nvim-orgmode/orgmode', event = 'VeryLazy', ft = {'org'}}, - {'nvim-treesitter/nvim-treesitter', cmd = 'TSUpdate'}, {'w0rp/ale', cmd = 'ALEEnable', ft = {'bash', 'go', 'lua', 'python', 'sh', 'zsh'}}, 'kdheepak/lazygit.nvim', 'nvim-telescope/telescope.nvim', + 'nvim-treesitter/nvim-treesitter', 'lewis6991/gitsigns.nvim', 'lifepillar/vim-cheat40', 'nvim-lualine/lualine.nvim',