From c68404f12210dfa4171a9b9ed1d19871352a4931 Mon Sep 17 00:00:00 2001
From: Akshay Nair <phenax5@gmail.com>
Date: Fri, 12 Jun 2026 11:05:32 +0530
Subject: Add gitu blame key + update formatter

---
 autoload/formatter.kak | 26 ++++++++++----------------
 autoload/git.kak       |  5 +++++
 autoload/orgmode.kak   |  6 ++++++
 3 files changed, 21 insertions(+), 16 deletions(-)

(limited to 'autoload')

diff --git a/autoload/formatter.kak b/autoload/formatter.kak
index 0830164..a3cbcb3 100644
--- a/autoload/formatter.kak
+++ b/autoload/formatter.kak
@@ -6,26 +6,16 @@ hook global BufSetOption filetype=fennel %{ set-option buffer formatcmd "fnlfmt
 
 hook global BufSetOption filetype=nix %{ set-option buffer formatcmd "nixfmt -" }
 
-hook global BufSetOption filetype=ruby %{ set-option buffer formatlspserver rubocop }
+hook global BufSetOption filetype=ruby %{
+  set-option buffer formatcmd "bundle exec rubocop -a --stderr --stdin '%val{buffile}'"
+}
 
 hook global BufSetOption filetype=(?:javascript|typescript|jsx|tsx) %{
-  evaluate-commands %sh{
-    if [ -f "$PWD/biome.json" ]; then
-      echo "set-option buffer formatlspserver biome"
-    else
-      echo "set-option buffer formatlspserver typescript-language-server"
-    fi
-  }
+  set-option buffer formatcmd "biome format --stdin-file-path='%val{buffile}'"
 }
 
-define-command biome-buffer -docstring 'Format buffer file on disk using biome' %{
-  biome %val{buffile}
-}
-
-define-command biome -params .. -docstring 'Format project using biome' %{
-  info %sh{
-    npx biome check --fix "$@" && echo "Success" || echo "Failed"
-  }
+hook global BufSetOption filetype=(?:c|cpp) %{
+  set-option buffer formatcmd "clang-format --assume-filename='%val{buffile}'"
 }
 
 define-command apply-formatting -docstring 'Apply formatting with formatcmd or lsp' %{
@@ -39,3 +29,7 @@ define-command apply-formatting -docstring 'Apply formatting with formatcmd or l
     fi
   }
 }
+
+define-command biome -params .. -docstring 'Format project using biome' %{
+  info %sh{ npx biome check --fix "$@" && echo "Success" || echo "Failed" }
+}
diff --git a/autoload/git.kak b/autoload/git.kak
index 3c83a09..59ac173 100644
--- a/autoload/git.kak
+++ b/autoload/git.kak
@@ -15,6 +15,7 @@ map global user g ': enter-user-mode git<ret>' -docstring 'Git mode'
 map global git s ': gitui<ret>' -docstring 'Git tui'
 map global git A ': git add %val{buffile}<ret>' -docstring 'Add file'
 map global git m ': git-line-blame<ret>' -docstring 'Blame selection lines'
+map global git M ': git-file-blame<ret>' -docstring 'Blame buffer file'
 
 map global git d ': enter-user-mode git-d<ret>' -docstring 'Diff mode'
 map global git-d d ': git-open-diff<ret>' -docstring 'Open staged files'
@@ -42,6 +43,10 @@ define-command git-line-blame %{
     "git -p log -u -L '%sh{echo ""$kak_selection_desc"" | sed -E 's/\.[0-9]+//g'}:%val{buffile}' --color=always | delta"
 }
 
+define-command git-file-blame %{
+  terminal-singleton git-blame gitu blame %val{buffile}
+}
+
 define-command git-open-diff -params 0..1 %{
   eval %sh{ git diff --name-only "${1:-HEAD}" | sed 's/^/edit /' }
 }
diff --git a/autoload/orgmode.kak b/autoload/orgmode.kak
index b6ad623..8705018 100644
--- a/autoload/orgmode.kak
+++ b/autoload/orgmode.kak
@@ -3,6 +3,8 @@ hook global BufSetOption filetype=org %{
   map buffer normal <ret> ': orgmode-jump-link<ret>' -docstring 'Jump to link'
   map buffer user o ': enter-user-mode org<ret>' -docstring 'Org mode'
   map buffer org <tab> ': orgmode-toggle<ret>' -docstring 'Toggle checkbox/task'
+  map buffer org t ': orgmode-new-task<ret>' -docstring 'New task item'
+  map buffer org T ': orgmode-new-todo<ret>' -docstring 'New todo item'
 }
 
 def orgmode-toggle %{
@@ -30,6 +32,10 @@ def orgmode-jump-link %{
   } }
 }
 
+def orgmode-new-task %{ execute-keys '<esc>o- [ ] ' }
+
+def orgmode-new-todo %{ execute-keys '<esc>o** TODO ' }
+
 def orgmode-toggle-checkbox %{
   evaluate-commands %{
     execute-keys ',xs^(\h*-\h+)\[([Xx\- ])\]<ret>'
-- 
cgit v1.3.1