From 9870d557837368bc5bfa4b2b478b5a19adaaeaac Mon Sep 17 00:00:00 2001
From: surdeus <surdeus@gmail.com>
Date: Wed, 30 Aug 2023 10:47:50 +0300
Subject: [PATCH] More coloring for nvim and maps.

---
 dot/file/bash_profile    |  2 +-
 dot/file/profile         |  4 ++--
 nvim/init.lua            |  2 ++
 nvim/lua/color/cons.lua  |  3 +++
 nvim/lua/color/night.lua | 29 ++++++++++++++++++++++-------
 nvim/lua/maps.lua        |  1 +
 6 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/dot/file/bash_profile b/dot/file/bash_profile
index ad42dce..89a9dcb 120000
--- a/dot/file/bash_profile
+++ b/dot/file/bash_profile
@@ -1 +1 @@
-./profile
\ No newline at end of file
+. $HOME/.profile
diff --git a/dot/file/profile b/dot/file/profile
index c399db8..3756aaa 100755
--- a/dot/file/profile
+++ b/dot/file/profile
@@ -22,10 +22,10 @@ export_loop  \
 	PS1 '"$PROMPT"' \
 	SUDO_PROMPT '"# "' \
 	PATH '$HOME/exe:$HOME/.local/bin:$PATH' \
-	EDITOR '`goblin useprog vim vi ed`' \
+	EDITOR '`goblin which vim vi ed`' \
 	VISUAL '$EDITOR' \
 	GIT_EDITOR '$VISUAL' \
-	PAGER '`goblin useprog less more`' \
+	PAGER '`goblin which less more`' \
 	MANPAGER '$PAGER' \
 	\
 	CDHIST '$HOME/lib/cds' \
diff --git a/nvim/init.lua b/nvim/init.lua
index a36ebef..0ce79e5 100644
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -1,10 +1,12 @@
 -- Surdeus init file.
 -- surdeus@gmail.com
 
+vim.cmd.language("en_US")
 vim.opt.swapfile = false
 
 vim.o.number = true
 vim.o.cursorline = true
+vim.o.guicursor = 'n-v-c-sm-i-ci-ve:block,r-cr-o:hor20,a:blinkwait700-blinkoff400-blinkon250-Cursor/lCursor'
 
 require("indent")
 require("maps")
diff --git a/nvim/lua/color/cons.lua b/nvim/lua/color/cons.lua
index aeeae74..6bdebeb 100644
--- a/nvim/lua/color/cons.lua
+++ b/nvim/lua/color/cons.lua
@@ -9,7 +9,10 @@ package.colors = {
   lgray = "#BBBBBB",
 
   red = "#FF0000",
+
   green = "#00FF00",
+  dgreen = "#00bb00",
+
   blue = "#0000FF",
   lblue = "#0089ff",
 
diff --git a/nvim/lua/color/night.lua b/nvim/lua/color/night.lua
index a956a70..f8355d4 100644
--- a/nvim/lua/color/night.lua
+++ b/nvim/lua/color/night.lua
@@ -6,12 +6,18 @@ local c = require("color.cons").colors
 package.hls = {
   Normal = {fg = c.white, bg = c.black},
 
-  LineNr = {fg = c.black, bg=c.white},
+  TabLine = {fg = c.black, bg = c.lgray},
+  TabLineSel = {fg = c.black, bg = c.green},
+  TabLineFill = {bg = c.gray},
 
-  Cursor = {fg = c.black, bg = c.green},
+  LineNr = {fg = c.black, bg=c.white},
+  CursorLineNr = {fg = c.white, bg=c.black},
+
+  Cursor = {reverse=true},
+  lCursor = {reverse=true},
   CursorLine = {bold = true},
 
-  StatusLine = {fg = c.black, bg = c.red},
+  StatusLine = {fg = c.black, bg = c.green},
   StatusLineNC = {fg = c.black, bg = c.lgray},
 
   IncSearch = {fg=c.black, bg=c.purple},
@@ -20,15 +26,24 @@ package.hls = {
 
   String = {fg=c.red},
   Constant = {fg=c.red},
-  Special = {fg=c.lblue},
+  Special = {fg=c.green},
 
-  Function = {fg = c.lyellow},
-  Statement = {fg = c.lyellow},
-  Type = {fg = c.green},
+  Function = {bold = true, fg = c.lyellow},
+  Statement = {bold = true, fg = c.lyellow},
+  Type = {bold = true, fg = c.lgreen},
+  Structure = {bold = true, fg = c.green},
+  Operator = {bold = true, fg = c.green},
 
   Comment = {fg=c.purple},
+  PreProc = {fg=c.lpurple},
+  Define = {fg=c.lpurple},
+
   Folded = {fg=c.black, bg=lgray},
   FoldColumn = {fg=c.black, bg=lgray},
+
+  Ignore = {fg=c.lgreen},
+  Error = {fg=c.white, bg=c.red},
+  Underlined = {underline = true},
 }
 
 return package
diff --git a/nvim/lua/maps.lua b/nvim/lua/maps.lua
index 6891c82..845c4c9 100644
--- a/nvim/lua/maps.lua
+++ b/nvim/lua/maps.lua
@@ -37,6 +37,7 @@ local opts = {silent = true}
 	map('n', '<C-j>', '<C-w>-', opts)
 	map('n', '<C-h>', '3<C-w><', opts)
 	map('n', '<C-l>', '3<C-w>>', opts)
+	map('n', '<space>', '3<C-w>>', opts)
 	-- Splitting
 	map('n', '\\|', '<C-w>v', opts)
 	map('n', '\\-', '<C-w>s', opts)