From 122d0b229798c39438be8da401627a0c9248a38d Mon Sep 17 00:00:00 2001 From: TheK4n Date: Tue, 14 Mar 2023 21:58:02 +0300 Subject: [PATCH] nvim: change colorscheme, fix treesitter --- home/user/.config/nvim/after/plugin/colorscheme.lua | 8 ++++++-- home/user/.config/nvim/after/plugin/nvim-treesitter.lua | 5 ++--- home/user/.config/nvim/lua/base/lazy.lua | 3 +++ home/user/.config/nvim/lua/base/options.lua | 4 ++-- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/home/user/.config/nvim/after/plugin/colorscheme.lua b/home/user/.config/nvim/after/plugin/colorscheme.lua index d06496e..c9d80f8 100644 --- a/home/user/.config/nvim/after/plugin/colorscheme.lua +++ b/home/user/.config/nvim/after/plugin/colorscheme.lua @@ -1,5 +1,9 @@ -local status, _ = pcall(require, "gruvbox") +local status, colorscheme = pcall(require, "nightfox") if (not status) then return end -vim.cmd.colorscheme("gruvbox") +colorscheme.compile() + +colorscheme.setup() + +vim.cmd.colorscheme("nightfox") diff --git a/home/user/.config/nvim/after/plugin/nvim-treesitter.lua b/home/user/.config/nvim/after/plugin/nvim-treesitter.lua index bf0c762..3905e55 100644 --- a/home/user/.config/nvim/after/plugin/nvim-treesitter.lua +++ b/home/user/.config/nvim/after/plugin/nvim-treesitter.lua @@ -1,10 +1,9 @@ -local status, nvim_treesitter = pcall(require, "nvim-treesitter") +local status, nvim_treesitter = pcall(require, "nvim-treesitter.configs") if (not status) then return end nvim_treesitter.setup { - ensure_installed = {"python", "lua", "vim", "html", "rust"}, - sync_install = true, + ensure_installed = {"python", "lua", "vim", "html", "rust", "markdown"}, auto_install = true, highlight = { diff --git a/home/user/.config/nvim/lua/base/lazy.lua b/home/user/.config/nvim/lua/base/lazy.lua index 9f52a76..0f5534e 100644 --- a/home/user/.config/nvim/lua/base/lazy.lua +++ b/home/user/.config/nvim/lua/base/lazy.lua @@ -21,6 +21,9 @@ local plugins = { 'nvim-lualine/lualine.nvim', dependencies = { 'kyazdani42/nvim-web-devicons' } }, + { + 'EdenEast/nightfox.nvim' + }, { 'ellisonleao/gruvbox.nvim' -- colorscheme }, diff --git a/home/user/.config/nvim/lua/base/options.lua b/home/user/.config/nvim/lua/base/options.lua index 15550bc..d206aa9 100644 --- a/home/user/.config/nvim/lua/base/options.lua +++ b/home/user/.config/nvim/lua/base/options.lua @@ -15,7 +15,7 @@ opt.clipboard:append { 'unnamedplus' } opt.shortmess:append { s = true, I = true} -- disable startup message -opt.shell = 'bash' +opt.shell = 'zsh' opt.ttimeoutlen = 50 opt.timeoutlen = 500 @@ -65,7 +65,7 @@ opt.scrolloff = 7 opt.termguicolors = true -vim.cmd [[highlight IndentBlanklineIndent1 guifg=#4E5754 gui=nocombine]] +vim.cmd [[highlight IndentBlanklineIndent1 guifg=#464e60 gui=nocombine]] opt.background = 'dark'