update
This commit is contained in:
6 files changed
+30
-54
No files matched your search
@@ -4,36 +4,3 @@ require('config.keys')
|
|||||||
require('config.autocmd')
|
require('config.autocmd')
|
||||||
require('config.lazy')
|
require('config.lazy')
|
||||||
require('config.lsp')
|
require('config.lsp')
|
||||||
|
|
||||||
vim.cmd([[
|
|
||||||
"
|
|
||||||
" Intelligently navigate tmux panes and Vim splits using the same keys.
|
|
||||||
" This also supports SSH tunnels where Vim is running on a remote host.
|
|
||||||
"
|
|
||||||
" See https://sunaku.github.io/tmux-select-pane.html for documentation.
|
|
||||||
|
|
||||||
function! TmuxNavigateDirections() abort
|
|
||||||
let [y, x] = win_screenpos('.')
|
|
||||||
let h = winheight('.')
|
|
||||||
let w = winwidth('.')
|
|
||||||
|
|
||||||
let can_go_up = y > 2 " +1 for the tabline
|
|
||||||
let can_go_down = y + h < &lines - &laststatus
|
|
||||||
let can_go_left = x > 1
|
|
||||||
let can_go_right = x + w < &columns
|
|
||||||
|
|
||||||
return
|
|
||||||
\ (can_go_up ? 'U' : '') .
|
|
||||||
\ (can_go_down ? 'D' : '') .
|
|
||||||
\ (can_go_left ? 'L' : '') .
|
|
||||||
\ (can_go_right ? 'R' : '')
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
let progname = substitute($VIM, '.*[/\\]', '', '')
|
|
||||||
set title titlestring=%{progname}\ %f\ #%{TmuxNavigateDirections()}
|
|
||||||
|
|
||||||
" enable support for setting the window title in regular Vim under tmux
|
|
||||||
if &term =~ '^screen' && !has('nvim')
|
|
||||||
execute "set t_ts=\e]2; t_fs=\7"
|
|
||||||
endif
|
|
||||||
]])
|
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
{
|
{
|
||||||
"Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
|
"Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
|
||||||
"LuaSnip": { "branch": "master", "commit": "5a1e39223db9a0498024a77b8441169d260c8c25" },
|
"LuaSnip": { "branch": "master", "commit": "5a1e39223db9a0498024a77b8441169d260c8c25" },
|
||||||
|
"Navigator.nvim": { "branch": "master", "commit": "91d86506ac2a039504d5205d32a1d4bc7aa57072" },
|
||||||
"bento.nvim": { "branch": "main", "commit": "aee8a542bc1839ff1764992ef2aa41c981d0bba4" },
|
"bento.nvim": { "branch": "main", "commit": "aee8a542bc1839ff1764992ef2aa41c981d0bba4" },
|
||||||
"better-escape.nvim": { "branch": "master", "commit": "19a38aab94961016430905ebec30d272a01e9742" },
|
"better-escape.nvim": { "branch": "master", "commit": "19a38aab94961016430905ebec30d272a01e9742" },
|
||||||
"blink.cmp": { "branch": "main", "commit": "451168851e8e2466bc97ee3e026c3dcb9141ce07" },
|
"blink.cmp": { "branch": "main", "commit": "451168851e8e2466bc97ee3e026c3dcb9141ce07" },
|
||||||
|
|||||||
@@ -6,7 +6,16 @@ return {
|
|||||||
version = '*',
|
version = '*',
|
||||||
config = function()
|
config = function()
|
||||||
require('blink.cmp').setup({
|
require('blink.cmp').setup({
|
||||||
|
fuzzy = { implementation = 'prefer_rust' },
|
||||||
|
snippets = { preset = 'luasnip' },
|
||||||
|
sources = {
|
||||||
|
default = { 'lsp', 'path', 'snippets', 'buffer' },
|
||||||
|
providers = {},
|
||||||
|
},
|
||||||
|
|
||||||
completion = {
|
completion = {
|
||||||
|
ghost_text = { enabled = true },
|
||||||
|
|
||||||
list = {
|
list = {
|
||||||
selection = {
|
selection = {
|
||||||
preselect = false,
|
preselect = false,
|
||||||
@@ -45,11 +54,6 @@ return {
|
|||||||
signature = {
|
signature = {
|
||||||
window = { border = 'rounded' },
|
window = { border = 'rounded' },
|
||||||
},
|
},
|
||||||
snippets = { preset = 'luasnip' },
|
|
||||||
sources = {
|
|
||||||
default = { 'lsp', 'path', 'snippets', 'buffer' },
|
|
||||||
providers = {},
|
|
||||||
},
|
|
||||||
keymap = {
|
keymap = {
|
||||||
preset = 'none',
|
preset = 'none',
|
||||||
['<S-Tab>'] = { 'select_prev', 'snippet_backward', 'fallback' },
|
['<S-Tab>'] = { 'select_prev', 'snippet_backward', 'fallback' },
|
||||||
|
|||||||
+1
-16
@@ -13,21 +13,6 @@ return {
|
|||||||
cmd = { 'SudaRead', 'SudaWrite' },
|
cmd = { 'SudaRead', 'SudaWrite' },
|
||||||
},
|
},
|
||||||
|
|
||||||
-- Undo History Visualizer
|
|
||||||
{
|
|
||||||
'mbbill/undotree',
|
|
||||||
cmd = { 'UndotreeToggle' },
|
|
||||||
keys = { { '<leader>u', '<cmd>UndotreeToggle<cr>', desc = 'Undo Tree' } },
|
|
||||||
config = function()
|
|
||||||
vim.g.undotree_WindowLayout = 2
|
|
||||||
vim.g.undotree_SetFocusWhenToggle = 1
|
|
||||||
vim.g.undotree_SplitWidth = 35
|
|
||||||
vim.g.undotree_DiffpanelHeight = 15
|
|
||||||
vim.g.undotree_DiffCommand = 'diff --unified=0'
|
|
||||||
-- vim.g.undotree_DiffCommand = "git diff --no-index --unified=0 --patience"
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
|
|
||||||
-- visual multi
|
-- visual multi
|
||||||
{
|
{
|
||||||
'mg979/vim-visual-multi',
|
'mg979/vim-visual-multi',
|
||||||
@@ -94,7 +79,7 @@ return {
|
|||||||
desc = 'Rename File',
|
desc = 'Rename File',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
'<leader>fx',
|
'<leader>fz',
|
||||||
function()
|
function()
|
||||||
require('genghis').chmodx()
|
require('genghis').chmodx()
|
||||||
end,
|
end,
|
||||||
|
|||||||
@@ -92,4 +92,17 @@ return {
|
|||||||
-- })
|
-- })
|
||||||
-- end,
|
-- end,
|
||||||
},
|
},
|
||||||
|
|
||||||
|
-- navigator
|
||||||
|
{
|
||||||
|
'numToStr/Navigator.nvim',
|
||||||
|
event = 'VeryLazy',
|
||||||
|
config = function()
|
||||||
|
require('Navigator').setup({
|
||||||
|
auto_save = 'current',
|
||||||
|
disable_on_zoom = false,
|
||||||
|
mux = 'auto',
|
||||||
|
})
|
||||||
|
end,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
@@ -274,6 +274,12 @@ return {
|
|||||||
{ '<C-Right>', ':vertical resize +10<cr>', desc = 'Increase window width' },
|
{ '<C-Right>', ':vertical resize +10<cr>', desc = 'Increase window width' },
|
||||||
{ '<C-Up>', ':resize +10<cr>', desc = 'Increase window height' },
|
{ '<C-Up>', ':resize +10<cr>', desc = 'Increase window height' },
|
||||||
|
|
||||||
|
{ '<C-h>', ':NavigatorLeft<cr>', desc = 'Move Left' },
|
||||||
|
{ '<C-j>', ':NavigatorDown<cr>', desc = 'Move Down' },
|
||||||
|
{ '<C-k>', ':NavigatorUp<cr>', desc = 'Move Up' },
|
||||||
|
{ '<C-l>', ':NavigatorRight<cr>', desc = 'Move Right' },
|
||||||
|
{ '<C-\\>', ':NavigatorPrevious<cr>', desc = 'Previous Pane' },
|
||||||
|
|
||||||
-- { '<S-h>', ':bprevious<cr>', desc = 'Previous Buffer' },
|
-- { '<S-h>', ':bprevious<cr>', desc = 'Previous Buffer' },
|
||||||
-- { '<S-l>', ':bnext<cr>', desc = 'Next Buffer' },
|
-- { '<S-l>', ':bnext<cr>', desc = 'Next Buffer' },
|
||||||
{ '<Tab>', ':bnext<cr>', desc = 'Next Buffer' },
|
{ '<Tab>', ':bnext<cr>', desc = 'Next Buffer' },
|
||||||
|
|||||||
Reference in new issue
Block a user