mirror of
https://gitlab.com/sagidayan/linux-config.git
synced 2024-11-21 23:05:25 +00:00
Nevim and tmux updates
Signed-off-by: Sagi Dayan <sagidayan@gmail.com>
This commit is contained in:
parent
7b1b7e9403
commit
8aec9120cc
6 changed files with 43 additions and 35 deletions
|
@ -8,6 +8,12 @@ if tree_status_ok then
|
||||||
tree.setup()
|
tree.setup()
|
||||||
end
|
end
|
||||||
|
|
||||||
|
-- Symbols outline
|
||||||
|
local symbols_status_ok, symbols = pcall(require, "symbols-outline")
|
||||||
|
if symbols_status_ok then
|
||||||
|
symbols.setup()
|
||||||
|
end
|
||||||
|
|
||||||
-- Git signs (Gutter)
|
-- Git signs (Gutter)
|
||||||
local gitsigns_status_ok, gitsigns = pcall(require, "gitsigns")
|
local gitsigns_status_ok, gitsigns = pcall(require, "gitsigns")
|
||||||
if gitsigns_status_ok then
|
if gitsigns_status_ok then
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
local servers = {
|
local servers = {
|
||||||
"sumneko_lua",
|
|
||||||
"pyright",
|
"pyright",
|
||||||
"jsonls",
|
"jsonls",
|
||||||
}
|
}
|
||||||
|
@ -41,6 +40,5 @@ require('mason-lspconfig').setup_handlers({
|
||||||
end
|
end
|
||||||
|
|
||||||
lspconfig[server].setup(opts)
|
lspconfig[server].setup(opts)
|
||||||
|
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
|
|
|
@ -1,16 +0,0 @@
|
||||||
return {
|
|
||||||
settings = {
|
|
||||||
|
|
||||||
Lua = {
|
|
||||||
diagnostics = {
|
|
||||||
globals = { "vim" },
|
|
||||||
},
|
|
||||||
workspace = {
|
|
||||||
library = {
|
|
||||||
[vim.fn.expand("$VIMRUNTIME/lua")] = true,
|
|
||||||
[vim.fn.stdpath("config") .. "/lua"] = true,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
|
@ -1,7 +1,5 @@
|
||||||
local ts_status_ok, treeconfig = pcall(require, "nvim-treesitter.configs")
|
local ts_status_ok, treeconfig = pcall(require, "nvim-treesitter.configs")
|
||||||
if not ts_status_ok then
|
if ts_status_ok then
|
||||||
return
|
|
||||||
end
|
|
||||||
treeconfig.setup {
|
treeconfig.setup {
|
||||||
ensure_installed = "all",
|
ensure_installed = "all",
|
||||||
sync_install = false,
|
sync_install = false,
|
||||||
|
@ -16,3 +14,24 @@ treeconfig.setup {
|
||||||
}
|
}
|
||||||
-- Coloschemes that support TreeSitter:
|
-- Coloschemes that support TreeSitter:
|
||||||
-- https://github.com/nvim-treesitter/nvim-treesitter/wiki/Colorschemes
|
-- https://github.com/nvim-treesitter/nvim-treesitter/wiki/Colorschemes
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
|
local ctx_status_ok, ctxconfig = pcall(require, "treesitter-context")
|
||||||
|
|
||||||
|
if ctx_status_ok then
|
||||||
|
ctxconfig.setup {
|
||||||
|
enable = true, -- Enable this plugin (Can be enabled/disabled later via commands)
|
||||||
|
max_lines = 0, -- How many lines the window should span. Values <= 0 mean no limit.
|
||||||
|
min_window_height = 0, -- Minimum editor window height to enable context. Values <= 0 mean no limit.
|
||||||
|
line_numbers = true,
|
||||||
|
multiline_threshold = 20, -- Maximum number of lines to collapse for a single context line
|
||||||
|
trim_scope = 'outer', -- Which context lines to discard if `max_lines` is exceeded. Choices: 'inner', 'outer'
|
||||||
|
mode = 'cursor', -- Line used to calculate context. Choices: 'cursor', 'topline'
|
||||||
|
-- Separator between context and content. Should be a single character string, like '-'.
|
||||||
|
-- When separator is set, the context will only show up when there are at least 2 lines above cursorline.
|
||||||
|
separator = nil,
|
||||||
|
zindex = 20, -- The Z-index of the context window
|
||||||
|
on_attach = nil, -- (fun(buf: integer): boolean) return false to disable attaching
|
||||||
|
}
|
||||||
|
end
|
||||||
|
|
|
@ -14,6 +14,7 @@ alias ls='lsd'
|
||||||
alias f='printf "\033c"'
|
alias f='printf "\033c"'
|
||||||
alias top=btm
|
alias top=btm
|
||||||
alias vim=nvim
|
alias vim=nvim
|
||||||
|
alias v=nvim
|
||||||
|
|
||||||
alias t=tmux
|
alias t=tmux
|
||||||
|
|
||||||
|
|
|
@ -77,7 +77,7 @@
|
||||||
name: gh_release_bin
|
name: gh_release_bin
|
||||||
vars:
|
vars:
|
||||||
name: lsd
|
name: lsd
|
||||||
repo: Peltoche/lsd
|
repo: lsd-rs/lsd
|
||||||
bin_path: "/lsd-*/lsd"
|
bin_path: "/lsd-*/lsd"
|
||||||
man_path: "/lsd-*/lsd.1"
|
man_path: "/lsd-*/lsd.1"
|
||||||
autocomplete_path: "/lsd-*/autocomplete/lsd.bash-completion"
|
autocomplete_path: "/lsd-*/autocomplete/lsd.bash-completion"
|
||||||
|
|
Loading…
Reference in a new issue