diff --git a/.config/scripts/new-session.sh b/.config/scripts/new-session.sh deleted file mode 100755 index d0da521..0000000 --- a/.config/scripts/new-session.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash - -dir=${1:-} - -[ -z "${dir}" ] && dir=$(find $HOME/Documents/gitlab -mindepth 2 -maxdepth 2 -type d | awk -F/ '{print $(NF-1)"/"$NF " " $0}' | fzf --reverse --header "New Session" --with-nth=1 | awk '{print $2}') -[ -z "$dir" ] && return 1 - -name=$(basename "$dir") -if [[ $name == .* ]]; then - name=${name#.} -fi - -tmux has-session -t ${name} >/dev/null && { - tmux switch-client -t ${name} - return -} -tmux new-session -d -s "$name" -c "$dir" -RIGHT_PANE_WIDTH=60 -BOTTOM_PANE_WIDTH=15 -tmux split-window -h -t "$name:1" -c "$dir" -tmux resize-pane -t "$name:1.2" -x $RIGHT_PANE_WIDTH -tmux split-window -v -t "$name:1.1" -c "$dir" -tmux resize-pane -t "$name:1.1" -y $(($(tmux display -p '#{window_height}') - $BOTTOM_PANE_WIDTH)) -tmux new-window "$name" -n lazygit -c "$dir" -sleep 1 -tmux send-keys -t "$name:1.1" 'set-env; nvim' C-m -sleep 0.1 -tmux send-keys -t "$name:1.3" 'set-env; nvim +CodeCompanionChat -c only' C-m -sleep 1 -tmux send-keys -t "$name:2" 'lg' C-m -tmux select-window -t "$name:1" -tmux select-pane -t "$name:1.1" -tmux switch-client -t "$name" diff --git a/.config/scripts/sessions.sh b/.config/scripts/sessions.sh old mode 100644 new mode 100755 index 8ed11bc..2a9ab01 --- a/.config/scripts/sessions.sh +++ b/.config/scripts/sessions.sh @@ -1,11 +1,10 @@ #!/bin/bash -action=${1:-} +new() { -[ -z "$action" ] && echo "Please enter an action" && return 1 + dir=${1:-} -if [[ $action == "new" ]]; then - dir=$(find $HOME/Documents/gitlab -mindepth 2 -maxdepth 2 -type d | awk -F/ '{print $(NF-1)"/"$NF " " $0}' | fzf --no-preview --reverse --header "New Session" --with-nth=1 | awk '{print $2}') + [ -z "${dir}" ] && dir=$(find $HOME/Documents/gitlab -mindepth 2 -maxdepth 2 -type d | awk -F/ '{print $(NF-1)"/"$NF " " $0}' | fzf --reverse --header "New Session" --with-nth=1 | awk '{print $2}') [ -z "$dir" ] && return 1 name=$(basename "$dir") @@ -24,9 +23,9 @@ if [[ $action == "new" ]]; then tmux send-keys -t "$name:1" 'set-env; nvim' C-m tmux select-window -t "$name:1" tmux switch-client -t "$name" -fi +} -if [[ $action == "switch" ]]; then +switch() { tmux list-sessions -F '#{?session_attached,,#{session_name}}' | sed '/^popup/d' | @@ -34,20 +33,18 @@ if [[ $action == "switch" ]]; then fzf --reverse --header 'Switch Session' --preview 'tmux capture-pane -pt {}' \ --bind 'enter:execute(tmux switch-client -t {})+accept' -fi +} -if [[ $action == "delete" ]]; then +delete() { tmux list-sessions -F '#{?session_attached,,#{session_name}}' | sed '/^popup/d' | sed '/^$/d' | fzf --reverse --header 'Delete Session' --preview 'tmux capture-pane -pt {}' \ --bind 'enter:execute(tmux kill-session -t {})+accept' +} -fi - -if [[ $action == "window" ]]; then - +window() { window=$(tmux list-windows -F '#{window_index} #{window_name}' | sed '/^$/d' | fzf --reverse --header 'Switch Window' --no-preview | @@ -56,5 +53,12 @@ if [[ $action == "window" ]]; then [ -z "$window" ] && return 1 tmux select-window -t $window +} -fi +case "$1" in +new) new $2 ;; +switch) switch ;; +delete) delete ;; +window) window ;; +*) echo "Please enter an action" ;; +esac diff --git a/.config/shell/devpod-completion.zsh b/.config/shell/devpod-completion.zsh new file mode 100644 index 0000000..df8628a --- /dev/null +++ b/.config/shell/devpod-completion.zsh @@ -0,0 +1,212 @@ +#compdef devpod +#compdef _devpod devpod + +# zsh completion for devpod -*- shell-script -*- + +__devpod_debug() +{ + local file="$BASH_COMP_DEBUG_FILE" + if [[ -n ${file} ]]; then + echo "$*" >> "${file}" + fi +} + +_devpod() +{ + local shellCompDirectiveError=1 + local shellCompDirectiveNoSpace=2 + local shellCompDirectiveNoFileComp=4 + local shellCompDirectiveFilterFileExt=8 + local shellCompDirectiveFilterDirs=16 + local shellCompDirectiveKeepOrder=32 + + local lastParam lastChar flagPrefix requestComp out directive comp lastComp noSpace keepOrder + local -a completions + + __devpod_debug "\n========= starting completion logic ==========" + __devpod_debug "CURRENT: ${CURRENT}, words[*]: ${words[*]}" + + # The user could have moved the cursor backwards on the command-line. + # We need to trigger completion from the $CURRENT location, so we need + # to truncate the command-line ($words) up to the $CURRENT location. + # (We cannot use $CURSOR as its value does not work when a command is an alias.) + words=("${=words[1,CURRENT]}") + __devpod_debug "Truncated words[*]: ${words[*]}," + + lastParam=${words[-1]} + lastChar=${lastParam[-1]} + __devpod_debug "lastParam: ${lastParam}, lastChar: ${lastChar}" + + # For zsh, when completing a flag with an = (e.g., devpod -n=) + # completions must be prefixed with the flag + setopt local_options BASH_REMATCH + if [[ "${lastParam}" =~ '-.*=' ]]; then + # We are dealing with a flag with an = + flagPrefix="-P ${BASH_REMATCH}" + fi + + # Prepare the command to obtain completions + requestComp="${words[1]} __complete ${words[2,-1]}" + if [ "${lastChar}" = "" ]; then + # If the last parameter is complete (there is a space following it) + # We add an extra empty parameter so we can indicate this to the go completion code. + __devpod_debug "Adding extra empty parameter" + requestComp="${requestComp} \"\"" + fi + + __devpod_debug "About to call: eval ${requestComp}" + + # Use eval to handle any environment variables and such + out=$(eval ${requestComp} 2>/dev/null) + __devpod_debug "completion output: ${out}" + + # Extract the directive integer following a : from the last line + local lastLine + while IFS='\n' read -r line; do + lastLine=${line} + done < <(printf "%s\n" "${out[@]}") + __devpod_debug "last line: ${lastLine}" + + if [ "${lastLine[1]}" = : ]; then + directive=${lastLine[2,-1]} + # Remove the directive including the : and the newline + local suffix + (( suffix=${#lastLine}+2)) + out=${out[1,-$suffix]} + else + # There is no directive specified. Leave $out as is. + __devpod_debug "No directive found. Setting do default" + directive=0 + fi + + __devpod_debug "directive: ${directive}" + __devpod_debug "completions: ${out}" + __devpod_debug "flagPrefix: ${flagPrefix}" + + if [ $((directive & shellCompDirectiveError)) -ne 0 ]; then + __devpod_debug "Completion received error. Ignoring completions." + return + fi + + local activeHelpMarker="_activeHelp_ " + local endIndex=${#activeHelpMarker} + local startIndex=$((${#activeHelpMarker}+1)) + local hasActiveHelp=0 + while IFS='\n' read -r comp; do + # Check if this is an activeHelp statement (i.e., prefixed with $activeHelpMarker) + if [ "${comp[1,$endIndex]}" = "$activeHelpMarker" ];then + __devpod_debug "ActiveHelp found: $comp" + comp="${comp[$startIndex,-1]}" + if [ -n "$comp" ]; then + compadd -x "${comp}" + __devpod_debug "ActiveHelp will need delimiter" + hasActiveHelp=1 + fi + + continue + fi + + if [ -n "$comp" ]; then + # If requested, completions are returned with a description. + # The description is preceded by a TAB character. + # For zsh's _describe, we need to use a : instead of a TAB. + # We first need to escape any : as part of the completion itself. + comp=${comp//:/\\:} + + local tab="$(printf '\t')" + comp=${comp//$tab/:} + + __devpod_debug "Adding completion: ${comp}" + completions+=${comp} + lastComp=$comp + fi + done < <(printf "%s\n" "${out[@]}") + + # Add a delimiter after the activeHelp statements, but only if: + # - there are completions following the activeHelp statements, or + # - file completion will be performed (so there will be choices after the activeHelp) + if [ $hasActiveHelp -eq 1 ]; then + if [ ${#completions} -ne 0 ] || [ $((directive & shellCompDirectiveNoFileComp)) -eq 0 ]; then + __devpod_debug "Adding activeHelp delimiter" + compadd -x "--" + hasActiveHelp=0 + fi + fi + + if [ $((directive & shellCompDirectiveNoSpace)) -ne 0 ]; then + __devpod_debug "Activating nospace." + noSpace="-S ''" + fi + + if [ $((directive & shellCompDirectiveKeepOrder)) -ne 0 ]; then + __devpod_debug "Activating keep order." + keepOrder="-V" + fi + + if [ $((directive & shellCompDirectiveFilterFileExt)) -ne 0 ]; then + # File extension filtering + local filteringCmd + filteringCmd='_files' + for filter in ${completions[@]}; do + if [ ${filter[1]} != '*' ]; then + # zsh requires a glob pattern to do file filtering + filter="\*.$filter" + fi + filteringCmd+=" -g $filter" + done + filteringCmd+=" ${flagPrefix}" + + __devpod_debug "File filtering command: $filteringCmd" + _arguments '*:filename:'"$filteringCmd" + elif [ $((directive & shellCompDirectiveFilterDirs)) -ne 0 ]; then + # File completion for directories only + local subdir + subdir="${completions[1]}" + if [ -n "$subdir" ]; then + __devpod_debug "Listing directories in $subdir" + pushd "${subdir}" >/dev/null 2>&1 + else + __devpod_debug "Listing directories in ." + fi + + local result + _arguments '*:dirname:_files -/'" ${flagPrefix}" + result=$? + if [ -n "$subdir" ]; then + popd >/dev/null 2>&1 + fi + return $result + else + __devpod_debug "Calling _describe" + if eval _describe $keepOrder "completions" completions $flagPrefix $noSpace; then + __devpod_debug "_describe found some completions" + + # Return the success of having called _describe + return 0 + else + __devpod_debug "_describe did not find completions." + __devpod_debug "Checking if we should do file completion." + if [ $((directive & shellCompDirectiveNoFileComp)) -ne 0 ]; then + __devpod_debug "deactivating file completion" + + # We must return an error code here to let zsh know that there were no + # completions found by _describe; this is what will trigger other + # matching algorithms to attempt to find completions. + # For example zsh can match letters in the middle of words. + return 1 + else + # Perform file completion + __devpod_debug "Activating file completion" + + # We must return the result of this command, so it must be the + # last command, or else we must store its result to return it. + _arguments '*:filename:_files'" ${flagPrefix}" + fi + fi + fi +} + +# don't run the completion function when being source-ed or eval-ed +if [ "$funcstack[1]" = "_devpod" ]; then + _devpod +fi diff --git a/.config/shell/functions.zsh b/.config/shell/functions.zsh index e793e4d..b434097 100644 --- a/.config/shell/functions.zsh +++ b/.config/shell/functions.zsh @@ -27,7 +27,7 @@ clear-env () } tmux-new () { - . $HOME/.config/scripts/new-session.sh + ~/.config/scripts/sessions.sh new $1 } load-profile () { diff --git a/DesktopAnsible b/DesktopAnsible index 4601c90..14ac0d1 160000 --- a/DesktopAnsible +++ b/DesktopAnsible @@ -1 +1 @@ -Subproject commit 4601c90662419d4437208bc6a3d88503f769f99a +Subproject commit 14ac0d158f2e60d9eff2f8f3f82f77c96107a657