kakoune: add kak-tree-sitter config for gotmpl

modify file
~/.local/share/kak-tree-sitter/queries/gotmpl/7275b7f85014aad7e15d4987ec4f2249572eecfb/injections.scm
adding:
((text) @injection.content
 (#set! injection.language "html")
 (#set! injection.combined))

kakoune/.config/kak-tree-sitter/config.toml

@@ -7,19 +7,6 @@ pin = "aa71f63de226c5592dfbfc1f29949522d7c95fac"
 url = "https://github.com/helix-editor/helix"
 pin = "7275b7f85014aad7e15d4987ec4f2249572eecfb"
 
-# odin
-[grammar.odin.source.git]
-url = "https://github.com/tree-sitter-grammars/tree-sitter-odin"
-pin = "d2ca8efb4487e156a60d5bd6db2598b872629403"
-
-[grammar.odin]
-compile_args = ["-c", "-fpic", "../scanner.c", "../parser.c", "-I", ".."]
-link_args = ["-shared", "-fpic", "scanner.o", "parser.o", "-o", "odin.so"]
-
-[language.odin.queries.source.git]
-url = "https://github.com/helix-editor/helix"
-pin = "7275b7f85014aad7e15d4987ec4f2249572eecfb"
-
 # templ
 [grammar.templ.source.git]
 url = "https://github.com/vrischmann/tree-sitter-templ"

kakoune/.config/kak/colors/five-colors-dark.kak

@@ -138,17 +138,14 @@ evaluate-commands %sh{
         set-face global ts_info $blue2
         set-face global ts_keyword $violet3
         set-face global ts_label $red1
-        set-face global ts_bold $green2+b
-        set-face global ts_markup_heading $red3
         set-face global ts_markup_italic $green2+i
         set-face global ts_markup_list_checked $red2
-        set-face global ts_markup_list_numbered $red2
-        set-face global ts_markup_list_unchecked $red2
-        set-face global ts_markup_list_unnumbered $red2
+        set-face global ts_markup_numbered $red2
+        set-face global ts_markup_unchecked $red2
         set-face global ts_markup_link_label $green2
         set-face global ts_markup_link_url $blue2
         set-face global ts_markup_link_uri $blue2
-        set-face global ts_markup_link_text $red1
+        set-face global ts_markup_link_uri $red1
         set-face global ts_markup_quote $blue3
         set-face global ts_markup_raw $yellow2
         set-face global ts_markup_strikethrough $red2+s

kakoune/.config/kak/colors/five-colors-light.kak

@@ -138,17 +138,14 @@ evaluate-commands %sh{
         set-face global ts_info $blue2
         set-face global ts_keyword $violet3
         set-face global ts_label $red1
-        set-face global ts_bold $green2+b
-        set-face global ts_markup_heading $red3
         set-face global ts_markup_italic $green2+i
         set-face global ts_markup_list_checked $red2
-        set-face global ts_markup_list_numbered $red2
-        set-face global ts_markup_list_unchecked $red2
-        set-face global ts_markup_list_unnumbered $red2
+        set-face global ts_markup_numbered $red2
+        set-face global ts_markup_unchecked $red2
         set-face global ts_markup_link_label $green2
         set-face global ts_markup_link_url $blue2
         set-face global ts_markup_link_uri $blue2
-        set-face global ts_markup_link_text $red1
+        set-face global ts_markup_link_uri $red1
         set-face global ts_markup_quote $blue3
         set-face global ts_markup_raw $yellow2
         set-face global ts_markup_strikethrough $red2+s

kakoune/.config/kak/kakrc

@@ -10,8 +10,6 @@ hook global WinCreate .* %{
 hook global BufCreate .*\.templ %{ set buffer filetype templ }
 hook global BufCreate .*\.html.tmpl %{ set buffer filetype gotmpl }
 
-hook global WinCreate ^[^*]+$ %{editorconfig-load}
-
 # LOCAL
 
 nop %sh{
@@ -38,8 +36,6 @@ map global -docstring 'Grep previous match' file-mode 'p' ': grep-prev-match<ret
 map global -docstring 'Grep current file' file-mode 'l' ':grep-file '
 map global -docstring 'Grep current file' file-mode 'L' ': grep-file %val{selection}<ret>'
 map global -docstring 'Delete buffer' file-mode 'x' ': delete-buffer '
-map global -docstring 'REPL send selection' file-mode 'u' ': repl-send-text<ret>'
-map global -docstring 'REPL send paragraph' file-mode 'U' ': repl-send-paragraph<ret>'
 
 declare-user-mode git-mode
 map global -docstring 'Git' user 'g' ': enter-user-mode git-mode<ret>'
@@ -129,10 +125,6 @@ define-command -override open-create-in-dir %{
     execute-keys ': edit ' %sh{dirname "$kak_buffile"}/
 }
 
-define-command -override repl-send-paragraph %{
-    execute-keys -draft '<a-i>p: repl-send-text<ret>'
-}
-
 define-command git-log-show-current-commit %{
     execute-keys ';<a-/>^commit\s[0-9a-f]+<ret>b'
     git show %val{selection}

kakoune/.config/kak/scripts/filesymbols.awk

@@ -2,7 +2,7 @@
     for (i = 3; i < NF; ++i) {
         if ($i ~ /^[0-9]+$/) {
             j = match($0, "[ ]+" $(i-1) "[ ]+" $i " ")
-            print substr($0, 0, j - 1) "·" $(i-1) "·" $i
+            print substr($0, 0, j - 1) "\u00a0" $(i-1) "\u00a0" $i
             break
         }
     }

kakoune/.config/kak/scripts/filesymbolscmd.awk

@@ -1,5 +1,5 @@
 BEGIN {
-    n = split(ENVIRON["kak_text"], a, "·")
+    n = split(ENVIRON["kak_text"], a, "\u00a0")
     line = a[3]
     if (n == 3 && line ~ /^[0-9]+/) {
         pat = a[1]

kakoune/.config/kak/scripts/projectsymbols.awk

@@ -2,7 +2,7 @@
     for (i = 3; i < NF; ++i) {
         if ($i ~ /^[0-9]+$/) {
             j = match($0, "[ ]+" $(i-1) "[ ]+" $i " ")
-            print substr($0, 0, j - 1) "·" $(i-1) "·" $i "·" $(i+1)
+            print substr($0, 0, j - 1) "\u00a0" $(i-1) "\u00a0" $i "\u00a0" $(i+1)
             break
         }
     }

kakoune/.config/kak/scripts/projectsymbolscmd.awk

@@ -1,5 +1,5 @@
 BEGIN {
-    n = split(ENVIRON["kak_text"], a, "·")
+    n = split(ENVIRON["kak_text"], a, "\u00a0")
     line = a[3]
     if (n == 4 && line ~ /^[0-9]+/) {
         pat = a[1]

lazygit-use-zsh/.config/lazygit/bin/bash

@@ -1 +0,0 @@
-/bin/zsh

lazygit-use-zsh/bin/lazygit

@@ -1,2 +0,0 @@
-#!/bin/sh
-PATH="$PATH:$HOME/.config/lazygit/bin" exec /usr/bin/lazygit "$@"

lazygit/.config/lazygit/config.yml

@@ -11,6 +11,3 @@ gui:
   theme:
     selectedLineBgColor:
       - reverse
-
-git:
-    autoFetch: false

shell/.ashrc

@@ -1,5 +0,0 @@
-alias k=kak
-alias kc='kak -c "$(kak -l | fzf)"'
-alias kd='kak -s "$(printf %s $PWD | xargs basename)"'
-alias lg=lazygit
-alias z='cd $(fzf --walker dir --walker-root ~)'

shell/.profile

@@ -38,14 +38,12 @@ fi
 export GOPATH=~/.cache/go
 export GOBIN=~/.local/bin
 
-export ENV=~/.ashrc
-
 # start X or Hyprland at login
 if [ -z "$DISPLAY" -a -z "$WAYLAND_DISPLAY" -a "$(tty)" = /dev/tty1 ]; then
     if which /usr/bin/sx > /dev/null; then
-        exec /usr/bin/sx ~/.xinitrc
+        exec /usr/bin/sx ~/.xsession
     elif which /usr/bin/startx > /dev/null; then
-        exec /usr/bin/startx
+        exec /usr/bin/startx ~/.xsession
     elif which niri > /dev/null; then
         exec niri
     elif which river argen > /dev/null; then