From b5a3d0ec9e06cfa49ae5592c1680b0f737d6dc2b Mon Sep 17 00:00:00 2001
From: Daniel Lundin <dln@arity.se>
Date: Sat, 11 Jan 2025 23:29:02 +0100
Subject: [PATCH] nvim: colors

---
 home/common/nvim/dieter/lua/dieter/init.lua | 19 ++++++++-----------
 home/common/nvim/init.lua                   |  6 +++---
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/home/common/nvim/dieter/lua/dieter/init.lua b/home/common/nvim/dieter/lua/dieter/init.lua
index 24a3677..9bf0a9d 100644
--- a/home/common/nvim/dieter/lua/dieter/init.lua
+++ b/home/common/nvim/dieter/lua/dieter/init.lua
@@ -44,18 +44,17 @@ local colors = {
     accent2 = hsl(40, 57, 57),  -- Yellow
 
     dimmed = hsl(212, 19, 25),
-    -- dimmed_subtle = hsl(212, 19, 70),
     dimmed_subtle = hsl(212, 19, 50),
 
     highlight_subtle = hsl(212, 27, 11),
+    highlight = hsl(212, 27, 18),
     highlight_intense = hsl(58, 100, 60),
 
     dialog_fg = hsl(191, 15, 75),
 
-    -- string = hsl(96, 35, 60),
-    -- string = hsl(80, 79, 83),
-    string = hsl(90, 45, 70),
-    comment = hsl(2, 69, 68),
+    string = hsl(90, 30, 60),
+    -- comment = hsl(2, 69, 68),
+    comment = hsl(216, 30, 55),
     comment_error = hsl(2, 85, 50),
     func = hsl(40, 57, 87),
     member = hsl(213, 45, 75),
@@ -78,7 +77,7 @@ local colors = {
     delete = hsl(350, 100, 40),
     delete_quarter = hsl(350, 100, 15),
 
-    selection = hsl(218, 30, 20),
+    selection = hsl(218, 90, 20),
 
     search_bg = hsl(43, 100, 8),
     search_fg = hsl(43, 100, 85),
@@ -138,13 +137,11 @@ local setupGroups = function(c)
     GitSignsDeleteNr = { link = "DiffDelete" },
 
     -- Treesitter
-    -- ["@function"] = { link = "NormalNC" },
     ["@punctuation.special"] = { fg = c.punc },
     ["@special"] = { link = "NormalNC" },
     ["@variable"] = { link = "NormalNC" },
     ["@variable.member"] = { fg = c.member },
     ["@variable.parameter"] = { fg = c.accent2 },
-    -- ["@lsp.type.variable"] = { fg = c.dimmed_subtle, italic = true },
 
     -- UI Elements
     CursorLine = { bg = c.highlight_subtle },
@@ -166,8 +163,8 @@ local setupGroups = function(c)
     LineNr = { fg = c.dimmed },
     CursorLineNr = { fg = c.dimmed_subtle, bg = c.highlight_subtle },
 
-    IndentLine = { fg = c.dimmed },
-    IndentLineCurrent = { fg = c.dimmed_subtle },
+    IndentLine = { fg = c.highlight },
+    IndentLineCurrent = { fg = c.highlight },
     MiniIndentscopeSymbol = { link = "IndentLine" },
     MiniIndentscopeSymbolOff = { link = "IndentLine" },
 
@@ -239,7 +236,7 @@ local setupGroupsNoColor = function(c)
   g["@variable"] = cl
   g["@variable.member"] = cl
   g["@variable.parameter"] = cl
-  g.Comment = { fg = c.dimmed_subtle, italic = true, bold = true }
+  -- g.Comment = { fg = c.dimmed_subtle, italic = true, bold = true }
   g.CommentError = { link = "Comment" }
   return g
 end
diff --git a/home/common/nvim/init.lua b/home/common/nvim/init.lua
index 9534e5a..0885481 100644
--- a/home/common/nvim/init.lua
+++ b/home/common/nvim/init.lua
@@ -7,7 +7,7 @@ vim.g.maplocalleader = ","
 
 vim.opt.cursorline = true
 vim.opt.laststatus = 0
-vim.opt.number = true
+vim.opt.number = false
 vim.opt.relativenumber = false
 vim.opt.ruler = true
 vim.opt.syntax = "on"
@@ -26,7 +26,6 @@ end
 
 function CondensedPath()
   local path = vim.fn.expand("%:p")
-  -- path = vim.fn.fnamemodify(path, ':p')
   local home = os.getenv("HOME")
   if home then
     path = vim.fn.substitute(path, '^' .. home, '~', '')
@@ -43,7 +42,7 @@ function CondensedPath()
   return vim.fn.pathshorten(early_path) .. '/' .. late_path
 end
 
-vim.opt.rulerformat = "%50(%=%{%v:lua.GetIndicators()%}%#Label#%#MsgArea#| %{%v:lua.CondensedPath()%}%)"
+vim.opt.rulerformat = "%50(%=%{%v:lua.GetIndicators()%}%#MsgArea#%{%v:lua.CondensedPath()%}%)%7(%l:%c%)"
 
 -- Search
 vim.opt.ignorecase = true
@@ -179,4 +178,5 @@ vim.keymap.set("n", "<Leader>uc", function()
   end
 end, opts("Toggle Dieter colors"))
 vim.keymap.set("n", "<Leader>uh", "<cmd>InlayHintsToggle<cr>", opts("Toggle inlay hints"))
+vim.keymap.set("n", "<Leader>un", "<cmd>set invnumber<cr>", opts("Toggle line numbers"))
 vim.keymap.set("n", "<Leader>uw", "<cmd>set invwrap<cr>", opts("Toggle line wrapping"))