update: hypr&neovim improvements, yazi plugins, waybar tweaking before bigger update
This commit is contained in:
+20
-19
@@ -1,31 +1,32 @@
|
||||
{
|
||||
"Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
|
||||
"catppuccin": { "branch": "main", "commit": "ce8d176faa4643e026e597ae3c31db59b63cef09" },
|
||||
"catppuccin": { "branch": "main", "commit": "426dbebe06b5c69fd846ceb17b42e12f890aedf1" },
|
||||
"cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
|
||||
"cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" },
|
||||
"conform.nvim": { "branch": "master", "commit": "5420c4b5ea0aeb99c09cfbd4fd0b70d257b44f25" },
|
||||
"conform.nvim": { "branch": "master", "commit": "086a40dc7ed8242c03be9f47fbcee68699cc2395" },
|
||||
"dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" },
|
||||
"flutter-tools.nvim": { "branch": "main", "commit": "539e84f5a652d96917f0afc1341c20f0d59dd789" },
|
||||
"flutter-tools.nvim": { "branch": "main", "commit": "677cc07c16e8b89999108d2ebeefcfc5f539b73c" },
|
||||
"harpoon": { "branch": "harpoon2", "commit": "87b1a3506211538f460786c23f98ec63ad9af4e5" },
|
||||
"indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
|
||||
"harpoon-lualine": { "branch": "master", "commit": "215c0847dfb787b19268f7b42eed83bdcf06b966" },
|
||||
"indent-blankline.nvim": { "branch": "master", "commit": "d28a3f70721c79e3c5f6693057ae929f3d9c0a03" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
|
||||
"lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" },
|
||||
"mini.nvim": { "branch": "main", "commit": "7e55c3d2c04da134085a31156196836f80a89982" },
|
||||
"neo-tree.nvim": { "branch": "main", "commit": "b0b73273b4f5a1f4b4aac8accd6e0c3b4b5a6967" },
|
||||
"lualine.nvim": { "branch": "master", "commit": "a905eeebc4e63fdc48b5135d3bf8aea5618fb21c" },
|
||||
"mini.nvim": { "branch": "main", "commit": "5849ef04c32a6a8e55957b946c0a275801d87530" },
|
||||
"neo-tree.nvim": { "branch": "main", "commit": "4d0828d95adaf4250c1373d2cd9318d3509712b7" },
|
||||
"nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
|
||||
"nvim-autopairs": { "branch": "master", "commit": "c2a0dd0d931d0fb07665e1fedb1ea688da3b80b4" },
|
||||
"nvim-cmp": { "branch": "main", "commit": "d97d85e01339f01b842e6ec1502f639b080cb0fc" },
|
||||
"nvim-dap": { "branch": "master", "commit": "818cd8787a77a97703eb1d9090543a374f79a9ac" },
|
||||
"nvim-autopairs": { "branch": "master", "commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5" },
|
||||
"nvim-cmp": { "branch": "main", "commit": "a1d504892f2bc56c2e79b65c6faded2fd21f3eca" },
|
||||
"nvim-dap": { "branch": "master", "commit": "45a69eba683a2c448dd9ecfc4de89511f0646b5f" },
|
||||
"nvim-dap-python": { "branch": "master", "commit": "1808458eba2b18f178f990e01376941a42c7f93b" },
|
||||
"nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "d696e36d5792daf828f8c8e8d4b9aa90c1a10c2a" },
|
||||
"nvim-dap-ui": { "branch": "master", "commit": "1a66cabaa4a4da0be107d5eda6d57242f0fe7e49" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "e146efacbafed3789ac568abcc5a981c5decaa58" },
|
||||
"nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
|
||||
"nvim-web-devicons": { "branch": "master", "commit": "6788013bb9cb784e606ada44206b0e755e4323d7" },
|
||||
"plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
|
||||
"render-markdown.nvim": { "branch": "main", "commit": "07d088bf8bdadd159eb807b90eaee86a4778383f" },
|
||||
"telescope.nvim": { "branch": "master", "commit": "4d0f5e0e7f69071e315515c385fab2a4eff07b3d" },
|
||||
"vim-fugitive": { "branch": "master", "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4" },
|
||||
"nvim-treesitter": { "branch": "main", "commit": "4916d6592ede8c07973490d9322f187e07dfefac" },
|
||||
"nvim-web-devicons": { "branch": "master", "commit": "c72328a5494b4502947a022fe69c0c47e53b6aa6" },
|
||||
"plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" },
|
||||
"render-markdown.nvim": { "branch": "main", "commit": "d67113f11384c0dad96fced2f7b91f1fc811e97f" },
|
||||
"telescope.nvim": { "branch": "master", "commit": "506338434fec5ad19cb1f8d45bf92d66c4917393" },
|
||||
"vim-fugitive": { "branch": "master", "commit": "3b753cf8c6a4dcde6edee8827d464ba9b8c4a6f0" },
|
||||
"vim-suda": { "branch": "master", "commit": "c492741b4679b3cdd4d9e34138209784e061d916" },
|
||||
"yanky.nvim": { "branch": "main", "commit": "04fc42b94305d94948c9c197f679336668af3292" }
|
||||
"yanky.nvim": { "branch": "main", "commit": "784188e0a7363e762e53140f39124d786aec0832" }
|
||||
}
|
||||
|
||||
@@ -1,15 +1,24 @@
|
||||
-- Also check plugins/neo-tree.lua for binds
|
||||
-- There are more binds in plugins/
|
||||
-- /neo-tree.lua
|
||||
-- /harpoon.lua
|
||||
vim.cmd([[
|
||||
" Terminal thingies
|
||||
tnoremap <C-h> <C-\\><C-o><C-w>h
|
||||
tnoremap <C-k> <C-\\><C-o><C-w>k
|
||||
tnoremap <C-l> <C-\\><C-o><C-w>l
|
||||
tnoremap <C-j> <C-\\><C-o><C-w>j
|
||||
|
||||
" Moving between windows
|
||||
" Window navigation
|
||||
nnoremap <C-h> <C-w>h
|
||||
nnoremap <C-j> <C-w>j
|
||||
nnoremap <C-k> <C-w>k
|
||||
nnoremap <C-l> <C-w>l
|
||||
nnoremap <C-j> <C-w>j
|
||||
|
||||
" Arrows navigation
|
||||
nnoremap <C-Left> <C-w>h
|
||||
nnoremap <C-Down> <C-w>j
|
||||
nnoremap <C-Up> <C-w>k
|
||||
nnoremap <C-Right> <C-w>l
|
||||
|
||||
" I don't remember
|
||||
nnoremap <C-Space>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
function number_switch(harpoon)
|
||||
for i = 1, 9, 1 do
|
||||
for i = 1, 10, 1 do
|
||||
vim.keymap.set("n", "<leader>" .. i, function()
|
||||
harpoon:list():select(i)
|
||||
end)
|
||||
@@ -15,18 +15,24 @@ return {
|
||||
|
||||
opts = {
|
||||
settings = {
|
||||
save_on_toggle = false,
|
||||
tabline = false,
|
||||
save_on_toggle = true,
|
||||
save_on_change = true,
|
||||
excluded_filetypes = { "harpoon" },
|
||||
excluded_filetypes = {
|
||||
"harpoon",
|
||||
"neo-tree",
|
||||
},
|
||||
},
|
||||
menu = {
|
||||
border = "rounded",
|
||||
width = vim.api.nvim_win_get_width(0) - 4,
|
||||
},
|
||||
},
|
||||
|
||||
config = function()
|
||||
local harpoon = require("harpoon")
|
||||
harpoon:setup()
|
||||
-- vim.g.harpoon_log_level = "fatal",
|
||||
config = function(_, opts)
|
||||
local harpoon = require("harpoon")
|
||||
harpoon:setup(opts)
|
||||
|
||||
local harpoon_extensions = require("harpoon.extensions")
|
||||
harpoon:extend(harpoon_extensions.builtins.highlight_current_file())
|
||||
@@ -34,6 +40,9 @@ return {
|
||||
vim.keymap.set("n", "<leader>h", function()
|
||||
harpoon.ui:toggle_quick_menu(harpoon:list())
|
||||
end)
|
||||
vim.keymap.set("n", "<leader>a", function()
|
||||
harpoon:list():add()
|
||||
end)
|
||||
vim.keymap.set("n", "<leader>H", function()
|
||||
harpoon:list():add()
|
||||
end)
|
||||
@@ -43,14 +52,14 @@ return {
|
||||
vim.keymap.set("n", "<leader>L", function()
|
||||
harpoon:list():clear()
|
||||
end)
|
||||
|
||||
vim.keymap.set("n", "<M-h>", function()
|
||||
|
||||
vim.keymap.set("n", "<S-h>", function()
|
||||
harpoon:list():prev()
|
||||
end)
|
||||
vim.keymap.set("n", "<M-l>", function()
|
||||
vim.keymap.set("n", "<S-l>", function()
|
||||
harpoon:list():next()
|
||||
end)
|
||||
|
||||
number_switch(harpoon)
|
||||
-- number_switch(harpoon)
|
||||
end,
|
||||
}
|
||||
|
||||
@@ -1,7 +1,25 @@
|
||||
return {
|
||||
"nvim-lualine/lualine.nvim",
|
||||
dependencies = { "nvim-tree/nvim-web-devicons" },
|
||||
dependencies = {
|
||||
"nvim-tree/nvim-web-devicons",
|
||||
"letieu/harpoon-lualine",
|
||||
},
|
||||
config = function()
|
||||
require("lualine").setup()
|
||||
require("lualine").setup({
|
||||
sections = {
|
||||
lualine_c = {
|
||||
{
|
||||
"harpoon2",
|
||||
icon = " Tabs: ",
|
||||
_separator = " ",
|
||||
|
||||
indicators = { "1", "2", "3", "4", "5", "6", "7", "8", "9", "10" },
|
||||
active_indicators = { "!", "@", "#", "$", "%%", "^", "&", "*", "-", "+" },
|
||||
|
||||
color_active = { fg = "#6aa0d2", gui = "bold" },
|
||||
},
|
||||
},
|
||||
},
|
||||
})
|
||||
end,
|
||||
}
|
||||
|
||||
@@ -23,6 +23,24 @@ return {
|
||||
["<Right>"] = "open",
|
||||
["<Left>"] = "close_node",
|
||||
["C"] = "convert_to_directory",
|
||||
["F"] = "toggle_hidden",
|
||||
["/"] = "fuzzy_search",
|
||||
},
|
||||
},
|
||||
filesystem = {
|
||||
filtered_items = {
|
||||
visible = false,
|
||||
show_hidden_count = true,
|
||||
hide_dotfiles = false,
|
||||
hide_gitignored = true,
|
||||
hide_by_name = {
|
||||
".git",
|
||||
".venv",
|
||||
".copier-answers.yml",
|
||||
".prettierrc.json",
|
||||
"package-lock.json",
|
||||
},
|
||||
never_show = {},
|
||||
},
|
||||
},
|
||||
commands = {
|
||||
|
||||
@@ -1,14 +0,0 @@
|
||||
return {
|
||||
-- "crispgm/nvim-tabline",
|
||||
-- config = true,
|
||||
-- require("tabline").setup({
|
||||
-- show_index = true,
|
||||
-- show_modify = true,
|
||||
-- show_icon = true,
|
||||
-- fnamemodify = ":t",
|
||||
-- modify_indicator = "*",
|
||||
-- no_name = "Без вымени",
|
||||
-- brackets = { "[", "]" },
|
||||
-- inactive_tab_max_length = 0,
|
||||
-- }),
|
||||
}
|
||||
@@ -1,26 +1,48 @@
|
||||
return {
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
config = function()
|
||||
require("nvim-treesitter.configs").setup({
|
||||
ensure_installed = {
|
||||
"python",
|
||||
"go",
|
||||
"kotlin",
|
||||
"dart",
|
||||
"lua",
|
||||
"bash",
|
||||
"json",
|
||||
"yaml",
|
||||
"markdown",
|
||||
},
|
||||
ts = require("nvim-treesitter")
|
||||
ts.setup()
|
||||
ts.install({
|
||||
"python",
|
||||
"go",
|
||||
"kotlin",
|
||||
"dart",
|
||||
"lua",
|
||||
"bash",
|
||||
"json",
|
||||
"yaml",
|
||||
"markdown",
|
||||
"vim",
|
||||
"vimdoc",
|
||||
})
|
||||
vim.treesitter.language.register("html", "gotmpl")
|
||||
vim.api.nvim_create_autocmd("FileType", {
|
||||
callback = function(args)
|
||||
local lang = vim.treesitter.language.get_lang(args.match)
|
||||
if vim.list_contains(ts.get_available(), lang) then
|
||||
if not vim.list_contains(ts.get_installed(), lang) then
|
||||
ts.install(lang):wait()
|
||||
end
|
||||
|
||||
sync_install = false,
|
||||
auto_install = true,
|
||||
vim.treesitter.start(args.buf)
|
||||
end
|
||||
end,
|
||||
desc = "enable nvim-treesitter and install parser if not installed",
|
||||
})
|
||||
|
||||
highlight = {
|
||||
enable = true,
|
||||
additional_vim_regex_highlighting = false,
|
||||
},
|
||||
})
|
||||
-- require("nvim-treesitter").setup()
|
||||
-- {
|
||||
-- ensure_installed = {
|
||||
-- },
|
||||
--
|
||||
-- sync_install = false,
|
||||
-- auto_install = true,
|
||||
--
|
||||
-- highlight = {
|
||||
-- enable = true,
|
||||
-- additional_vim_regex_highlighting = false,
|
||||
-- },
|
||||
-- })
|
||||
end,
|
||||
}
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
-- clipboard.lua will be edited by the bash command
|
||||
-- it will be replaced with one of the files from templates/clipboard/ directory
|
||||
vim.o.clipboard = "unnamedplus"
|
||||
@@ -0,0 +1,12 @@
|
||||
-- clipboard.lua will be edited by the bash command
|
||||
-- it will be replaced with one of the files from templates/clipboard/ directory
|
||||
vim.o.clipboard = "unnamedplus"
|
||||
|
||||
vim.api.nvim_create_autocmd("TextYankPost", {
|
||||
callback = function()
|
||||
local copy_to_unnamedplus = require("vim.ui.clipboard.osc52").copy("+")
|
||||
copy_to_unnamedplus(vim.v.event.regcontents)
|
||||
local copy_to_unnamed = require("vim.ui.clipboard.osc52").copy("*")
|
||||
copy_to_unnamed(vim.v.event.regcontents)
|
||||
end,
|
||||
})
|
||||
Reference in New Issue
Block a user