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

resolved merge conflict

Browse source
This commit is contained in:
Daniel Fichtinger 2025-06-13 15:43:05 -04:00
commit 110b65e396
31 changed files with 1662 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

23
.config/fish/config.fish
View file

@ -1,15 +1,14 @@
if status is-login
if not set -q __sourced_profile
set -x __sourced_profile 1
exec bash -c "\
test -e /etc/profile && source /etc/profile
test -e $HOME/.bash_profile && source $HOME/.bash_profile
exec fish --login
"
end
# if status is-login
# if not set -q __sourced_profile
# set -x __sourced_profile 1
# exec bash -c "\
# test -e /etc/profile && source /etc/profile
# test -e $HOME/.bash_profile && source $HOME/.bash_profile
# exec fish --login
# "
# end
set -e __sourced_profile
end
# end
if status is-interactive
# source ~/.config/fish/custom_cd.fish
@ -23,5 +22,7 @@ if status is-interactive
set -gx COLORTERM truecolor
set -gx TERM xterm-256color
end
end
set -gx EDITOR kak

1
.config/fish/fish_variables
View file

@ -2,6 +2,7 @@
# VERSION: 3.0
SETUVAR --export AUTOYADMPUSH:1
SETUVAR --export EDITOR:kak
SETUVAR --export IGREP_CUSTOM_EDITOR:kak\x20\x2b\x7bline_number\x7d\x20\x7bfile_name\x7d
SETUVAR --export KAKOUNE_POSIX_SHELL:/usr/bin/dash
SETUVAR --export XDG_CONFIG_HOME:/home/fic/\x2econfig
SETUVAR Z_DATA_DIR:/home/fic/\x2elocal/share/z

4
.config/fish/functions/kak-session.fish
View file

@ -86,6 +86,8 @@ function kak-session -w kak --description "kakoune where sessions are derived fr
cat $fifo >/dev/null
command rm -r "$fifo_dir"
# echo "hook -once global BufCreate ^(?!.*\\*scratch\\*).* %{ delete-buffer *scratch* }" | kak -p "$session_id"
# command kak -c "$session_id" -e 'delete-buffer! *scratch*' $flags $files
command kak -c "$session_id" -e 'try %{ delete-buffer *scratch*; bar-buflist; echo }' $flags $files
else
command kak -s "$session_id" -e "cd %[$kakroot]" $flags $files
@ -116,6 +118,8 @@ function kak-session -w kak --description "kakoune where sessions are derived fr
setsid kak -d -s "$session_id" -E "cd %[$git_dir]; echo -to-file $fifo ready" &
cat $fifo >/dev/null
command rm -r "$fifo_dir"
# echo "hook -once global BufCreate [*]scratch[*] %{ delete-buffer *scratch* }" | kak -p "$session_id"
# command kak -c "$session_id" -e 'delete-buffer! *scratch*' $flags $files
command kak -c "$session_id" -e 'try %{ delete-buffer *scratch*; bar-buflist; echo }' $flags $files
else
command kak -s "$session_id" -e "cd %[$git_dir]" $flags $files