Compare commits

..

14 Commits

Author SHA1 Message Date
506abc9f1c xsession: rename .xsession to .xinitrc (note: restow needed) 2026-07-18 12:28:02 +02:00
6949fb75a0 kakoune: add keys to send selection and paragraph to the repl 2026-07-18 00:27:15 +02:00
6034323fb9 lazygit-use-zsh: trick lazygit to use zsh instead of bash 2026-07-17 23:08:57 +02:00
6e82a49ba6 shell: add aliases for ash shell 2026-07-17 23:08:48 +02:00
4719e8d355 kakoune: use editorconfig; lazygit: disable auto fetch 2026-07-17 23:08:41 +02:00
2d79c5728a kakoune: fix for busybox awk: use middle dot unicode character instead of unicode escape for nbsp 2026-07-17 23:08:35 +02:00
7c91379f6c kakoune: add kak-tree-sitter config for odin 2026-07-17 23:08:25 +02:00
f7a7f031ff 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))
2026-07-17 23:08:20 +02:00
994e3b4662 kakoune: add kak-tree-sitter config for templ 2026-07-17 23:08:13 +02:00
6a5f15c86b kakoune: use kak-tree-sitter, update five-colors themes 2026-07-17 23:08:08 +02:00
61b6984dca lupan-set-theme: now works with busybox readlink 2026-07-17 23:08:00 +02:00
fdc95f72e3 kakoune: keys to comment block and line 2026-07-17 23:07:50 +02:00
f375076fe1 waybar: restart on theme change 2026-07-17 23:07:43 +02:00
ac18f6be8b mango config with waybar 2026-07-17 23:07:18 +02:00
14 changed files with 52 additions and 12 deletions

View File

@@ -7,6 +7,19 @@ pin = "aa71f63de226c5592dfbfc1f29949522d7c95fac"
url = "https://github.com/helix-editor/helix" url = "https://github.com/helix-editor/helix"
pin = "7275b7f85014aad7e15d4987ec4f2249572eecfb" 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 # templ
[grammar.templ.source.git] [grammar.templ.source.git]
url = "https://github.com/vrischmann/tree-sitter-templ" url = "https://github.com/vrischmann/tree-sitter-templ"

View File

@@ -138,14 +138,17 @@ evaluate-commands %sh{
set-face global ts_info $blue2 set-face global ts_info $blue2
set-face global ts_keyword $violet3 set-face global ts_keyword $violet3
set-face global ts_label $red1 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_italic $green2+i
set-face global ts_markup_list_checked $red2 set-face global ts_markup_list_checked $red2
set-face global ts_markup_numbered $red2 set-face global ts_markup_list_numbered $red2
set-face global ts_markup_unchecked $red2 set-face global ts_markup_list_unchecked $red2
set-face global ts_markup_list_unnumbered $red2
set-face global ts_markup_link_label $green2 set-face global ts_markup_link_label $green2
set-face global ts_markup_link_url $blue2 set-face global ts_markup_link_url $blue2
set-face global ts_markup_link_uri $blue2 set-face global ts_markup_link_uri $blue2
set-face global ts_markup_link_uri $red1 set-face global ts_markup_link_text $red1
set-face global ts_markup_quote $blue3 set-face global ts_markup_quote $blue3
set-face global ts_markup_raw $yellow2 set-face global ts_markup_raw $yellow2
set-face global ts_markup_strikethrough $red2+s set-face global ts_markup_strikethrough $red2+s

View File

@@ -138,14 +138,17 @@ evaluate-commands %sh{
set-face global ts_info $blue2 set-face global ts_info $blue2
set-face global ts_keyword $violet3 set-face global ts_keyword $violet3
set-face global ts_label $red1 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_italic $green2+i
set-face global ts_markup_list_checked $red2 set-face global ts_markup_list_checked $red2
set-face global ts_markup_numbered $red2 set-face global ts_markup_list_numbered $red2
set-face global ts_markup_unchecked $red2 set-face global ts_markup_list_unchecked $red2
set-face global ts_markup_list_unnumbered $red2
set-face global ts_markup_link_label $green2 set-face global ts_markup_link_label $green2
set-face global ts_markup_link_url $blue2 set-face global ts_markup_link_url $blue2
set-face global ts_markup_link_uri $blue2 set-face global ts_markup_link_uri $blue2
set-face global ts_markup_link_uri $red1 set-face global ts_markup_link_text $red1
set-face global ts_markup_quote $blue3 set-face global ts_markup_quote $blue3
set-face global ts_markup_raw $yellow2 set-face global ts_markup_raw $yellow2
set-face global ts_markup_strikethrough $red2+s set-face global ts_markup_strikethrough $red2+s

View File

@@ -10,6 +10,8 @@ hook global WinCreate .* %{
hook global BufCreate .*\.templ %{ set buffer filetype templ } hook global BufCreate .*\.templ %{ set buffer filetype templ }
hook global BufCreate .*\.html.tmpl %{ set buffer filetype gotmpl } hook global BufCreate .*\.html.tmpl %{ set buffer filetype gotmpl }
hook global WinCreate ^[^*]+$ %{editorconfig-load}
# LOCAL # LOCAL
nop %sh{ nop %sh{
@@ -36,6 +38,8 @@ 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 '
map global -docstring 'Grep current file' file-mode 'L' ': grep-file %val{selection}<ret>' 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 '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 declare-user-mode git-mode
map global -docstring 'Git' user 'g' ': enter-user-mode git-mode<ret>' map global -docstring 'Git' user 'g' ': enter-user-mode git-mode<ret>'
@@ -125,6 +129,10 @@ define-command -override open-create-in-dir %{
execute-keys ': edit ' %sh{dirname "$kak_buffile"}/ 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 %{ define-command git-log-show-current-commit %{
execute-keys ';<a-/>^commit\s[0-9a-f]+<ret>b' execute-keys ';<a-/>^commit\s[0-9a-f]+<ret>b'
git show %val{selection} git show %val{selection}

View File

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

View File

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

View File

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

View File

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

View File

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

2
lazygit-use-zsh/bin/lazygit Executable file
View File

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

View File

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

5
shell/.ashrc Normal file
View File

@@ -0,0 +1,5 @@
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 ~)'

View File

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