diff --git a/home/colours.nix b/home/colours.nix index c633e323..e4ad5cfc 100644 --- a/home/colours.nix +++ b/home/colours.nix @@ -304,8 +304,18 @@ let neovim-theme-blocks = { solarized = '' set background=light - colorscheme NeoSolarized - highlight Cursor guifg=${themes.solarized.cursor.cursor} guibg=${themes.solarized.cursor.text} + + let g:solarized_disable_background = v:true + let g:solarized_italic_comments = v:false + let g:solarized_italic_keywords = v:false + let g:solarized_italic_functions = v:true + let g:solarized_italic_variables = v:false + let g:solarized_contrast = v:false + let g:solarized_borders = v:true + + colorscheme solarized + highlight Cursor guifg=${current-theme.cursor.cursor} guibg=${current-theme.cursor.text} + highlight TreesitterContext guibg=${current-theme.normal.white} ''; github-light = '' set background=light diff --git a/home/neovim.nix b/home/neovim.nix index 13bc8f88..91d3b4fd 100644 --- a/home/neovim.nix +++ b/home/neovim.nix @@ -42,7 +42,6 @@ papercolor-theme nvim-base16 aerial-nvim - NeoSolarized # has native plugin so requires nix telescope-fzf-native-nvim diff --git a/home/nvim/lua/lualineconfig.lua b/home/nvim/lua/lualineconfig.lua index 819033af..8dca7f84 100644 --- a/home/nvim/lua/lualineconfig.lua +++ b/home/nvim/lua/lualineconfig.lua @@ -10,7 +10,7 @@ local lualine_c = { lualine.setup({ options = { icons_enabled = true, - theme = 'auto', + theme = 'solarized', component_separators = { left = '', right = '' }, section_separators = { left = '', right = '' }, disabled_filetypes = {}, diff --git a/home/nvim/lua/plugins.lua b/home/nvim/lua/plugins.lua index d5e7676b..72cda74f 100644 --- a/home/nvim/lua/plugins.lua +++ b/home/nvim/lua/plugins.lua @@ -13,6 +13,7 @@ require('packer').startup({ use 'christoomey/vim-tmux-runner' use 'christoomey/vim-conflicted' use 'projekt0n/github-nvim-theme' + use 'shaunsingh/solarized.nvim' -- language plugins use 'lepture/vim-velocity'