diff options
| -rw-r--r-- | autoload/+init.kak | 2 | ||||
| -rw-r--r-- | autoload/build.kak | 30 | ||||
| -rw-r--r-- | autoload/git.kak | 2 | ||||
| l--------- | autoload/plugins | 2 | ||||
| l--------- | autoload/standard-library | 2 |
5 files changed, 28 insertions, 10 deletions
diff --git a/autoload/+init.kak b/autoload/+init.kak index 5ce7c45..6f5f607 100644 --- a/autoload/+init.kak +++ b/autoload/+init.kak @@ -58,7 +58,7 @@ set-option global modelinefmt \ # add-highlighter global/ flag-lines blue relative_markers # Highlighters -add-highlighter global/ number-lines -hlcursor -min-digits 3 -separator ' ' # -relative +add-highlighter global/ number-lines -hlcursor -min-digits 3 -separator ' ' -relative add-highlighter global/ column '%val{cursor_char_column}' ColumnLine add-highlighter global/ line '%val{cursor_line}' RowLine add-highlighter global/ regex \h+$ 0:Error # Highlight trailing whitespaces diff --git a/autoload/build.kak b/autoload/build.kak index b1067b6..903ce47 100644 --- a/autoload/build.kak +++ b/autoload/build.kak @@ -1,14 +1,32 @@ -set-option global makecmd 'make -j8' +set-option global makecmd 'echo "Build command not set"; exit 1' # TODO: For some reason <ret> doesnt jump to error hook global BufSetOption filetype=(?:typescript|javascript|jsx|tsx) %{ set-option buffer makecmd "%val{config}/scripts/tsc-vimgrep.sh" } -hook global BufSetOption filetype=haskell %{ - set-option buffer makecmd "cabal build" -} +hook global BufSetOption filetype=haskell %{ set-option buffer makecmd "cabal build" } + +hook global BufSetOption filetype=rust %{ set-option buffer makecmd "cargo build" } -hook global BufSetOption filetype=rust %{ - set-option buffer makecmd "cargo build" +provide-module make-override %{ + define-command -params .. -override -docstring %{ + make [<arguments>]: make utility wrapper + All the optional arguments are forwarded to the make utility + } make %{ + evaluate-commands -save-regs m %{ + set-register m %opt{makecmd} + evaluate-commands -try-client %opt{toolsclient} %{ + fifo -scroll -name *make* -script %{ + trap - INT QUIT + trap 'echo -e "\n\nExited with $?" >&2' EXIT + eval "$kak_reg_m \"\$@\"" + } -- %arg{@} + set-option buffer filetype make + set-option buffer jump_current_line 0 + } + } + } } + +hook -once global KakBegin .* %{ require-module make-override } diff --git a/autoload/git.kak b/autoload/git.kak index 0745a61..aa6a66f 100644 --- a/autoload/git.kak +++ b/autoload/git.kak @@ -34,5 +34,5 @@ define-command git-toggle-diff %{ define-command git-line-blame %{ terminal-singleton git-blame sh -c \ - "git -p log -u -L '%sh{echo ""$kak_selection_desc"" | sed -E 's/\.[0-9]+//g'}:%val{buffile}' --color=always" + "git -p log -u -L '%sh{echo ""$kak_selection_desc"" | sed -E 's/\.[0-9]+//g'}:%val{buffile}' --color=always | delta" } diff --git a/autoload/plugins b/autoload/plugins index fb34fce..b98db44 120000 --- a/autoload/plugins +++ b/autoload/plugins @@ -1 +1 @@ -/nix/store/w0nyi63w45vhrkaxjxyc9cpqg1lvrws0-kakoune-2025.06.03/share/kak/autoload/plugins
\ No newline at end of file +/nix/store/fp4j8a28ynxjbhl2pjvyxkh6c48c81bq-kakoune-2025.06.03/share/kak/autoload/plugins
\ No newline at end of file diff --git a/autoload/standard-library b/autoload/standard-library index a9eac7b..f3c10ee 120000 --- a/autoload/standard-library +++ b/autoload/standard-library @@ -1 +1 @@ -/nix/store/w0nyi63w45vhrkaxjxyc9cpqg1lvrws0-kakoune-2025.06.03/share/kak/rc
\ No newline at end of file +/nix/store/fp4j8a28ynxjbhl2pjvyxkh6c48c81bq-kakoune-2025.06.03/share/kak/rc
\ No newline at end of file |