diff --git a/lua/config.lua b/lua/config.lua index fb1fe7d..23fffec 100644 --- a/lua/config.lua +++ b/lua/config.lua @@ -74,7 +74,7 @@ augroup END --------------- local pyenv_root = vim.env.PYENV_ROOT if pyenv_root ~= nil then - g.python3_host_prog = pyenv_root .. '/shims/python3' + g.python3_host_prog = pyenv_root .. "/shims/python3" else g.python3_host_prog = "/usr/bin/python3" end @@ -89,8 +89,8 @@ end -- Lua require("onedark").setup({ - style = "darker", - toggle_style_key = "", + style = "darker", + toggle_style_key = "", }) require("onedark").load() @@ -109,11 +109,19 @@ g.bracey_refresh_on_save = true -- TREESITTER CONFIG -- ----------------------- require("nvim-treesitter.configs").setup({ - ensure_installed = "all", - highlight = { - enable = true, - disable = { "typescript", "tsx", "html", "javascript" }, - }, + ensure_installed = "all", + highlight = { + enable = true, + disable = { "typescript", "tsx", "html", "javascript" }, + }, + rainbow = { + enable = true, + -- disable = { "jsx", "cpp" }, list of languages you want to disable the plugin for + extended_mode = true, -- Also highlight non-bracket delimiters like html tags, boolean or table: lang -> boolean + max_file_lines = nil, -- Do not enable for files with more than n lines, int + -- colors = {}, -- table of hex strings + -- termcolors = {} -- table of colour name strings + }, }) ----------------------- @@ -132,79 +140,79 @@ g.github_hide_inactive_statusline = false ------------- 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 = {}, + 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 = {}, }) ------------- @@ -214,20 +222,20 @@ 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" }, - }, + 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 {}' ", } ---------------------- @@ -261,9 +269,9 @@ require("fzf").default_options = { opt.list = true require("indent_blankline").setup({ - space_char_blankline = " ", - show_current_context = true, - show_current_context_start = true, + space_char_blankline = " ", + show_current_context = true, + show_current_context_start = true, }) -- PETOBENS/POET-V -- diff --git a/lua/plugins.lua b/lua/plugins.lua index 4ce8bf5..d9ef4d6 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -62,6 +62,7 @@ require("packer").startup(function() -- LSP use("hrsh7th/nvim-cmp") -- Autocompletion plugin --use "saadparwaiz1/cmp_luasnip" -- Snippets source for nvim-cmp + use("p00f/nvim-ts-rainbow") use({ "nvim-treesitter/nvim-treesitter", run = ":TSUpdate" }) use("neovim/nvim-lspconfig") -- Collection of configurations for built-in LSP client use("williamboman/nvim-lsp-installer")