diff --git a/home/common/fish.nix b/home/common/fish.nix index 7ba4e7b..5fd6a55 100644 --- a/home/common/fish.nix +++ b/home/common/fish.nix @@ -53,7 +53,7 @@ description = "Open a file in already running nvim"; argumentNames = [ "file" ]; body = '' - nvim --server "$XDG_RUNTIME_DIR/nvim-persistent.sock" --remote (readlink -f "$file") >>/dev/null + nvim --server "$XDG_RUNTIME_DIR/nvim-persistent.sock" --remote (readlink -f "$file") ''; }; diff --git a/home/common/ghostty.nix b/home/common/ghostty.nix index 265e7a8..7db5cca 100644 --- a/home/common/ghostty.nix +++ b/home/common/ghostty.nix @@ -33,7 +33,6 @@ unfocused-split-opacity = 1.0; shell-integration = "fish"; - initial-command = ''nvim --listen "$XDG_RUNTIME_DIR/nvim-persistent.sock"''; window-decoration = true; gtk-single-instance = true; @@ -113,9 +112,7 @@ "System" "TerminalEmulator" ]; - exec = '' - ghostty --class=com.mitchellh.ghostty-nemo --command="ssh -t nemo" --initial-command="ssh -t nemo nvim --listen /run/user/1000/nvim-persistent.sock" - ''; + exec = ''ghostty --class=com.mitchellh.ghostty-nemo --command="ssh -t nemo"''; genericName = "Ghostty (nemo)"; icon = "com.mitchellh.ghostty"; name = "Ghostty (nemo)"; diff --git a/home/common/nvim/dieter/lua/dieter/init.lua b/home/common/nvim/dieter/lua/dieter/init.lua index e803a36..1a638dd 100644 --- a/home/common/nvim/dieter/lua/dieter/init.lua +++ b/home/common/nvim/dieter/lua/dieter/init.lua @@ -52,9 +52,14 @@ local colors = { highlight_subtle = hsl(212, 27, 11), highlight_intense = hsl(58, 100, 60), - string = hsl(96, 35, 60), + -- string = hsl(96, 35, 60), + -- string = hsl(80, 79, 83), + string = hsl(90, 45, 70), comment = hsl(2, 69, 68), comment_error = hsl(2, 85, 50), + func = hsl(40, 57, 87), + member = hsl(213, 45, 75), + punc = hsl(213, 45, 50), diagnostic_error = hsl(353, 100, 45), diagnostic_warning = hsl(30, 100, 50), @@ -97,13 +102,14 @@ local theme = { Constant = { link = "NormalNC" }, Delimiter = { link = "NormalNC" }, + Function = { fg = c.func }, Identifier = { link = "NormalNC" }, Keyword = { fg = c.foreground, bold = true }, Operator = { link = "NormalNC" }, Special = { link = "NormalNC" }, Type = { link = "NormalNC" }, - String = { fg = c.string, italic = true }, + String = { fg = c.string }, Comment = { fg = c.comment, italic = true, bold = true }, CommentError = { fg = c.comment_error, italic = true, bold = true }, @@ -123,11 +129,13 @@ local theme = { GitSignsDeleteNr = { link = "DiffDelete" }, -- Treesitter - ["@function"] = { link = "NormalNC" }, + -- ["@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 }, + -- ["@lsp.type.variable"] = { fg = c.dimmed_subtle, italic = true }, -- UI Elements CursorLine = { bg = c.highlight_subtle },