Compare commits

..

No commits in common. "493a56fae55c166d23eac1b224561a35d6b6f804" and "7b1b7e9403e11ace39c997b17172fad6221ae8d6" have entirely different histories.

6 changed files with 34 additions and 42 deletions

View file

@ -8,12 +8,6 @@ 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

View file

@ -1,4 +1,5 @@
local servers = { local servers = {
"sumneko_lua",
"pyright", "pyright",
"jsonls", "jsonls",
} }
@ -40,5 +41,6 @@ require('mason-lspconfig').setup_handlers({
end end
lspconfig[server].setup(opts) lspconfig[server].setup(opts)
end, end,
}) })

View file

@ -0,0 +1,16 @@
return {
settings = {
Lua = {
diagnostics = {
globals = { "vim" },
},
workspace = {
library = {
[vim.fn.expand("$VIMRUNTIME/lua")] = true,
[vim.fn.stdpath("config") .. "/lua"] = true,
},
},
},
},
}

View file

@ -1,37 +1,18 @@
local ts_status_ok, treeconfig = pcall(require, "nvim-treesitter.configs") local ts_status_ok, treeconfig = pcall(require, "nvim-treesitter.configs")
if ts_status_ok then if not ts_status_ok then
treeconfig.setup { return
ensure_installed = "all",
sync_install = false,
ignore_install = { "" }, -- List of parsers to ignore installing
highlight = {
enable = true, -- false will disable the whole extension
disable = { "" }, -- list of language that will be disabled
additional_vim_regex_highlighting = true,
},
indent = { enable = true },
}
-- Coloschemes that support TreeSitter:
-- https://github.com/nvim-treesitter/nvim-treesitter/wiki/Colorschemes
end end
treeconfig.setup {
ensure_installed = "all",
sync_install = false,
ignore_install = { "" }, -- List of parsers to ignore installing
highlight = {
enable = true, -- false will disable the whole extension
disable = { "" }, -- list of language that will be disabled
additional_vim_regex_highlighting = true,
},
local ctx_status_ok, ctxconfig = pcall(require, "treesitter-context") indent = { enable = true },
}
if ctx_status_ok then -- Coloschemes that support TreeSitter:
ctxconfig.setup { -- https://github.com/nvim-treesitter/nvim-treesitter/wiki/Colorschemes
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

View file

@ -14,7 +14,6 @@ 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

View file

@ -77,7 +77,7 @@
name: gh_release_bin name: gh_release_bin
vars: vars:
name: lsd name: lsd
repo: lsd-rs/lsd repo: Peltoche/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"