From d6b161f2d6586f2dd981a7f4af4d87aec45398fa Mon Sep 17 00:00:00 2001
From: Andrew Conlin <andrew@andrewconl.in>
Date: Sat, 12 Oct 2024 10:35:55 +0100
Subject: [PATCH] [2024-10-12] New custom colour scheme, statusline updates

---
 nvim/colors/gruv.vim            |  9 +++++++++
 nvim/colors/mine.vim            |  2 +-
 nvim/init.vim                   |  4 ++--
 nvim/lua/plugins/statusline.lua | 16 ++++++++++------
 4 files changed, 22 insertions(+), 9 deletions(-)
 create mode 100644 nvim/colors/gruv.vim

diff --git a/nvim/colors/gruv.vim b/nvim/colors/gruv.vim
new file mode 100644
index 0000000..da97b19
--- /dev/null
+++ b/nvim/colors/gruv.vim
@@ -0,0 +1,9 @@
+" load the retrobox colorscheme
+runtime colors/retrobox.vim
+let g:colors_name = 'gruv'
+highlight CursorLineNr guibg=NONE gui=bold
+highlight SpellBad guibg=Normal guifg=Normal gui=undercurl guisp=red
+highlight SpellCap guibg=Normal guifg=Normal gui=undercurl guisp=blue
+highlight SpellLocal guibg=Normal guifg=Normal gui=undercurl guisp=pink
+highlight SpellRare guibg=Normal guifg=Normal gui=undercurl guisp=aqua
+"highlight StatusLine gui=bold "guibg=Normal guifg=Normal
diff --git a/nvim/colors/mine.vim b/nvim/colors/mine.vim
index 72d98c5..bad0b6c 100644
--- a/nvim/colors/mine.vim
+++ b/nvim/colors/mine.vim
@@ -20,4 +20,4 @@ highlight Comment gui=italic
 highlight Constant guifg=#999999
 highlight NormalFloat guibg=#666666
 highlight CursorLineNr guibg=NONE gui=bold
-highlight StatusLine guibg=Normal guifg=Normal
+" highlight StatusLine guibg=Normal guifg=Normal
diff --git a/nvim/init.vim b/nvim/init.vim
index 78d3185..2d218c8 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -11,7 +11,7 @@ Plug 'MunifTanjim/nui.nvim'
 "Plug 'nvim-neo-tree/neo-tree.nvim', { 'branch': 'v3.x' }
 Plug 'lewis6991/gitsigns.nvim' " OPTIONAL: for git status
 " Plug 'nvim-tree/nvim-web-devicons' " OPTIONAL: for file icons
-Plug 'freddiehaddad/feline.nvim'
+" Plug 'freddiehaddad/feline.nvim'
 Plug 'neovim/nvim-lspconfig'
 " main one
 Plug 'ms-jpq/coq_nvim', {'branch': 'coq'}
@@ -32,7 +32,7 @@ endif
 
 colo mine
 set noshowmode
-set laststatus=3
+set laststatus=2
 set cmdheight=0
 
 set statusline=%{%v:lua.require('plugins.statusline').statusline()%}
diff --git a/nvim/lua/plugins/statusline.lua b/nvim/lua/plugins/statusline.lua
index 9ab56f7..9f6d9d2 100644
--- a/nvim/lua/plugins/statusline.lua
+++ b/nvim/lua/plugins/statusline.lua
@@ -2,12 +2,16 @@ local M = {}
 
 M.modeMap = {
 	n = "NORMAL", i = "INSERT", R = "REPLACE", v = "VISUAL", V = "V-LINE", [''] = "V-BLOCK",
-	c = "COMMAND", s = "SELECT", S = "S-LINE", [''] = "S-BLOCK", t = "TERMINAL"
+	c = "COMMAND", s = "SELECT", S = "S-LINE", [''] = "S-BLOCK", nt = "NORMAL", t = "TERMINAL"
 }
 
 GetMode = function()
 	local m = vim.api.nvim_get_mode().mode
-	return M.modeMap[m] .. " "
+	if M.modeMap[m] ~= nil then
+		return M.modeMap[m] .. " "
+	else
+		return ""
+	end
 end
 
 GetDate = function()
@@ -28,9 +32,9 @@ GetLSP = function()
 			local sandbox = root:match(".+/([^/]+)$")
 			--local handle = io.popen('p4 opened | grep tnrCRCDecode | sed \'s/^[^#]*//g\'')
 			--local result = handle:read("*a")
-			return string.format('[%s -> %s]',name,sandbox)
+			return string.format('| %s -> %s ',name,sandbox)
 		else
-			return "[" .. name .. "] "
+			return "| " .. name .. " "
 		end
 	else
 		return ''
@@ -42,14 +46,14 @@ GetGitStatus = function()
 	local inRepo = signs.head ~= ''
 
 	return inRepo and string.format(
-	    '[%s: +%s ~%s -%s] ',
+	    '| %s: +%s ~%s -%s ',
     	signs.head, signs.added, signs.changed, signs.removed
   		) or ''
 end
 
 function M.statusline()
 	local sline = " "
-	sline = sline .. GetMode() .. GetGitStatus() .. GetLSP() .. "%=" .. GetDate() .. " " .. GetTime() .. " "
+	sline = sline .. GetMode() .. GetGitStatus() .. GetLSP() .. "%=" .. GetDate() .. " | " .. GetTime() .. " "
 	return sline
 end