You've already forked dotfiles
feat: Removing the old web-devicons from lualine, disabling the snippet
style auto-pair attempt (will continue on other branches), disabling passthrough in tmux as it is not seemingly necessary for clipboard usage (remote testing needed), disabling the old mouse cursor fix for X systems. Adding the wezterm shortcuts for actually using the Clipboard for pasting using the usual ctrl+shift+v combo.
This commit is contained in:
@@ -7,7 +7,6 @@ local function get_schema()
|
||||
end
|
||||
|
||||
vim.pack.add({
|
||||
-- 'https://github.com/nvim-tree/nvim-web-devicons',
|
||||
'https://github.com/nvim-lualine/lualine.nvim'
|
||||
})
|
||||
|
||||
|
||||
@@ -1,36 +1,37 @@
|
||||
-- require('luasnip.session.snippet_collection').clear_snippets('all')
|
||||
|
||||
local ls = require('luasnip')
|
||||
local s = ls.snippet
|
||||
local sn = ls.snippet_node
|
||||
local i = ls.insert_node
|
||||
local t = ls.text_node
|
||||
local c = ls.choice_node
|
||||
local r = ls.restore_node
|
||||
-- local ls = require('luasnip')
|
||||
-- local s = ls.snippet
|
||||
-- local sn = ls.snippet_node
|
||||
-- local i = ls.insert_node
|
||||
-- local t = ls.text_node
|
||||
-- local c = ls.choice_node
|
||||
-- local r = ls.restore_node
|
||||
--
|
||||
-- -- Replacement of autopairs
|
||||
-- local function pair(pair_begin, pair_end)
|
||||
-- -- Auto-pair using snippets
|
||||
-- return s({ trig = pair_begin, wordTrig = false }, {
|
||||
-- t({ pair_begin }),
|
||||
-- c(1, {
|
||||
-- r(1, "content", i(1)),
|
||||
-- sn(nil, { t({"", "\t"}), r(1, "content", i(1)), t({ "", "" }) }),
|
||||
-- }),
|
||||
-- t({ pair_end }),
|
||||
-- })
|
||||
-- end
|
||||
--
|
||||
-- ls.add_snippets('all', {
|
||||
-- pair('(', ')'),
|
||||
-- pair('{', '}'),
|
||||
-- pair('[', ']'),
|
||||
-- pair('<', '>'),
|
||||
-- pair("'", "'"),
|
||||
-- pair('"', '"'),
|
||||
-- pair('`', '`'),
|
||||
-- }, {
|
||||
-- -- type = 'autosnippets',
|
||||
-- -- key = 'all_auto',
|
||||
-- })
|
||||
|
||||
-- Replacement of autopairs
|
||||
local function pair(pair_begin, pair_end)
|
||||
-- Auto-pair using snippets
|
||||
return s({ trig = pair_begin, wordTrig = false }, {
|
||||
t({ pair_begin }),
|
||||
c(1, {
|
||||
r(1, "content", i(1)),
|
||||
sn(nil, { t({"", "\t"}), r(1, "content", i(1)), t({ "", "" }) }),
|
||||
}),
|
||||
t({ pair_end }),
|
||||
})
|
||||
end
|
||||
|
||||
ls.add_snippets('all', {
|
||||
pair('(', ')'),
|
||||
pair('{', '}'),
|
||||
pair('[', ']'),
|
||||
pair('<', '>'),
|
||||
pair("'", "'"),
|
||||
pair('"', '"'),
|
||||
pair('`', '`'),
|
||||
}, {
|
||||
-- type = 'autosnippets',
|
||||
-- key = 'all_auto',
|
||||
})
|
||||
-- end autopairs
|
||||
|
||||
@@ -27,7 +27,7 @@ setw -g aggressive-resize on
|
||||
|
||||
# Allow for external system clipboard
|
||||
set-option -g set-clipboard external
|
||||
set-option -g allow-passthrough on
|
||||
# set-option -g allow-passthrough on
|
||||
|
||||
# Allow mouse interactions
|
||||
set -g mouse on
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
local wezterm = require 'wezterm'
|
||||
local act = wezterm.action
|
||||
|
||||
local config = wezterm.config_builder()
|
||||
|
||||
-- Visual options
|
||||
config.color_scheme = 's3r0 modified (terminal.sexy)'
|
||||
-- config.color_scheme = 'Mashup Colors (terminal.sexy)'
|
||||
|
||||
config.font = wezterm.font 'Inconsolata Nerd Font Mono'
|
||||
config.font_size = 12
|
||||
@@ -25,33 +25,33 @@ config.automatically_reload_config = true
|
||||
-- Linux specific fixes
|
||||
if wezterm.target_triple == 'x86_64-unknown-linux-gnu' then
|
||||
-- Fixing the cursor theme
|
||||
local xcursor_size = nil
|
||||
local xcursor_theme = nil
|
||||
|
||||
local theme_success, stdout, _ = wezterm.run_child_process({
|
||||
"gsettings",
|
||||
"get",
|
||||
"org.gnome.desktop.interface",
|
||||
"cursor-theme"
|
||||
})
|
||||
|
||||
if theme_success then
|
||||
xcursor_theme = stdout:gsub("'(.+)'\n", "%1")
|
||||
end
|
||||
|
||||
local cursor_success, _, _ = wezterm.run_child_process({
|
||||
"gsettings",
|
||||
"get",
|
||||
"org.gnome.desktop.interface",
|
||||
"cursor-size"
|
||||
})
|
||||
|
||||
if cursor_success then
|
||||
xcursor_size = tonumber(stdout)
|
||||
end
|
||||
|
||||
config.xcursor_theme = xcursor_theme
|
||||
config.xcursor_size = xcursor_size
|
||||
-- local xcursor_size = nil
|
||||
-- local xcursor_theme = nil
|
||||
--
|
||||
-- local theme_success, stdout, _ = wezterm.run_child_process({
|
||||
-- "gsettings",
|
||||
-- "get",
|
||||
-- "org.gnome.desktop.interface",
|
||||
-- "cursor-theme"
|
||||
-- })
|
||||
--
|
||||
-- if theme_success then
|
||||
-- xcursor_theme = stdout:gsub("'(.+)'\n", "%1")
|
||||
-- end
|
||||
--
|
||||
-- local cursor_success, _, _ = wezterm.run_child_process({
|
||||
-- "gsettings",
|
||||
-- "get",
|
||||
-- "org.gnome.desktop.interface",
|
||||
-- "cursor-size"
|
||||
-- })
|
||||
--
|
||||
-- if cursor_success then
|
||||
-- xcursor_size = tonumber(stdout)
|
||||
-- end
|
||||
--
|
||||
-- config.xcursor_theme = xcursor_theme
|
||||
-- config.xcursor_size = xcursor_size
|
||||
-- end cursor theme
|
||||
|
||||
config.disable_default_key_bindings = true
|
||||
@@ -64,4 +64,9 @@ if local_config ~= nil then
|
||||
config = local_setup.setup(config)
|
||||
end
|
||||
|
||||
config.keys = {
|
||||
{key = 'V', mods = 'CTRL', action = act.PasteFrom 'Clipboard'},
|
||||
{key = 'V', mods = 'CTRL', action = act.PasteFrom 'PrimarySelection'},
|
||||
}
|
||||
|
||||
return config
|
||||
|
||||
Reference in New Issue
Block a user