From 6e81863ff6928a0b13fc32bd3dc0c82b1d20ff1e Mon Sep 17 00:00:00 2001
From: Daniel Lundin <dln@arity.se>
Date: Sun, 2 Feb 2025 12:20:40 +0100
Subject: [PATCH 1/2] nvim: cursorline off by default, add ui toggle
---
home/common/nvim/dieter/lua/dieter/init.lua | 22 ++++++++++++---------
home/common/nvim/init.lua | 6 ++++--
2 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/home/common/nvim/dieter/lua/dieter/init.lua b/home/common/nvim/dieter/lua/dieter/init.lua
index 2aa86d7..07a47f5 100644
--- a/home/common/nvim/dieter/lua/dieter/init.lua
+++ b/home/common/nvim/dieter/lua/dieter/init.lua
@@ -14,10 +14,12 @@ local colors = {
comment = hsl(360, 66, 40),
comment_error = hsl(2, 85, 40),
- diagnostic_error = hsl(347, 80, 45),
- diagnostic_warning = hsl(30, 100, 50),
- diagnostic_info = hsl(145, 80, 30),
- diagnostic_hint = hsl(145, 80, 30),
+ suggestion = hsl(220, 95, 60),
+
+ -- diagnostic_error = hsl(347, 80, 45),
+ -- diagnostic_warning = hsl(30, 100, 50),
+ -- diagnostic_info = hsl(145, 80, 30),
+ -- diagnostic_hint = hsl(145, 80, 30),
popup_error_bg = hsl(0, 90, 99),
popup_warning_bg = hsl(27, 90, 99),
@@ -59,6 +61,8 @@ local colors = {
member = hsl(213, 45, 75),
punc = hsl(213, 45, 50),
+ suggestion = hsl(158, 66, 40),
+
diagnostic_error = hsl(353, 100, 45),
diagnostic_warning = hsl(30, 100, 50),
diagnostic_info = hsl(176, 80, 60),
@@ -88,8 +92,6 @@ local colors = {
doc_bg = hsl(220, 80, 10),
doc_fg = hsl(200, 30, 60),
-
- suggestion = hsl(180, 55, 40),
},
}
@@ -118,8 +120,8 @@ local setupGroups = function(c)
Search = { bg = c.search_bg, fg = c.search_fg },
CurSearch = { link = "Search" },
- Comment = { fg = c.comment, italic = true, bold = true },
- CommentError = { fg = c.comment_error, italic = true, bold = true },
+ Comment = { fg = c.comment, italic = true },
+ CommentError = { fg = c.comment_error, italic = true },
["@comment.note"] = { link = "Comment" },
["@comment.todo"] = { link = "CommentError" },
["@comment.error"] = { link = "CommentError" },
@@ -207,7 +209,9 @@ local setupGroups = function(c)
BlinkCmpSignatureHelp = { link = 'BlinkCmpDoc' },
BlinkCmpSignatureHelpBorder = { link = 'BlinkCmpDocBorder' },
- NeoCodeiumSuggestion = { fg = c.suggestion, bold = true, italic = true },
+ BlinkCmpGhostText = { fg = c.suggestion, italic = true, bold = true },
+ NeoCodeiumSuggestion = { link = 'BlinkCmpGhostText' },
+
LspReferenceText = { fg = c.highlight_intense, undercurl = true },
LspInlayHint = { fg = c.accent1, italic = true, bold = true },
}
diff --git a/home/common/nvim/init.lua b/home/common/nvim/init.lua
index 8beaaaf..67f0c25 100644
--- a/home/common/nvim/init.lua
+++ b/home/common/nvim/init.lua
@@ -5,8 +5,9 @@ vim.g.maplocalleader = ","
-- UI
-vim.opt.cursorline = true
-vim.opt.guicursor = "n-v-c:block,i-ci-ve:ver25,r-cr:hor20,o:hor50,a:blinkwait700-blinkoff400-blinkon250-Cursor/lCursor,sm:block-blinkwait175-blinkoff150-blinkon175"
+vim.opt.cursorline = false
+vim.opt.guicursor =
+"n-v-c:block,i-ci-ve:ver25,r-cr:hor20,o:hor50,a:blinkwait700-blinkoff400-blinkon250-Cursor/lCursor,sm:block-blinkwait175-blinkoff150-blinkon175"
vim.opt.laststatus = 0
vim.opt.number = false
vim.opt.relativenumber = false
@@ -205,5 +206,6 @@ vim.keymap.set("n", "<Leader>uc", function()
end, opts("Toggle Dieter colors"))
vim.keymap.set("n", "<Leader>uf", "<cmd>ToggleAutoFormat<cr>", opts("Toggle autoformat on save"))
vim.keymap.set("n", "<Leader>uh", "<cmd>InlayHintsToggle<cr>", opts("Toggle inlay hints"))
+vim.keymap.set("n", "<Leader>ul", "<cmd>set invcursorline<cr>", opts("Toggle cursor line"))
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"))
From 8fb4b727ba97a02c037296a07e509a873a020d04 Mon Sep 17 00:00:00 2001
From: Daniel Lundin <dln@arity.se>
Date: Sun, 2 Feb 2025 12:20:40 +0100
Subject: [PATCH 2/2] nvim/ghostty: style suggestions and completions
---
files/config/fish/config.fish | 2 +-
flake.lock | 48 ++++++++++-----------
home/common/nvim/dieter/lua/dieter/init.lua | 12 +++---
home/common/nvim/init.lua | 2 +-
home/common/nvim/mini.lua | 2 +-
5 files changed, 34 insertions(+), 32 deletions(-)
diff --git a/files/config/fish/config.fish b/files/config/fish/config.fish
index c3d902f..6572a0c 100644
--- a/files/config/fish/config.fish
+++ b/files/config/fish/config.fish
@@ -12,7 +12,7 @@ set fish_emoji_width 2
# Colors
set fish_color_command --bold
set fish_color_comment --italics --dim
-set fish_color_autosuggestion --italics --bold --dim
+set fish_color_autosuggestion 1f67f9 --italics --bold
set fish_color_cancel
set fish_color_command --bold
set fish_color_comment --italics --dim
diff --git a/flake.lock b/flake.lock
index 2e7f2e6..5b2ffda 100644
--- a/flake.lock
+++ b/flake.lock
@@ -56,11 +56,11 @@
]
},
"locked": {
- "lastModified": 1736143030,
- "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=",
+ "lastModified": 1738453229,
+ "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de",
+ "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
"type": "github"
},
"original": {
@@ -221,11 +221,11 @@
]
},
"locked": {
- "lastModified": 1738275749,
- "narHash": "sha256-PM+cGduJ05EZ+YXulqAwUFjvfKpPmW080mcuN6R1POw=",
+ "lastModified": 1738448366,
+ "narHash": "sha256-4ATtQqBlgsGqkHTemta0ydY6f7JBRXz4Hf574NHQpkg=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "a8159195bfaef3c64df75d3b1e6a68d49d392be9",
+ "rev": "18fa9f323d8adbb0b7b8b98a8488db308210ed93",
"type": "github"
},
"original": {
@@ -266,11 +266,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
- "lastModified": 1738310515,
- "narHash": "sha256-qQ4/XFreahIZI5wIwlRcqDASP2EMGAUA0+qvufALdhI=",
+ "lastModified": 1738479528,
+ "narHash": "sha256-VmO/CQEQjIpfYot//PHDQuUm68r27zNuBiuANi6c5E4=",
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
- "rev": "c7b97f4eeda08870059b20ec8d92ee76efda53b4",
+ "rev": "1b82dbcbbcba812ad19f5c0601d1731731bf4ebe",
"type": "github"
},
"original": {
@@ -282,11 +282,11 @@
"neovim-src": {
"flake": false,
"locked": {
- "lastModified": 1738241166,
- "narHash": "sha256-bcVp2t49bUoca5Wro4Q9m+SHpPSLVB/jabUqWiGGz4s=",
+ "lastModified": 1738450845,
+ "narHash": "sha256-yK2ZOtTTT6BjNi98PZi0NpEbidY12JMjgkqqggjoyD8=",
"owner": "neovim",
"repo": "neovim",
- "rev": "e71d2c817d1a2475551f58a98e411f6b39a5be3f",
+ "rev": "0985e784d8dce58748343207e176bf61303b7d68",
"type": "github"
},
"original": {
@@ -302,11 +302,11 @@
]
},
"locked": {
- "lastModified": 1737861961,
- "narHash": "sha256-LIRtMvAwLGb8pBoamzgEF67oKlNPz4LuXiRPVZf+TpE=",
+ "lastModified": 1738466368,
+ "narHash": "sha256-PZhUjtvQZOH3PO0EYdTpQvcqkgkq1NkP2A6w9SPHYsk=",
"owner": "nix-community",
"repo": "nix-index-database",
- "rev": "79b7b8eae3243fc5aa9aad34ba6b9bbb2266f523",
+ "rev": "46a8f5fc9552b776bfc5c5c96ea3bede33f68f52",
"type": "github"
},
"original": {
@@ -349,11 +349,11 @@
},
"nixpkgs-stable_2": {
"locked": {
- "lastModified": 1738163270,
- "narHash": "sha256-B/7Y1v4y+msFFBW1JAdFjNvVthvNdJKiN6EGRPnqfno=",
+ "lastModified": 1738277201,
+ "narHash": "sha256-6L+WXKCw5mqnUIExvqkD99pJQ41xgyCk6z/H9snClwk=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "59e618d90c065f55ae48446f307e8c09565d5ab0",
+ "rev": "666e1b3f09c267afd66addebe80fb05a5ef2b554",
"type": "github"
},
"original": {
@@ -397,11 +397,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1738136902,
- "narHash": "sha256-pUvLijVGARw4u793APze3j6mU1Zwdtz7hGkGGkD87qw=",
+ "lastModified": 1738297584,
+ "narHash": "sha256-AYvaFBzt8dU0fcSK2jKD0Vg23K2eIRxfsVXIPCW9a0E=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "9a5db3142ce450045840cc8d832b13b8a2018e0c",
+ "rev": "9189ac18287c599860e878e905da550aa6dec1cd",
"type": "github"
},
"original": {
@@ -413,11 +413,11 @@
},
"nixpkgs_3": {
"locked": {
- "lastModified": 1738142207,
- "narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=",
+ "lastModified": 1738410390,
+ "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "9d3ae807ebd2981d593cddd0080856873139aa40",
+ "rev": "3a228057f5b619feb3186e986dbe76278d707b6e",
"type": "github"
},
"original": {
diff --git a/home/common/nvim/dieter/lua/dieter/init.lua b/home/common/nvim/dieter/lua/dieter/init.lua
index 07a47f5..f9fdcc2 100644
--- a/home/common/nvim/dieter/lua/dieter/init.lua
+++ b/home/common/nvim/dieter/lua/dieter/init.lua
@@ -14,12 +14,12 @@ local colors = {
comment = hsl(360, 66, 40),
comment_error = hsl(2, 85, 40),
- suggestion = hsl(220, 95, 60),
+ suggestion = hsl(220, 95, 55),
- -- diagnostic_error = hsl(347, 80, 45),
- -- diagnostic_warning = hsl(30, 100, 50),
- -- diagnostic_info = hsl(145, 80, 30),
- -- diagnostic_hint = hsl(145, 80, 30),
+ diagnostic_error = hsl(347, 80, 45),
+ diagnostic_warning = hsl(30, 100, 50),
+ diagnostic_info = hsl(145, 80, 30),
+ diagnostic_hint = hsl(145, 80, 30),
popup_error_bg = hsl(0, 90, 99),
popup_warning_bg = hsl(27, 90, 99),
@@ -35,6 +35,7 @@ local colors = {
dialog_bg = hsl(224, 5, 92),
selection = hsl(270, 75, 92),
highlight_subtle = hsl(0, 0, 94),
+ highlight = hsl(0, 0, 90),
highlight_intense = hsl(42, 100, 30),
},
@@ -174,6 +175,7 @@ local setupGroups = function(c)
InclineNormal = { bg = c.background },
InclineNormalNC = { bg = c.background },
+ EndOfBuffer = { fg = c.dimmed },
WinSeparator = { bg = c.dialog_bg, fg = c.dialog_fg },
NormalFloat = { bg = c.background, fg = c.foreground },
FloatBorder = { fg = c.foreground },
diff --git a/home/common/nvim/init.lua b/home/common/nvim/init.lua
index 67f0c25..00228b9 100644
--- a/home/common/nvim/init.lua
+++ b/home/common/nvim/init.lua
@@ -76,7 +76,7 @@ vim.opt.foldexpr = "nvim_treesitter#foldexpr()"
vim.o.autochdir = true
vim.o.cia = 'kind,abbr,menu'
-vim.o.fillchars = "stl: ,stlnc: ,eob:░,vert:│"
+vim.o.fillchars = "stl: ,stlnc: ,eob:🮘,vert:│"
vim.o.icm = "split"
vim.o.list = false
vim.o.scrolloff = 7
diff --git a/home/common/nvim/mini.lua b/home/common/nvim/mini.lua
index 339c471..1c8f41e 100644
--- a/home/common/nvim/mini.lua
+++ b/home/common/nvim/mini.lua
@@ -35,7 +35,7 @@ indentscope.setup({
delay = 10,
animation = indentscope.gen_animation.none(),
},
- symbol = '│',
+ symbol = '┆',
})
require('mini.jump2d').setup({