summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVon Random <von@vdrandom.org>2023-03-21 13:08:40 +0200
committerVon Random <von@vdrandom.org>2023-03-21 13:08:40 +0200
commitd20314a03be008e3528b86cfb8758809f07505bb (patch)
tree1c2ed58d523688499797712fbe94e89a52ad00f5
parent75f82898545099ed86933c08fdb7aa272d688cd7 (diff)
nvim: tabstop 8 to avoid a bug in a plugin; wezterm: some deprecations cleaned up
-rw-r--r--cli/.config/nvim/lua/settings.lua6
-rw-r--r--gui/.wezterm.lua10
2 files changed, 8 insertions, 8 deletions
diff --git a/cli/.config/nvim/lua/settings.lua b/cli/.config/nvim/lua/settings.lua
index 741f00b..7437e80 100644
--- a/cli/.config/nvim/lua/settings.lua
+++ b/cli/.config/nvim/lua/settings.lua
@@ -7,7 +7,7 @@ vim.o.breakindent = true
vim.o.clipboard = 'unnamedplus'
vim.o.list = true
-vim.o.listchars = 'tab:==>,nbsp:x,trail:*'
+vim.o.listchars = 'tab:|_,nbsp:x,trail:*'
vim.o.ignorecase = true
vim.o.smartcase = true
@@ -15,7 +15,7 @@ vim.o.smartcase = true
vim.o.scrolloff = 3
vim.o.sidescrolloff = 15
-vim.o.tabstop = 3
+vim.o.tabstop = 8
vim.o.softtabstop = 4
vim.o.shiftwidth = 4
vim.o.expandtab = true
@@ -26,4 +26,4 @@ vim.o.imsearch = 0
local fsize = '11'
if vim.loop.os_uname().sysname == 'Darwin' then fsize = '14' end
-vim.o.guifont = 'vcascadia:h' .. fsize
+vim.o.guifont = 'vcascadia:h' .. fsize
diff --git a/gui/.wezterm.lua b/gui/.wezterm.lua
index fdb130d..cff7610 100644
--- a/gui/.wezterm.lua
+++ b/gui/.wezterm.lua
@@ -3,7 +3,7 @@ local act = wt.action
local font = 'Cascadia Mono PL'
local font_features = { 'ss01=1', 'ss02=1', 'ss19=1' }
local fontsizes = { Darwin = 14, others = 11 }
-local theme = 'Gruvbox Dark'
+local theme = 'GruvboxDark'
local overrides = {
fonts = {
font = wt.font('JetBrains Mono'),
@@ -36,8 +36,8 @@ local custom_colors = {
local leader_key = { key = 'g', mods = 'CTRL', timeout_milliseconds = 1000 }
local keybinds = {
- { key = 'c', mods = 'META', action = act.Copy },
- { key = 'v', mods = 'META', action = act.Paste },
+ { key = 'c', mods = 'META', action = act.CopyTo('Clipboard') },
+ { key = 'v', mods = 'META', action = act.PasteFrom('Clipboard') },
-- themes
{ key = 'f', mods = 'LEADER', action = act.EmitEvent('override-fonts') },
{ key = 't', mods = 'LEADER', action = act.EmitEvent('override-theme') },
@@ -47,8 +47,8 @@ local keybinds = {
{ key = 'n', mods = 'LEADER', action = act.ActivateTabRelative( 1) },
{ key = 'p', mods = 'LEADER', action = act.ActivateTabRelative(-1) },
-- panes
- { key = 's', mods = 'LEADER', action = act.SplitVertical { domain = 'CurrentPaneDomain' } },
- { key = 'v', mods = 'LEADER', action = act.SplitHorizontal{ domain = 'CurrentPaneDomain' } },
+ { key = 's', mods = 'LEADER', action = act.SplitVertical { domain = 'CurrentPaneDomain' } },
+ { key = 'v', mods = 'LEADER', action = act.SplitHorizontal { domain = 'CurrentPaneDomain' } },
{ key = 'h', mods = 'LEADER', action = act.ActivatePaneDirection('Left') },
{ key = 'j', mods = 'LEADER', action = act.ActivatePaneDirection('Down') },
{ key = 'k', mods = 'LEADER', action = act.ActivatePaneDirection('Up') },