diff --git a/modules/kak/colors.nix b/modules/kak/colors.nix index 462318e..ba9bade 100644 --- a/modules/kak/colors.nix +++ b/modules/kak/colors.nix @@ -17,11 +17,11 @@ pkgs.writeTextFile (rec { face global meta rgb:${green.bright} face global type rgb:${blue.bright} - face global LineNumbers rgb:${background.slight} - face global BufferPadding rgb:${background.slight} - face global LineNumberCursor rgb:${foreground.primary} - face global crosshairs_line "default,rgb:212121" - face global MenuForeground "default,rgb:${blue.normal}" + face global LineNumbers rgb:${background.slight} + face global BufferPadding rgb:${background.slight} + face global LineNumberCursor rgb:${foreground.primary} + face global crosshairs_line "default,rgb:212121" + face global MenuForeground "default,rgb:${blue.normal}" face global MenuBackground "default,rgb:313131" ''; diff --git a/modules/kak/kakrc.nix b/modules/kak/kakrc.nix index 23dd283..72116f7 100644 --- a/modules/kak/kakrc.nix +++ b/modules/kak/kakrc.nix @@ -25,13 +25,16 @@ let keybinds = '' # Initialization code for IDE mode needed for every supported # language, and inlay diagnostics. ide-init = '' - eval %sh{ kak-lsp --kakoune -s $kak_session } lsp-enable-window lsp-inlay-diagnostics-enable window - hook window ModeChange .*:.*:insert %{ remove-highlighter window/lsp_diagnostics } - hook window ModeChange .*:insert:normal %{ lsp-inlay-diagnostics-enable window } + hook window ModeChange .*:.*:insert %{ + remove-highlighter window/lsp_diagnostics + } + hook window ModeChange .*:insert:normal %{ + lsp-inlay-diagnostics-enable window + } ''; # Implies `ide-init`. Adds code actions and hover. @@ -140,9 +143,10 @@ in pkgs.writeTextFile (rec { name = "kakrc.kak"; destination = "/share/kak/autoload/${name}"; text = '' - colorscheme colors; set global tabstop 4 + eval %sh{ kak-lsp --kakoune -s $kak_session } + add-highlighter global/ number-lines -separator ' │ ' -hlcursor face global InlayHint rgb:828282 @@ -159,6 +163,9 @@ in pkgs.writeTextFile (rec { ${rust-config} ${nix-config} - hook global KakBegin .* %{ cursorline } + hook global KakBegin .* %{ + cursorline + colorscheme colors + } ''; })