update
This commit is contained in:
4 files changed
+66
-41
No files matched your search
@@ -1,6 +1,39 @@
|
|||||||
-- load config
|
-- load config
|
||||||
require("config.options")
|
require('config.options')
|
||||||
require("config.keys")
|
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
|
||||||
|
]])
|
||||||
+7
-8
@@ -1,11 +1,10 @@
|
|||||||
{
|
{
|
||||||
"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" },
|
|
||||||
"better-escape.nvim": { "branch": "master", "commit": "19a38aab94961016430905ebec30d272a01e9742" },
|
"better-escape.nvim": { "branch": "master", "commit": "19a38aab94961016430905ebec30d272a01e9742" },
|
||||||
"blink.cmp": { "branch": "main", "commit": "b19413d214068f316c78978b08264ed1c41830ec" },
|
"blink.cmp": { "branch": "main", "commit": "b19413d214068f316c78978b08264ed1c41830ec" },
|
||||||
"codesnap.nvim": { "branch": "main", "commit": "d8d55f5b62a6c12bc7756eb0b997a776eafd086e" },
|
"codesnap.nvim": { "branch": "main", "commit": "d8d55f5b62a6c12bc7756eb0b997a776eafd086e" },
|
||||||
"conform.nvim": { "branch": "master", "commit": "5f5152fae39a57e3a04cbce09fb21e10c49c9d95" },
|
"conform.nvim": { "branch": "master", "commit": "5420c4b5ea0aeb99c09cfbd4fd0b70d257b44f25" },
|
||||||
"friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
|
"friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
|
||||||
"gitignore.nvim": { "branch": "master", "commit": "0344f643768c4d64af4add8c1bdddf6f7d4c9010" },
|
"gitignore.nvim": { "branch": "master", "commit": "0344f643768c4d64af4add8c1bdddf6f7d4c9010" },
|
||||||
"gitsigns.nvim": { "branch": "main", "commit": "5813e4878748805f1518cee7abb50fd7205a3a48" },
|
"gitsigns.nvim": { "branch": "main", "commit": "5813e4878748805f1518cee7abb50fd7205a3a48" },
|
||||||
@@ -15,26 +14,26 @@
|
|||||||
"lazygit.nvim": { "branch": "main", "commit": "a04ad0dbc725134edbee3a5eea29290976695357" },
|
"lazygit.nvim": { "branch": "main", "commit": "a04ad0dbc725134edbee3a5eea29290976695357" },
|
||||||
"lspsaga.nvim": { "branch": "main", "commit": "8efe00d6aed9db6449969f889170f1a7e43101a1" },
|
"lspsaga.nvim": { "branch": "main", "commit": "8efe00d6aed9db6449969f889170f1a7e43101a1" },
|
||||||
"markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
|
"markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
|
||||||
"markview.nvim": { "branch": "main", "commit": "0a5033326f703d99a8788e2d47753d6298195e8a" },
|
"markview.nvim": { "branch": "main", "commit": "03fe3f42093d47a8536276f682cf057f8c14033b" },
|
||||||
"mason-conform.nvim": { "branch": "main", "commit": "48da2ebd5efbaf8a99566eadc3ece82d523f03c5" },
|
"mason-conform.nvim": { "branch": "main", "commit": "48da2ebd5efbaf8a99566eadc3ece82d523f03c5" },
|
||||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "8f1a3e6eecb638817e8999aaa16ada27cd54d867" },
|
"mason-lspconfig.nvim": { "branch": "main", "commit": "9f9c67795d0795a6e8612f5a899ca64a074a1076" },
|
||||||
"mason-nvim-lint": { "branch": "main", "commit": "767b8ccdddaa977bec8987fd7507b9865a279235" },
|
"mason-nvim-lint": { "branch": "main", "commit": "767b8ccdddaa977bec8987fd7507b9865a279235" },
|
||||||
"mason.nvim": { "branch": "main", "commit": "57e5a8addb8c71fb063ee4acda466c7cf6ad2800" },
|
"mason.nvim": { "branch": "main", "commit": "57e5a8addb8c71fb063ee4acda466c7cf6ad2800" },
|
||||||
"mdx.nvim": { "branch": "main", "commit": "30222997ed4c0c7cc7447c4fce360fce87101bbf" },
|
"mdx.nvim": { "branch": "main", "commit": "30222997ed4c0c7cc7447c4fce360fce87101bbf" },
|
||||||
"mini.nvim": { "branch": "main", "commit": "6acb62618e2e7f1bf4f2e96e77a562ec80696f5e" },
|
"mini.nvim": { "branch": "main", "commit": "7e55c3d2c04da134085a31156196836f80a89982" },
|
||||||
"neogen": { "branch": "main", "commit": "d7f9461727751fb07f82011051338a9aba07581d" },
|
"neogen": { "branch": "main", "commit": "d7f9461727751fb07f82011051338a9aba07581d" },
|
||||||
"neoscroll.nvim": { "branch": "master", "commit": "f957373912e88579e26fdaea4735450ff2ef5c9c" },
|
"neoscroll.nvim": { "branch": "master", "commit": "f957373912e88579e26fdaea4735450ff2ef5c9c" },
|
||||||
"nvim-autopairs": { "branch": "master", "commit": "c2a0dd0d931d0fb07665e1fedb1ea688da3b80b4" },
|
"nvim-autopairs": { "branch": "master", "commit": "c2a0dd0d931d0fb07665e1fedb1ea688da3b80b4" },
|
||||||
"nvim-genghis": { "branch": "main", "commit": "7e7a37e166b0244f12f9f78f96a36473704683ff" },
|
"nvim-genghis": { "branch": "main", "commit": "7e7a37e166b0244f12f9f78f96a36473704683ff" },
|
||||||
"nvim-lint": { "branch": "master", "commit": "7a64f4067065c16a355d40d0d599b8ca6b25de6d" },
|
"nvim-lint": { "branch": "master", "commit": "1f19dacd945a7b1a57f29f32b2d7168384df3d36" },
|
||||||
"nvim-lspconfig": { "branch": "master", "commit": "d20d83b3f24f5884da73a9fc92fdc47e778b8d0d" },
|
"nvim-lspconfig": { "branch": "master", "commit": "8973916a3d015d65a8c4614e141f4270a713cf33" },
|
||||||
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
|
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
|
||||||
"nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" },
|
"nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" },
|
||||||
"nvim-ts-context-commentstring": { "branch": "main", "commit": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f" },
|
"nvim-ts-context-commentstring": { "branch": "main", "commit": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f" },
|
||||||
"nvim-ufo": { "branch": "main", "commit": "72d54c31079d38d8dfc5456131b1d0fb5c0264b0" },
|
"nvim-ufo": { "branch": "main", "commit": "72d54c31079d38d8dfc5456131b1d0fb5c0264b0" },
|
||||||
"promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" },
|
"promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" },
|
||||||
"snacks.nvim": { "branch": "main", "commit": "fe7cfe9800a182274d0f868a74b7263b8c0c020b" },
|
"snacks.nvim": { "branch": "main", "commit": "fe7cfe9800a182274d0f868a74b7263b8c0c020b" },
|
||||||
"tiny-code-action.nvim": { "branch": "main", "commit": "bd1773cb5b4232971f98a85e2b1637a84cd7f839" },
|
"tiny-code-action.nvim": { "branch": "main", "commit": "897de9af9e3aa6e59bcb9fec760a7eb02d00e264" },
|
||||||
"tiny-inline-diagnostic.nvim": { "branch": "main", "commit": "d9d12d4bfb9a4c5b8b8bdf7f612551df6972946c" },
|
"tiny-inline-diagnostic.nvim": { "branch": "main", "commit": "d9d12d4bfb9a4c5b8b8bdf7f612551df6972946c" },
|
||||||
"todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" },
|
"todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" },
|
||||||
"toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" },
|
"toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" },
|
||||||
|
|||||||
+21
-21
@@ -28,17 +28,17 @@ return {
|
|||||||
},
|
},
|
||||||
|
|
||||||
-- Navigator
|
-- Navigator
|
||||||
{
|
-- {
|
||||||
'numToStr/Navigator.nvim',
|
-- 'numToStr/Navigator.nvim',
|
||||||
event = 'VeryLazy',
|
-- event = 'VeryLazy',
|
||||||
config = function()
|
-- config = function()
|
||||||
require('Navigator').setup({
|
-- require('Navigator').setup({
|
||||||
auto_save = 'current',
|
-- auto_save = 'current',
|
||||||
disable_on_zoom = false,
|
-- disable_on_zoom = false,
|
||||||
mux = 'auto',
|
-- mux = 'auto',
|
||||||
})
|
-- })
|
||||||
end,
|
-- end,
|
||||||
},
|
-- },
|
||||||
|
|
||||||
-- float terminal
|
-- float terminal
|
||||||
{
|
{
|
||||||
@@ -62,7 +62,7 @@ return {
|
|||||||
shell = vim.o.shell,
|
shell = vim.o.shell,
|
||||||
float_opts = {
|
float_opts = {
|
||||||
border = 'curved', -- 'single', 'double', 'shadow', etc.
|
border = 'curved', -- 'single', 'double', 'shadow', etc.
|
||||||
winblend = 0, -- Set to 0 for full transparency
|
winblend = 0, -- Set to 0 for full transparency
|
||||||
highlights = {
|
highlights = {
|
||||||
border = 'Normal',
|
border = 'Normal',
|
||||||
background = 'Normal',
|
background = 'Normal',
|
||||||
@@ -93,16 +93,16 @@ return {
|
|||||||
picker_integration = true,
|
picker_integration = true,
|
||||||
keymaps = {
|
keymaps = {
|
||||||
prefix = '<leader>u', -- Main prefix for uv commands
|
prefix = '<leader>u', -- Main prefix for uv commands
|
||||||
commands = true, -- Show uv commands menu (<leader>x)
|
commands = true, -- Show uv commands menu (<leader>x)
|
||||||
run_file = true, -- Run current file (<leader>xr)
|
run_file = true, -- Run current file (<leader>xr)
|
||||||
run_selection = true, -- Run selected code (<leader>xs)
|
run_selection = true, -- Run selected code (<leader>xs)
|
||||||
run_function = true, -- Run function (<leader>xf)
|
run_function = true, -- Run function (<leader>xf)
|
||||||
venv = true, -- Environment management (<leader>xe)
|
venv = true, -- Environment management (<leader>xe)
|
||||||
init = true, -- Initialize uv project (<leader>xi)
|
init = true, -- Initialize uv project (<leader>xi)
|
||||||
add = true, -- Add a package (<leader>xa)
|
add = true, -- Add a package (<leader>xa)
|
||||||
remove = true, -- Remove a package (<leader>xd)
|
remove = true, -- Remove a package (<leader>xd)
|
||||||
sync = true, -- Sync packages (<leader>xc)
|
sync = true, -- Sync packages (<leader>xc)
|
||||||
sync_all = true, -- Sync all packages, extras and groups (<leader>xC)
|
sync_all = true, -- Sync all packages, extras and groups (<leader>xC)
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -208,7 +208,6 @@ return {
|
|||||||
{ '<leader>sj', '<C-w>j', desc = 'Move Down' },
|
{ '<leader>sj', '<C-w>j', desc = 'Move Down' },
|
||||||
{ '<leader>sk', '<C-w>k', desc = 'Move Up' },
|
{ '<leader>sk', '<C-w>k', desc = 'Move Up' },
|
||||||
{ '<leader>sl', '<C-w>l', desc = 'Move Right' },
|
{ '<leader>sl', '<C-w>l', desc = 'Move Right' },
|
||||||
{ '<leader>sp', ':NavigatorPrevious<cr>', desc = 'Previous Pane' },
|
|
||||||
{ '<leader>sq', '<C-w>c', desc = 'Close Split' },
|
{ '<leader>sq', '<C-w>c', desc = 'Close Split' },
|
||||||
{ '<leader>ss', ':vsplit<cr>', desc = 'Vertical Split' },
|
{ '<leader>ss', ':vsplit<cr>', desc = 'Vertical Split' },
|
||||||
|
|
||||||
@@ -275,12 +274,6 @@ 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