guy176251/nvim-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changes, idk

Browse Source
This commit is contained in:
long
2022-05-18 06:15:59 -05:00
parent 2420aee32b
commit 39cd83f557
21 changed files with 680 additions and 662 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lua/config.lua
+119 -107
View File
@@ -1,7 +1,10 @@
-- env file highlighting
vim.cmd [[au BufRead,BufNewFile .env.* set filetype=sh]]
vim.cmd([[au BufRead,BufNewFile .env.* set filetype=sh]])
-- Dockerfile file highlighting
vim.cmd [[au BufRead,BufNewFile Dockerfile.* set filetype=dockerfile]]
vim.cmd([[au BufRead,BufNewFile Dockerfile.* set filetype=dockerfile]])
vim.cmd([[au BufWrite * normal zx]])
-- jinja highlighting
vim.cmd([[au BufRead,BufNewFile *.jinja set filetype=html]])
local opt = vim.opt -- to set options
local fn = vim.fn
@@ -56,7 +59,7 @@ opt.foldmethod = "indent"
-----------------------------------------------------
-- DISABLE HIGHLIGHT OUTSIDE OF SEARCH AND REPLACE --
-----------------------------------------------------
vim.cmd [[
vim.cmd([[
" Enable highlighting all the matches in incsearch mode
" But don't enable hlsearch always
augroup vimrc-incsearch-highlight
@@ -64,12 +67,17 @@ augroup vimrc-incsearch-highlight
autocmd CmdlineEnter [/\?:] :set hlsearch
autocmd CmdlineLeave [/\?:] :set nohlsearch
augroup END
]]
]])
---------------
-- PROVIDERS --
---------------
g.python3_host_prog = "/usr/bin/python3"
local pyenv_root = vim.env.PYENV_ROOT
if pyenv_root ~= nil then
g.python3_host_prog = pyenv_root .. '/shims/python3'
else
g.python3_host_prog = "/usr/bin/python3"
end
------------------
-- ONEDARK.NVIM --
@@ -80,10 +88,10 @@ g.python3_host_prog = "/usr/bin/python3"
--g.onedark_darker_diagnostics = false
-- Lua
require("onedark").setup {
style = "darker",
toggle_style_key = "<nop>"
}
require("onedark").setup({
style = "darker",
toggle_style_key = "<nop>",
})
require("onedark").load()
----------------
@@ -100,13 +108,13 @@ g.bracey_refresh_on_save = true
-----------------------
-- TREESITTER CONFIG --
-----------------------
require("nvim-treesitter.configs").setup {
ensure_installed = "maintained",
highlight = {
enable = true,
disable = {"typescript", "tsx", "html", "javascript"}
}
}
require("nvim-treesitter.configs").setup({
ensure_installed = "all",
highlight = {
enable = true,
disable = { "typescript", "tsx", "html", "javascript" },
},
})
-----------------------
-- GITHUB NVIM THEME --
@@ -123,79 +131,81 @@ g.github_hide_inactive_statusline = false
-- LUALINE --
-------------
require("lualine").setup {
options = {theme = "onedark", icons_enabled = true},
sections = {
lualine_a = {"mode"},
lualine_b = {
"FugitiveHead"
},
lualine_c = {"filename"},
lualine_x = {
"encoding",
"fileformat",
"filetype",
[[string.format("%d Lines", vim.fn.line('$'))]],
{
"diagnostics",
sources = {"nvim_diagnostic", "ale"}
}
},
lualine_y = {
"progress"
},
lualine_z = {"location"}
},
inactive_sections = {
lualine_a = {},
lualine_b = {},
lualine_c = {"filename"},
lualine_x = {"location"},
lualine_y = {},
lualine_z = {}
},
tabline = {
lualine_a = {
{
"buffers",
show_filename_only = false, -- shows shortened relative path when false
show_modified_status = true, -- shows indicator then bufder is modified
max_length = vim.o.columns * 5 / 7, -- maximum width of buffers component
filetype_names = {
TelescopePrompt = "Telescope",
dashboard = "Dashboard",
packer = "Packer",
fzf = "FZF",
alpha = "Alpha",
["lsp-installer"] = "LSP Installer"
}, -- shows specific buffer name for that filetype ( { `filetype` = `buffer_name`, ... } )
buffers_color = {
active = nil, -- color for active buffer
inactive = nil -- color for inactive buffer
}
}
},
lualine_b = {},
lualine_c = {},
lualine_x = {},
lualine_y = {},
lualine_z = {
{
[[string.format("Tab %d/%d", vim.fn.tabpagenr(), vim.fn.tabpagenr('$'))]],
cond = function()
return fn.tabpagenr("$") > 1
end
},
{
[[harpoon_status()]],
cond = function()
return require("harpoon.mark").get_length() > 0
end
}
}
},
extensions = {}
}
require("lualine").setup({
options = { theme = "onedark", icons_enabled = true },
sections = {
lualine_a = { "mode" },
lualine_b = {
"FugitiveHead",
},
lualine_c = { "filename" },
lualine_x = {
"encoding",
"fileformat",
"filetype",
[[string.format("%d Lines", vim.fn.line('$'))]],
{
"diagnostics",
sources = { "nvim_diagnostic", "ale" },
},
},
lualine_y = {
"progress",
},
lualine_z = { "location" },
},
inactive_sections = {
lualine_a = {},
lualine_b = {},
lualine_c = { "filename" },
lualine_x = { "location" },
lualine_y = {},
lualine_z = {},
},
tabline = {
lualine_a = {
{
"buffers",
show_filename_only = false, -- shows shortened relative path when false
show_modified_status = true, -- shows indicator then bufder is modified
max_length = function ()
return vim.o.columns * 5 / 6
end, -- maximum width of buffers component
filetype_names = {
TelescopePrompt = "Telescope",
dashboard = "Dashboard",
packer = "Packer",
fzf = "FZF",
alpha = "Alpha",
["lsp-installer"] = "LSP Installer",
}, -- shows specific buffer name for that filetype ( { `filetype` = `buffer_name`, ... } )
buffers_color = {
active = nil, -- color for active buffer
inactive = nil, -- color for inactive buffer
},
},
},
lualine_b = {},
lualine_c = {},
lualine_x = {},
lualine_y = {},
lualine_z = {
{
[[string.format("Tab %d/%d", vim.fn.tabpagenr(), vim.fn.tabpagenr('$'))]],
cond = function()
return fn.tabpagenr("$") > 1
end,
},
{
[[harpoon_status()]],
cond = function()
return require("harpoon.mark").get_length() > 0
end,
},
},
},
extensions = {},
})
-------------
-- HARPOON --
@@ -203,23 +213,21 @@ require("lualine").setup {
--Here is the set of global settings and their default values.
require("harpoon").setup(
{
global_settings = {
save_on_toggle = false,
save_on_change = true,
enter_on_sendcmd = false,
tmux_autoclose_windows = false,
excluded_filetypes = {"harpoon"}
}
}
)
require("harpoon").setup({
global_settings = {
save_on_toggle = false,
save_on_change = true,
enter_on_sendcmd = false,
tmux_autoclose_windows = false,
excluded_filetypes = { "harpoon" },
},
})
--------------
-- NVIM FZF --
--------------
require("fzf").default_options = {
fzf_cli_args = " --height 100% --preview='bat --color=always --style=header,grid --line-range :300 {}' "
fzf_cli_args = " --height 100% --preview='bat --color=always --style=header,grid --line-range :300 {}' ",
}
----------------------
@@ -250,10 +258,14 @@ require("fzf").default_options = {
--}
--vim.opt.listchars:append("eol:↴")
--vim.opt.listchars:append("space:⋅")
vim.opt.list = true
opt.list = true
require("indent_blankline").setup {
space_char_blankline = " ",
show_current_context = true,
show_current_context_start = true
}
require("indent_blankline").setup({
space_char_blankline = " ",
show_current_context = true,
show_current_context_start = true,
})
-- PETOBENS/POET-V --
g.poetv_executables = { "poetry" }
g.poetv_auto_activate = 1