diff options
| author | Chris <[email protected]> | 2021-04-03 15:59:03 -0400 | 
|---|---|---|
| committer | Chris <[email protected]> | 2021-04-03 15:59:03 -0400 | 
| commit | 43f067e0b4dbb0f60e108ec35a162895afdea807 (patch) | |
| tree | d4c1a2ca99cff4af5a3dddae3212aa9b10604983 | |
| parent | 12c2b7dbad5dcd3b25d6e3cde62bd55eb7fb8df3 (diff) | |
more options
| -rw-r--r-- | lua/nv-galaxyline/init.lua | 3 | ||||
| -rw-r--r-- | lua/nv-globals.lua | 27 | ||||
| -rw-r--r-- | lua/nv-treesitter/init.lua | 10 | ||||
| -rw-r--r-- | nv-settings.lua | 12 | 
4 files changed, 32 insertions, 20 deletions
| diff --git a/lua/nv-galaxyline/init.lua b/lua/nv-galaxyline/init.lua index 0f562b5b..f9ac859b 100644 --- a/lua/nv-galaxyline/init.lua +++ b/lua/nv-galaxyline/init.lua @@ -2,7 +2,8 @@ local gl = require('galaxyline')  -- get my theme in galaxyline repo  -- local colors = require('galaxyline.theme').default  local colors = { -    bg = '#2E2E2E', +    -- bg = '#2E2E2E', +    bg = '#292D38',      yellow = '#DCDCAA',      dark_yellow = '#D7BA7D',      cyan = '#4EC9B0', diff --git a/lua/nv-globals.lua b/lua/nv-globals.lua index 212415b4..bae0e9db 100644 --- a/lua/nv-globals.lua +++ b/lua/nv-globals.lua @@ -3,14 +3,21 @@ O = {      auto_complete = true,      colorscheme = 'nvcode',      hidden_files = true, -    wrap_lines = true, +    wrap_lines = false,      number = true,      relative_number = true,      shell = 'bash', -    database = { -        save_location = '~/.config/nvcode_db', -        auto_execute = 1 + +    -- @usage pass a table with your desired languages +    treesitter = { +        ensure_installed = "all", +        ignore_install = {"haskell"}, +        highlight = {enabled = true}, +        playground = {enabled = true}, +        rainbow = {enabled = false}      }, + +    database = {save_location = '~/.config/nvcode_db', auto_execute = 1},      python = {          linter = '',          -- @usage can be 'yapf', 'black' @@ -19,9 +26,7 @@ O = {          isort = false,          diagnostics = {virtual_text = true, signs = true, underline = true}      }, -    dart = { -        sdk_path = '/usr/lib/dart/bin/snapshots/analysis_server.dart.snapshot' -    }, +    dart = {sdk_path = '/usr/lib/dart/bin/snapshots/analysis_server.dart.snapshot'},      lua = {          -- @usage can be 'lua-format'          formatter = '', @@ -50,12 +55,8 @@ O = {          autoformat = false,          diagnostics = {virtual_text = true, signs = true, underline = true}      }, -    tailwindls = { -        filetypes = {'html', 'css', 'scss', 'javascript', 'javascriptreact', 'typescript', 'typescriptreact'} -    }, -    clang = { -        diagnostics = {virtual_text = true, signs = true, underline = true} -    } +    tailwindls = {filetypes = {'html', 'css', 'scss', 'javascript', 'javascriptreact', 'typescript', 'typescriptreact'}}, +    clang = {diagnostics = {virtual_text = true, signs = true, underline = true}}      -- css = {formatter = '', autoformat = false, virtual_text = true},      -- json = {formatter = '', autoformat = false, virtual_text = true}  } diff --git a/lua/nv-treesitter/init.lua b/lua/nv-treesitter/init.lua index 0dee10d8..f846a917 100644 --- a/lua/nv-treesitter/init.lua +++ b/lua/nv-treesitter/init.lua @@ -1,20 +1,20 @@  require'nvim-treesitter.configs'.setup { -    ensure_installed = "all", -- one of "all", "maintained" (parsers with maintainers), or a list of languages +    ensure_installed = O.treesitter.ensure_installed, -- one of "all", "maintained" (parsers with maintainers), or a list of languages      -- TODO seems to be broken -    ignore_install = {"haskell"}, +    ignore_install = O.treesitter.ignore_install,      highlight = { -        enable = true -- false will disable the whole extension +        enable = O.treesitter.highlight.enabled -- false will disable the whole extension      },      -- indent = {enable = true, disable = {"python", "html", "javascript"}},      indent = {enable = {"javascriptreact"}},      playground = { -        enable = true, +        enable = O.treesitter.playground.enabled,          disable = {},          updatetime = 25, -- Debounced time for highlighting nodes in the playground from source code          persist_queries = false -- Whether the query persists across vim sessions      },      autotag = {enable = true}, -    rainbow = {enable = true}, +    rainbow = {enable = O.treesitter.rainbow.enabled},      context_commentstring = {enable = true, config = {javascriptreact = {style_element = '{/*%s*/}'}}}      -- refactor = {highlight_definitions = {enable = true}}  } diff --git a/nv-settings.lua b/nv-settings.lua index 0c150dc3..25b61e34 100644 --- a/nv-settings.lua +++ b/nv-settings.lua @@ -5,12 +5,22 @@ Formatters and linters should be  filled in as strings with either  a global executable or a path to  an executable -]] -- general +]]  + +-- general  O.auto_complete = true  O.colorscheme = 'nvcode'  O.auto_close_tree = 0  O.wrap_lines = false +-- @usage pass a table with your desired languages +--O.treesitter.ensure_installed = "all" +--O.treesitter.ignore_install = {"haskell"} +--O.treesitter.highlight.enabled = true +--O.treesitter.playground.enabled = true +--O.treesitter.rainbow.enabled = false + +  O.clang.diagnostics.virtual_text = false  O.clang.diagnostics.signs = false  O.clang.diagnostics.underline = false | 
