update: hypr&neovim improvements, yazi plugins, waybar tweaking before bigger update
This commit is contained in:
@@ -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