From 0d785cd9f3a7903c84846cee64e3c46ebb56ff64 Mon Sep 17 00:00:00 2001 From: David Luevano Alvarado Date: Mon, 21 Aug 2023 14:35:06 -0600 Subject: add folding, change colorscheme --- lua/config/set.lua | 6 ++++++ lua/plugins/dracula.lua | 9 --------- lua/plugins/lualine.lua | 2 +- lua/plugins/theme.lua | 19 +++++++++++++++++++ lua/plugins/treesitter.lua | 3 ++- 5 files changed, 28 insertions(+), 11 deletions(-) delete mode 100644 lua/plugins/dracula.lua create mode 100644 lua/plugins/theme.lua diff --git a/lua/config/set.lua b/lua/config/set.lua index 866eba4..1f4d774 100644 --- a/lua/config/set.lua +++ b/lua/config/set.lua @@ -32,6 +32,12 @@ vim.o.completeopt = 'menuone,noselect' vim.o.termguicolors = true +-- Code folding, depends on treesitter +vim.foldmethod='expr' +vim.opt.foldexpr='nvim_treesitter#foldexpr()' +-- Disable folding at startup. +vim.nofoldenable=true + -- Highlight on yank local highlight_group = vim.api.nvim_create_augroup('YankHighlight', { clear = true }) vim.api.nvim_create_autocmd('TextYankPost', { diff --git a/lua/plugins/dracula.lua b/lua/plugins/dracula.lua deleted file mode 100644 index b58ba34..0000000 --- a/lua/plugins/dracula.lua +++ /dev/null @@ -1,9 +0,0 @@ -return { - 'Mofiqul/dracula.nvim', - lazy = false, - priority = 1000, - opts = {}, - config = function() - vim.cmd.colorscheme 'dracula' - end, -} diff --git a/lua/plugins/lualine.lua b/lua/plugins/lualine.lua index a0b0a92..57edf97 100644 --- a/lua/plugins/lualine.lua +++ b/lua/plugins/lualine.lua @@ -5,7 +5,7 @@ return { }, opts = { options = { - theme = 'dracula', + theme = 'nord', icons_enabled = true, component_separators = { left = '', right = '' }, section_separators = { left = '', right = '' }, diff --git a/lua/plugins/theme.lua b/lua/plugins/theme.lua new file mode 100644 index 0000000..cf01947 --- /dev/null +++ b/lua/plugins/theme.lua @@ -0,0 +1,19 @@ +return { + 'shaunsingh/nord.nvim', + lazy = false, + priority = 1000, + opts = {}, + config = function() + vim.g.nord_contrast = true + vim.g.nord_borders = true + vim.g.nord_disable_background = false + vim.g.nord_cursorline_transparent = false + vim.g.nord_enable_sidebar_background = false + vim.g.nord_italic = false + vim.g.nord_uniform_diff_background = true + vim.g.nord_bold = false + + require('nord').set() + -- vim.cmd.colorscheme = 'nord' + end, +} diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index d0bc8c5..8ad7fb1 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -20,7 +20,8 @@ return { 'html', 'markdown', 'markdown_inline', - 'php' + 'php', + 'sql' }, auto_install = false, highlight = { enable = true }, -- cgit v1.2.3-54-g00ecf