ficd/dotfiles
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

AutoYADM commit: 2025-05-13 00:24:08

Browse source
This commit is contained in:
Daniel Fichtinger 2025-05-13 00:24:08 -04:00
parent 60b473bee5
commit dbbd98c78c
4 changed files with 109 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.config/kak/autoload/filetype.kak
View file

@ -18,5 +18,6 @@ hook global WinSetOption filetype=markdown %{
} }
hook global BufCreate .*[.](typ|typst) %{ hook global BufCreate .*[.](typ|typst) %{
set-option buffer filetype typst set-option buffer filetype typst
set-option buffer formatcmd "typstyle --wrap-text"
} }

1
.config/kak/autoload/plugins.kak
View file

@ -71,4 +71,3 @@ bundle vertical-selection https://github.com/occivink/kakoune-vertical-selection
bundle kakoune-text-objects https://github.com/Delapouite/kakoune-text-objects %{ bundle kakoune-text-objects https://github.com/Delapouite/kakoune-text-objects %{
map global user s ': enter-user-mode selectors<ret>' -docstring 'selectors' map global user s ': enter-user-mode selectors<ret>' -docstring 'selectors'
} }

212
.config/kak/autoload/vim-tab.kak
View file

@ -1,110 +1,110 @@
# Replicate expandtab from vim. # # Replicate expandtab from vim.
declare-option -docstring "Expand <tab> to spaces based on tabstop." bool expandtab yes # declare-option -docstring "Expand <tab> to spaces based on tabstop." bool expandtab yes
# Replicate softtabstop from vim. # # Replicate softtabstop from vim.
declare-option -docstring "Make tabstop number of spaces feel like a <tab> when pressing <tab> or <backspace> in insert mode." int softtabstop 4 # declare-option -docstring "Make tabstop number of spaces feel like a <tab> when pressing <tab> or <backspace> in insert mode." int softtabstop 4
# Helper function for inserting a <tab> # # Helper function for inserting a <tab>
def softtabstop-insert-tab -hidden %{ # def softtabstop-insert-tab -hidden %{
evaluate-commands -no-hooks -draft -itersel %{ # evaluate-commands -no-hooks -draft -itersel %{
try %sh{ # try %sh{
tabstop=$kak_opt_softtabstop # tabstop=$kak_opt_softtabstop
if [ $tabstop -lt 0 ]; then # if [ $tabstop -lt 0 ]; then
tabstop=$kak_opt_indentwidth # tabstop=$kak_opt_indentwidth
fi # fi
# Determine if this is an append operation (end column > start column). If so, prefix with ';' # # Determine if this is an append operation (end column > start column). If so, prefix with ';'
prefix=$(echo $kak_selections_display_column_desc | awk -F '[.,]' '{if($4 > $2) {print ";"}}') # prefix=$(echo $kak_selections_display_column_desc | awk -F '[.,]' '{if($4 > $2) {print ";"}}')
if [ $tabstop -eq 0 ]; then # if [ $tabstop -eq 0 ]; then
# if tabstop is 0 that means we are just inserting tabs # # if tabstop is 0 that means we are just inserting tabs
printf "execute-keys '${prefix}i<tab><esc>'\n" # printf "execute-keys '${prefix}i<tab><esc>'\n"
# expand tabs to spaces if needed # # expand tabs to spaces if needed
[ $kak_opt_expandtab = "true" ] && printf "%s\n" 'execute-keys h<ret>@' # [ $kak_opt_expandtab = "true" ] && printf "%s\n" 'execute-keys h<ret>@'
else # else
# compute the number of spaces needed to reach the next softtabstop # # compute the number of spaces needed to reach the next softtabstop
display_column=$((kak_cursor_display_column - 1)) # adjust for 1-based indexing # display_column=$((kak_cursor_display_column - 1)) # adjust for 1-based indexing
end_column=$((display_column % tabstop)) # end_column=$((display_column % tabstop))
space_count=$((tabstop - end_column)) # space_count=$((tabstop - end_column))
# insert enough spaces to reach the next softtabstop # # insert enough spaces to reach the next softtabstop
printf "execute-keys '${prefix}i%${space_count}s<esc>'\n" # printf "execute-keys '${prefix}i%${space_count}s<esc>'\n"
# if not expanding tabs, convert *all* preceding whitespace to a mix of spaces and # # if not expanding tabs, convert *all* preceding whitespace to a mix of spaces and
# tabs, not just the spaces that were inserted (this is how vim behaves) # # tabs, not just the spaces that were inserted (this is how vim behaves)
[ $kak_opt_expandtab = "false" ] && printf "execute-keys '<a-?>\h+<ret><a-:>H<a-@>'" # [ $kak_opt_expandtab = "false" ] && printf "execute-keys '<a-?>\h+<ret><a-:>H<a-@>'"
fi # fi
} # }
} # }
}
# Helper function for deleting whitespace a <tab>
def softtabstop-insert-backspace -hidden %{
evaluate-commands -no-hooks -draft -itersel -save-regs ^ %{
# save off the current selection in case the try block fails
try %sh{
tabstop=$kak_opt_softtabstop
if [ $tabstop -lt 0 ]; then
tabstop=$kak_opt_indentwidth
fi
if [ $tabstop -gt 0 ]; then
# compute the end display column based on tabstop and the number of
# number spaces needed to reach it
display_column=$((kak_cursor_display_column - 1)) # adjust for 1-based indexing
num_spaces=$((display_column % tabstop))
[ $num_spaces -eq 0 ] && num_spaces=$tabstop
end_display_column=$((display_column - num_spaces))
# extract any preceding whitespace
echo "evaluate-commands -draft %{
execute-keys '<a-?>\h+<ret><a-;>H'
echo -to-file $kak_response_fifo %val{selection}
}" > $kak_command_fifo
whitespace="$(cat $kak_response_fifo)"
# count the number of mixed tabs and spaces needed to reach the end display column
tab=$(printf "\t")
num_whitespaces=0
adjust_cursor="<a-:>;"
while [ -z "$non_ws" ] \
&& [ -n "$whitespace" ] \
&& [ $display_column -gt $end_display_column ];
do
# iterate over the whitespace right-to-left, early out after reaching the
# first non whitespace
prefix=${whitespace%?};
ws="${whitespace#$prefix}";
case "$ws" in
$tab) display_column=$((display_column - $kak_opt_tabstop));
# the first whitespace encountered is a tab. when '@' is pressed, the
# cursor moves (or extends) one char to the right. account for this here
[ $num_whitespaces -eq 0 ] && adjust_cursor="${adjust_cursor}h";;
" ") display_column=$((display_column - 1));;
*) non_ws="true";;
esac
whitespace=$prefix;
if [ -z "$non_ws" ]; then
num_whitespaces=$((num_whitespaces + 1));
fi
done
if [ $num_whitespaces -gt 0 ]; then
# * select the number of mixed tabs and spaces computed above
# * convert to spaces and adjust the cursor position
# * select the number of spaces to reach the end column and delete them
echo "execute-keys '<a-:>;h<a-?>\h{$((num_whitespaces - 1))}<ret>@${adjust_cursor}<a-?> {,$((num_spaces - 1))}<ret>d'"
else
echo "fail"
fi
else
echo "fail"
fi
} catch %{
# in normal mode, delete previous character
execute-keys 'hd'
}
}
}
# Use a hook to enable/disable key mappings such that '\' properly allows disabling specialized <tab> behavior
# hook global ModeChange 'push:.+:insert' %{
# map buffer insert <tab> '<a-;>:softtabstop-insert-tab<ret>'
# map buffer insert <backspace> '<a-;>:softtabstop-insert-backspace<ret>'
# } # }
# hook global ModeChange 'pop:insert:normal' %{
# unmap buffer insert <tab> '<a-;>:softtabstop-insert-tab<ret>' # # Helper function for deleting whitespace a <tab>
# unmap buffer insert <backspace> '<a-;>:softtabstop-insert-backspace<ret>' # def softtabstop-insert-backspace -hidden %{
# evaluate-commands -no-hooks -draft -itersel -save-regs ^ %{
# # save off the current selection in case the try block fails
# try %sh{
# tabstop=$kak_opt_softtabstop
# if [ $tabstop -lt 0 ]; then
# tabstop=$kak_opt_indentwidth
# fi
# if [ $tabstop -gt 0 ]; then
# # compute the end display column based on tabstop and the number of
# # number spaces needed to reach it
# display_column=$((kak_cursor_display_column - 1)) # adjust for 1-based indexing
# num_spaces=$((display_column % tabstop))
# [ $num_spaces -eq 0 ] && num_spaces=$tabstop
# end_display_column=$((display_column - num_spaces))
# # extract any preceding whitespace
# echo "evaluate-commands -draft %{
# execute-keys '<a-?>\h+<ret><a-;>H'
# echo -to-file $kak_response_fifo %val{selection}
# }" > $kak_command_fifo
# whitespace="$(cat $kak_response_fifo)"
# # count the number of mixed tabs and spaces needed to reach the end display column
# tab=$(printf "\t")
# num_whitespaces=0
# adjust_cursor="<a-:>;"
# while [ -z "$non_ws" ] \
# && [ -n "$whitespace" ] \
# && [ $display_column -gt $end_display_column ];
# do
# # iterate over the whitespace right-to-left, early out after reaching the
# # first non whitespace
# prefix=${whitespace%?};
# ws="${whitespace#$prefix}";
# case "$ws" in
# $tab) display_column=$((display_column - $kak_opt_tabstop));
# # the first whitespace encountered is a tab. when '@' is pressed, the
# # cursor moves (or extends) one char to the right. account for this here
# [ $num_whitespaces -eq 0 ] && adjust_cursor="${adjust_cursor}h";;
# " ") display_column=$((display_column - 1));;
# *) non_ws="true";;
# esac
# whitespace=$prefix;
# if [ -z "$non_ws" ]; then
# num_whitespaces=$((num_whitespaces + 1));
# fi
# done
# if [ $num_whitespaces -gt 0 ]; then
# # * select the number of mixed tabs and spaces computed above
# # * convert to spaces and adjust the cursor position
# # * select the number of spaces to reach the end column and delete them
# echo "execute-keys '<a-:>;h<a-?>\h{$((num_whitespaces - 1))}<ret>@${adjust_cursor}<a-?> {,$((num_spaces - 1))}<ret>d'"
# else
# echo "fail"
# fi
# else
# echo "fail"
# fi
# } catch %{
# # in normal mode, delete previous character
# execute-keys 'hd'
# }
# }
# } # }
# # Use a hook to enable/disable key mappings such that '\' properly allows disabling specialized <tab> behavior
# # hook global ModeChange 'push:.+:insert' %{
# # map buffer insert <tab> '<a-;>:softtabstop-insert-tab<ret>'
# # map buffer insert <backspace> '<a-;>:softtabstop-insert-backspace<ret>'
# # }
# # hook global ModeChange 'pop:insert:normal' %{
# # unmap buffer insert <tab> '<a-;>:softtabstop-insert-tab<ret>'
# # unmap buffer insert <backspace> '<a-;>:softtabstop-insert-backspace<ret>'
# # }

3
.config/kak/kakrc
View file

@ -20,7 +20,6 @@ define-command trampoline -docstring "open a tutorial" %{
} }
set-option global tabstop 4 set-option global tabstop 4
set-option global indentwidth 4 set-option global indentwidth 4
set-option global scrolloff 3,3 set-option global scrolloff 3,3
@ -109,3 +108,5 @@ def git_blame %{
map -docstring "blame" global git b ": git_blame" map -docstring "blame" global git b ": git_blame"
map -docstring "format" global user F ": format<ret>" map -docstring "format" global user F ": format<ret>"