Compare commits
8
Commits
wip
..
d2b7671987
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d2b7671987 | ||
|
|
2820b395c2 | ||
|
|
c5cd01cbc4 | ||
|
|
b4ab641fb7 | ||
|
|
d63711ed06 | ||
|
|
a6e37c95d7 | ||
|
|
b9ed91ed57 | ||
|
|
bc41c5ff77 |
@@ -10,8 +10,6 @@ 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{
|
||||||
@@ -38,15 +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 '
|
||||||
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 fossil-mode
|
|
||||||
map global -docstring 'Fossil' user 'f' ': enter-user-mode fossil-mode<ret>'
|
|
||||||
|
|
||||||
map global -docstring 'Open file' fossil-mode 'a' ': file-open-fossil<ret>'
|
|
||||||
map global -docstring 'Grep' fossil-mode 'g' ':fossil-grep '
|
|
||||||
map global -docstring 'ctags project symbols' fossil-mode 'w' ': ctags-project-fossil-symbols<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>'
|
||||||
@@ -87,7 +76,6 @@ map global -docstring 'Code' user 'c' ': enter-user-mode code-mode<ret>'
|
|||||||
|
|
||||||
map global -docstring 'Comment block' code-mode 'b' ': comment-block<ret>'
|
map global -docstring 'Comment block' code-mode 'b' ': comment-block<ret>'
|
||||||
map global -docstring 'Comment line' code-mode 'l' ': comment-line<ret>'
|
map global -docstring 'Comment line' code-mode 'l' ': comment-line<ret>'
|
||||||
map global -docstring 'Format buffer' code-mode 'f' ': format-buffer<ret>'
|
|
||||||
|
|
||||||
evaluate-commands %sh{
|
evaluate-commands %sh{
|
||||||
if [ -n "$WAYLAND_DISPLAY" ]; then
|
if [ -n "$WAYLAND_DISPLAY" ]; then
|
||||||
@@ -121,16 +109,6 @@ define-command -override file-open-git %{
|
|||||||
prompt -menu -shell-script-candidates %{ git ls-files } 'File (git): ' %{ edit -- %val{text} }
|
prompt -menu -shell-script-candidates %{ git ls-files } 'File (git): ' %{ edit -- %val{text} }
|
||||||
}
|
}
|
||||||
|
|
||||||
define-command -override file-open-fossil %{
|
|
||||||
prompt -menu -shell-script-candidates %{ fossil ls } 'File (fossil): ' %{ edit -- %val{text} }
|
|
||||||
}
|
|
||||||
|
|
||||||
define-command -override fossil-grep -params 1- %{
|
|
||||||
evaluate-commands %sh{
|
|
||||||
printf '%s ' grep "$@" -- $(fossil ls)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
define-command -override file-open-recent %{
|
define-command -override file-open-recent %{
|
||||||
prompt -menu -shell-script-candidates %{ cat ~/.cache/kak-mru } 'File (recent): ' %{ edit -- %val{text} }
|
prompt -menu -shell-script-candidates %{ cat ~/.cache/kak-mru } 'File (recent): ' %{ edit -- %val{text} }
|
||||||
}
|
}
|
||||||
@@ -147,10 +125,6 @@ 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}
|
||||||
@@ -182,35 +156,18 @@ define-command -override ctags-project-symbols %{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
define-command -override ctags-project-fossil-symbols %{
|
|
||||||
prompt -menu -shell-script-candidates %{
|
|
||||||
fossil ls | xargs wc | awk '$1 > 0 && $3/$1 < 1024 { print $4 }' | xargs ctags -uo - -x | awk -f "$kak_config/scripts/projectsymbols.awk"
|
|
||||||
} 'Project symbols: ' %{
|
|
||||||
evaluate-commands %sh{ awk -f "$kak_config/scripts/projectsymbolscmd.awk" # "$kak_text" }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
set-face global JumpLabel 'rgb:faf8f5,rgb:af8842+F'
|
set-face global JumpLabel 'rgb:faf8f5,rgb:af8842+F'
|
||||||
|
|
||||||
# CHANGE CURSOR IN INSERT MODE
|
# CHANGE STATUS BAR COLOR IN INSERT MODE
|
||||||
|
|
||||||
hook global ModeChange (push|pop):.*:insert %{
|
hook global ModeChange push:.*:insert %{
|
||||||
set-face window PrimarySelection rgb:000000,green+F
|
set-face window StatusLine 'default,rgb:04785d'
|
||||||
set-face window SecondarySelection rgb:000000,blue+F
|
set-option window idle_timeout 500
|
||||||
set-face window PrimaryCursor rgb:000000,bright-green+bF
|
|
||||||
set-face window SecondaryCursor rgb:000000,bright-blue+bF
|
|
||||||
set-face window PrimaryCursorEol rgb:000000,bright-red+bF
|
|
||||||
set-face window SecondaryCursorEol rgb:000000,bright-yellow+bF
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# Undo colour changes when we leave insert mode.
|
hook global ModeChange pop:insert:.* %{
|
||||||
hook global ModeChange (push|pop):insert:.* %{
|
unset-face window StatusLine
|
||||||
unset-face window PrimarySelection
|
unset-option window idle_timeout
|
||||||
unset-face window SecondarySelection
|
|
||||||
unset-face window PrimaryCursor
|
|
||||||
unset-face window SecondaryCursor
|
|
||||||
unset-face window PrimaryCursorEol
|
|
||||||
unset-face window SecondaryCursorEol
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# ODIN
|
# ODIN
|
||||||
@@ -279,36 +236,6 @@ bundle match 'https://github.com/kmafeni04/match.kak' %{
|
|||||||
map global match U ': match-surround-redo<ret>' -docstring "Redo"
|
map global match U ': match-surround-redo<ret>' -docstring "Redo"
|
||||||
}
|
}
|
||||||
|
|
||||||
# PICKERS
|
|
||||||
|
|
||||||
bundle pickers https://codeberg.org/kmafeni04/pickers.kak %{
|
|
||||||
declare-user-mode pickers
|
|
||||||
map global user u ':enter-user-mode pickers<ret>' -docstring 'pickers mode'
|
|
||||||
map global pickers b ':pickers-buffer<ret>' -docstring 'Open fuzzy buffer picker'
|
|
||||||
map global pickers i ':pickers-buffer-info<ret>' -docstring 'Show currently open buffers'
|
|
||||||
map global pickers a ':pickers-buffer-alternate<ret>' -docstring 'Switch to previously opened buffer'
|
|
||||||
map global pickers f ':pickers-file<ret>' -docstring 'Open fuzzy file picker in git root or current working directory'
|
|
||||||
map global pickers n ':pickers-file /home/lupan/notes/<ret>' -docstring 'Open fuzzy file picker in notes directory'
|
|
||||||
map global pickers o ':pickers-file-cbd<ret>' -docstring "Open fuzzy file picker in current buffer's directory"
|
|
||||||
map global pickers g ':pickers-grep<ret>' -docstring "Open grep picker in git root"
|
|
||||||
map global pickers G "<dquote>/y:pickers-grep<ret>" -docstring "Open grep picker in git root with selection as init"
|
|
||||||
map global pickers <a-g> ':pickers-grep-cbd<ret>' -docstring "Open grep picker in buffer's directory"
|
|
||||||
map global pickers <a-G> "<dquote>/y:pickers-grep-cbd<ret>" -docstring "Open grep picker in buffer's directory with selection as init"
|
|
||||||
|
|
||||||
hook global WinCreate \*pickers-grep\* %{
|
|
||||||
map window normal <ret> ':pickers-grep-open<ret>'
|
|
||||||
map window normal <a-ret> "%%s<ret>)" -docstring "Select all matched grep text"
|
|
||||||
alias window write pickers-grep-write
|
|
||||||
alias window w pickers-grep-write
|
|
||||||
}
|
|
||||||
hook global WinCreate \*pickers-file\* %{
|
|
||||||
map window normal <ret> ':pickers-file-open<ret>'
|
|
||||||
}
|
|
||||||
hook global WinCreate \*pickers-buffer\* %{
|
|
||||||
map window normal <ret> ':pickers-buffer-open<ret>'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# HARPOON
|
# HARPOON
|
||||||
|
|
||||||
bundle kak-harpoon 'https://codeberg.org/raiguard/kak-harpoon' %{
|
bundle kak-harpoon 'https://codeberg.org/raiguard/kak-harpoon' %{
|
||||||
@@ -319,8 +246,6 @@ bundle kak-harpoon 'https://codeberg.org/raiguard/kak-harpoon' %{
|
|||||||
|
|
||||||
eval %sh{ kak-tree-sitter -dks --init $kak_session }
|
eval %sh{ kak-tree-sitter -dks --init $kak_session }
|
||||||
|
|
||||||
map global -docstring 'Tree-sitter' user 't' ': enter-user-mode tree-sitter<ret>'
|
|
||||||
|
|
||||||
define-command -override tree-sitter-user-after-highlighter %{
|
define-command -override tree-sitter-user-after-highlighter %{
|
||||||
add-highlighter -override buffer/show-matching show-matching
|
add-highlighter -override buffer/show-matching show-matching
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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) "·" $(i-1) "·" $i
|
print substr($0, 0, j - 1) "\u00a0" $(i-1) "\u00a0" $i
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
BEGIN {
|
BEGIN {
|
||||||
n = split(ENVIRON["kak_text"], a, "·")
|
n = split(ENVIRON["kak_text"], a, "\u00a0")
|
||||||
line = a[3]
|
line = a[3]
|
||||||
if (n == 3 && line ~ /^[0-9]+/) {
|
if (n == 3 && line ~ /^[0-9]+/) {
|
||||||
pat = a[1]
|
pat = a[1]
|
||||||
|
|||||||
@@ -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) "·" $(i-1) "·" $i "·" $(i+1)
|
print substr($0, 0, j - 1) "\u00a0" $(i-1) "\u00a0" $i "\u00a0" $(i+1)
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
BEGIN {
|
BEGIN {
|
||||||
n = split(ENVIRON["kak_text"], a, "·")
|
n = split(ENVIRON["kak_text"], a, "\u00a0")
|
||||||
line = a[3]
|
line = a[3]
|
||||||
if (n == 4 && line ~ /^[0-9]+/) {
|
if (n == 4 && line ~ /^[0-9]+/) {
|
||||||
pat = a[1]
|
pat = a[1]
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
/bin/zsh
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
PATH="$PATH:$HOME/.config/lazygit/bin" exec /usr/bin/lazygit "$@"
|
|
||||||
@@ -11,6 +11,3 @@ gui:
|
|||||||
theme:
|
theme:
|
||||||
selectedLineBgColor:
|
selectedLineBgColor:
|
||||||
- reverse
|
- reverse
|
||||||
|
|
||||||
git:
|
|
||||||
autoFetch: false
|
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ unfocused_opacity=1.0
|
|||||||
|
|
||||||
# Animation Configuration(support type:zoom,slide)
|
# Animation Configuration(support type:zoom,slide)
|
||||||
# tag_animation_direction: 1-horizontal,0-vertical
|
# tag_animation_direction: 1-horizontal,0-vertical
|
||||||
animations=0
|
animations=1
|
||||||
layer_animations=1
|
layer_animations=1
|
||||||
animation_type_open=slide
|
animation_type_open=slide
|
||||||
animation_type_close=slide
|
animation_type_close=slide
|
||||||
@@ -98,7 +98,6 @@ focus_cross_tag=0
|
|||||||
enable_floating_snap=0
|
enable_floating_snap=0
|
||||||
snap_distance=30
|
snap_distance=30
|
||||||
cursor_size=24
|
cursor_size=24
|
||||||
cursor_theme=breeze_cursors
|
|
||||||
drag_tile_to_tile=1
|
drag_tile_to_tile=1
|
||||||
drag_tile_small=1
|
drag_tile_small=1
|
||||||
|
|
||||||
@@ -125,10 +124,10 @@ swipe_min_threshold=1
|
|||||||
mouse_natural_scrolling=0
|
mouse_natural_scrolling=0
|
||||||
|
|
||||||
# Appearance
|
# Appearance
|
||||||
gappih=2
|
gappih=5
|
||||||
gappiv=2
|
gappiv=5
|
||||||
gappoh=0
|
gappoh=10
|
||||||
gappov=0
|
gappov=10
|
||||||
scratchpad_width_ratio=0.8
|
scratchpad_width_ratio=0.8
|
||||||
scratchpad_height_ratio=0.9
|
scratchpad_height_ratio=0.9
|
||||||
borderpx=4
|
borderpx=4
|
||||||
|
|||||||
@@ -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 ~)'
|
|
||||||
+2
-4
@@ -38,14 +38,12 @@ 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 ~/.xinitrc
|
exec /usr/bin/sx ~/.xsession
|
||||||
elif which /usr/bin/startx > /dev/null; then
|
elif which /usr/bin/startx > /dev/null; then
|
||||||
exec /usr/bin/startx
|
exec /usr/bin/startx ~/.xsession
|
||||||
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
|
||||||
|
|||||||
Reference in New Issue
Block a user