add newpaper fix fillchars.

4 files changed, 61 insertions, 73 deletions

diff --git a/lua/config/options.lua b/lua/config/options.lua
index 5e39088..b2dc166 100644
--- a/lua/config/options.lua
+++ b/lua/config/options.lua
@@ -19,9 +19,7 @@ return {
 			vim.opt.undolevels = 1000
 
 			vim.opt.relativenumber = true
-			vim.opt.fillchars = 'eob: '
-			vim.opt.fillchars = 'fold: '
-			vim.opt.fillchars = 'vert: '
+			vim.opt.fillchars = 'eob: ,fold: ,vert: '
 			vim.opt.cmdheight = 0
 			vim.cmd [[ autocmd RecordingEnter * set cmdheight=1 ]]
 			vim.cmd [[ autocmd RecordingLeave * set cmdheight=0 ]]
diff --git a/lua/lualine/theme.lua b/lua/lualine/theme.lua
deleted file mode 100644
index 91c58a4..0000000
--- a/lua/lualine/theme.lua
+++ /dev/null
@@ -1,34 +0,0 @@
-local colors = require('monokai-pro.colorscheme')
-
-local monokai_pro = {}
-
-monokai_pro.normal = {
-	a = { bg = colors.base.green, fg = colors.base.black, gui = 'bold' },
-	b = { bg = colors.editor.background, fg = colors.base.green },
-	c = { bg = colors.editor.background, fg = colors.editor.background },
-	x = { bg = colors.editor.background, fg = colors.editor.background },
-	y = { bg = colors.editor.background, fg = colors.editor.background },
-	z = { bg = colors.base.red, fg = colors.base.black, gui = 'bold' },
-}
-
-monokai_pro.insert = {
-	a = { bg = colors.base.cyan, fg = colors.base.black, gui = 'bold' },
-	b = { bg = colors.editor.background, fg = colors.base.cyan },
-}
-
-monokai_pro.visual = {
-	a = { bg = colors.base.magenta, fg = colors.base.black, gui = 'bold' },
-	b = { bg = colors.editor.background, fg = colors.base.magenta },
-}
-
-monokai_pro.replace = {
-	a = { bg = colors.base.yellow, fg = colors.base.black, gui = 'bold' },
-	b = { bg = colors.editor.background, fg = colors.base.yellow },
-}
-
-monokai_pro.inactive = {
-	c = { bg = colors.editor.background, fg = colors.base.white },
-	z = { bg = colors.editor.background, fg = colors.base.red },
-}
-
-return monokai_pro
diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua
index c7aca2f..521b623 100644
--- a/lua/plugins/colorscheme.lua
+++ b/lua/plugins/colorscheme.lua
@@ -1,37 +1,61 @@
 return {
+	--{
+	--	'loctvl842/monokai-pro.nvim',
+	--	lazy = false,
+	--	priority = 1000,
+	--	config = function()
+	--		vim.opt.background = 'dark'
+	--		require('monokai-pro').setup({
+	--			override = function(c)
+	--				return {
+	--					TelescopeSelection = { bg = c.base.dimmed3 },
+	--					TelescopePromptNormal = { bg = c.base.dimmed3, fg = c.base.white },
+	--					TelescopePromptBorder = { bg = c.base.dimmed3, fg = c.base.dimmed3 },
+	--					TelescopeResultsNormal = { bg = c.base.dimmed5, fg = c.base.white },
+	--					TelescopeResultsBorder = { bg = c.base.dimmed5, fg = c.base.dimmed5 },
+	--					TelescopePreviewNormal = { bg = c.base.dimmed5 },
+	--					TelescopePreviewBorder = { bg = c.base.dimmed5, fg = c.base.dimmed5 },
+
+	--					TelescopePreviewDirectory = {
+	--						bg = c.prompt_bg,
+	--						fg = c.base.white,
+	--					},
+	--					TelescopePreviewDate = {
+	--						bg = c.prompt_bg,
+	--						fg = c.base.red,
+	--					},
+	--					TelescopePreviewHyphen = {
+	--						bg = c.prompt_bg,
+	--						fg = c.base.white,
+	--					},
+	--				}
+	--			end,
+	--		})
+	--		vim.cmd.colorscheme('monokai-pro')
+	--	end,
+	--},
 	{
-		'loctvl842/monokai-pro.nvim',
+		"yorik1984/newpaper.nvim",
 		lazy = false,
-		priority = 1000,
-		config = function()
-			vim.opt.background = 'dark'
-			require('monokai-pro').setup({
-				override = function(c)
-					return {
-						TelescopeSelection = { bg = c.base.dimmed3 },
-						TelescopePromptNormal = { bg = c.base.dimmed3, fg = c.base.white },
-						TelescopePromptBorder = { bg = c.base.dimmed3, fg = c.base.dimmed3 },
-						TelescopeResultsNormal = { bg = c.base.dimmed5, fg = c.base.white },
-						TelescopeResultsBorder = { bg = c.base.dimmed5, fg = c.base.dimmed5 },
-						TelescopePreviewNormal = { bg = c.base.dimmed5 },
-						TelescopePreviewBorder = { bg = c.base.dimmed5, fg = c.base.dimmed5 },
-
-						TelescopePreviewDirectory = {
-							bg = c.prompt_bg,
-							fg = c.base.white,
-						},
-						TelescopePreviewDate = {
-							bg = c.prompt_bg,
-							fg = c.base.red,
-						},
-						TelescopePreviewHyphen = {
-							bg = c.prompt_bg,
-							fg = c.base.white,
-						},
-					}
-				end,
-			})
-			vim.cmd.colorscheme('monokai-pro')
-		end,
-	},
+    	priority = 1000,
+    	config = function()
+			local colors = require("newpaper.colors").setup(require("newpaper.config").config)
+			vim.g.newpaper_colors_advanced = {
+				linenumber_bg = colors.bg
+			}
+			vim.g.newpaper_custom_highlights = {
+				TelescopePromptTitle = { bg = colors.telescope_fg, fg = colors.lightorange },
+				TelescopePromptPrefix = { fg = colors.lightorange },
+				TelescopePromptCounter = { fg = colors.lightorange },
+				TelescopePromptBorder = { bg = colors.telescope_fg, fg = colors.telescope_fg },
+				TelescopePromptNormal = { bg = colors.telescope_fg, fg = colors.telescope_bg },
+				TelescopeResultsNormal = { bg = colors.telescope_bg, fg = colors.telescope_fg },
+				TelescopeResultsBorder = { bg = colors.telescope_bg, fg = colors.telescope_bg },
+				TelescopePreviewNormal = { bg = colors.telescope_bg },
+				TelescopePreviewBorder = { bg = colors.telescope_bg, fg = colors.telescope_bg },
+				TelescopePreviewTitle = { bg = colors.telescope_bg, fg = colors.teal },
+			}
+			vim.cmd.colorscheme('newpaper')
+    	end,
+	}
 }
diff --git a/lua/plugins/interface.lua b/lua/plugins/interface.lua
index 61b06ec..4059f8e 100644
--- a/lua/plugins/interface.lua
+++ b/lua/plugins/interface.lua
@@ -15,7 +15,7 @@ return {
 		event = 'VeryLazy',
 		opts = {
 			options = {
-				theme = function() return require('lualine.theme') end,
+				theme = function() return require('lualine.theme-newpaper') end,
 			},
 			sections = {
 				lualine_a = {
@@ -57,9 +57,9 @@ return {
 		},
 		config = function(_, opts)
 			require('lualine').setup(opts)
-			vim.api.nvim_set_hl(0, 'StatusLine', { bg = require('monokai-pro.colorscheme').editor.background })
+			vim.api.nvim_set_hl(0, 'StatusLine', { bg = require('newpaper').bg })
 			vim.api.nvim_set_hl(0, 'StatusLineNC', {
-				bg = require('monokai-pro.colorscheme').editor.backgroundnil
+				bg = require('newpaper').bg
 			})
 		end,
 	},