From 1bcafbaa4fe8123844289b6639f3161056a2dc12 Mon Sep 17 00:00:00 2001 From: Nick Boughton Date: Sat, 7 Aug 2021 21:20:46 +0100 Subject: [PATCH] tweaked for the new laptop --- .gitignore | 4 + completion.d/swnt-completion.bash | 259 +++++++++++++++++++++++++++++ completion.d/yapa-completion.bash | 260 ++++++++++++++++++++++++++++++ gtk-3.0/settings.ini | 8 +- sway/config | 5 +- waybar/config | 6 +- 6 files changed, 533 insertions(+), 9 deletions(-) create mode 100644 completion.d/swnt-completion.bash create mode 100644 completion.d/yapa-completion.bash diff --git a/.gitignore b/.gitignore index 3578e87..a8b3f71 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,7 @@ yapa/ yapa gtk-3.0/bookmarks sqlitebrowser/ +configstore/ +eog/ +lutris/ +menus/ diff --git a/completion.d/swnt-completion.bash b/completion.d/swnt-completion.bash new file mode 100644 index 0000000..bc940fc --- /dev/null +++ b/completion.d/swnt-completion.bash @@ -0,0 +1,259 @@ +# bash completion V2 for swnt -*- shell-script -*- + +__swnt_debug() +{ + if [[ -n ${BASH_COMP_DEBUG_FILE:-} ]]; then + echo "$*" >> "${BASH_COMP_DEBUG_FILE}" + fi +} + +# Macs have bash3 for which the bash-completion package doesn't include +# _init_completion. This is a minimal version of that function. +__swnt_init_completion() +{ + COMPREPLY=() + _get_comp_words_by_ref "$@" cur prev words cword +} + +# This function calls the swnt program to obtain the completion +# results and the directive. It fills the 'out' and 'directive' vars. +__swnt_get_completion_results() { + local requestComp lastParam lastChar args + + # Prepare the command to request completions for the program. + # Calling ${words[0]} instead of directly swnt allows to handle aliases + args=("${words[@]:1}") + requestComp="${words[0]} __complete ${args[*]}" + + lastParam=${words[$((${#words[@]}-1))]} + lastChar=${lastParam:$((${#lastParam}-1)):1} + __swnt_debug "lastParam ${lastParam}, lastChar ${lastChar}" + + if [ -z "${cur}" ] && [ "${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 method. + __swnt_debug "Adding extra empty parameter" + requestComp="${requestComp} ''" + fi + + # When completing a flag with an = (e.g., swnt -n=) + # bash focuses on the part after the =, so we need to remove + # the flag part from $cur + if [[ "${cur}" == -*=* ]]; then + cur="${cur#*=}" + fi + + __swnt_debug "Calling ${requestComp}" + # Use eval to handle any environment variables and such + out=$(eval "${requestComp}" 2>/dev/null) + + # Extract the directive integer at the very end of the output following a colon (:) + directive=${out##*:} + # Remove the directive + out=${out%:*} + if [ "${directive}" = "${out}" ]; then + # There is not directive specified + directive=0 + fi + __swnt_debug "The completion directive is: ${directive}" + __swnt_debug "The completions are: ${out[*]}" +} + +__swnt_process_completion_results() { + local shellCompDirectiveError=1 + local shellCompDirectiveNoSpace=2 + local shellCompDirectiveNoFileComp=4 + local shellCompDirectiveFilterFileExt=8 + local shellCompDirectiveFilterDirs=16 + + if [ $((directive & shellCompDirectiveError)) -ne 0 ]; then + # Error code. No completion. + __swnt_debug "Received error from custom completion go code" + return + else + if [ $((directive & shellCompDirectiveNoSpace)) -ne 0 ]; then + if [[ $(type -t compopt) = "builtin" ]]; then + __swnt_debug "Activating no space" + compopt -o nospace + else + __swnt_debug "No space directive not supported in this version of bash" + fi + fi + if [ $((directive & shellCompDirectiveNoFileComp)) -ne 0 ]; then + if [[ $(type -t compopt) = "builtin" ]]; then + __swnt_debug "Activating no file completion" + compopt +o default + else + __swnt_debug "No file completion directive not supported in this version of bash" + fi + fi + fi + + if [ $((directive & shellCompDirectiveFilterFileExt)) -ne 0 ]; then + # File extension filtering + local fullFilter filter filteringCmd + + # Do not use quotes around the $out variable or else newline + # characters will be kept. + for filter in ${out[*]}; do + fullFilter+="$filter|" + done + + filteringCmd="_filedir $fullFilter" + __swnt_debug "File filtering command: $filteringCmd" + $filteringCmd + elif [ $((directive & shellCompDirectiveFilterDirs)) -ne 0 ]; then + # File completion for directories only + + # Use printf to strip any trailing newline + local subdir + subdir=$(printf "%s" "${out[0]}") + if [ -n "$subdir" ]; then + __swnt_debug "Listing directories in $subdir" + pushd "$subdir" >/dev/null 2>&1 && _filedir -d && popd >/dev/null 2>&1 || return + else + __swnt_debug "Listing directories in ." + _filedir -d + fi + else + __swnt_handle_standard_completion_case + fi + + __swnt_handle_special_char "$cur" : + __swnt_handle_special_char "$cur" = +} + +__swnt_handle_standard_completion_case() { + local tab comp + tab=$(printf '\t') + + local longest=0 + # Look for the longest completion so that we can format things nicely + while IFS='' read -r comp; do + # Strip any description before checking the length + comp=${comp%%$tab*} + # Only consider the completions that match + comp=$(compgen -W "$comp" -- "$cur") + if ((${#comp}>longest)); then + longest=${#comp} + fi + done < <(printf "%s\n" "${out[@]}") + + local completions=() + while IFS='' read -r comp; do + if [ -z "$comp" ]; then + continue + fi + + __swnt_debug "Original comp: $comp" + comp="$(__swnt_format_comp_descriptions "$comp" "$longest")" + __swnt_debug "Final comp: $comp" + completions+=("$comp") + done < <(printf "%s\n" "${out[@]}") + + while IFS='' read -r comp; do + COMPREPLY+=("$comp") + done < <(compgen -W "${completions[*]}" -- "$cur") + + # If there is a single completion left, remove the description text + if [ ${#COMPREPLY[*]} -eq 1 ]; then + __swnt_debug "COMPREPLY[0]: ${COMPREPLY[0]}" + comp="${COMPREPLY[0]%% *}" + __swnt_debug "Removed description from single completion, which is now: ${comp}" + COMPREPLY=() + COMPREPLY+=("$comp") + fi +} + +__swnt_handle_special_char() +{ + local comp="$1" + local char=$2 + if [[ "$comp" == *${char}* && "$COMP_WORDBREAKS" == *${char}* ]]; then + local word=${comp%"${comp##*${char}}"} + local idx=${#COMPREPLY[*]} + while [[ $((--idx)) -ge 0 ]]; do + COMPREPLY[$idx]=${COMPREPLY[$idx]#"$word"} + done + fi +} + +__swnt_format_comp_descriptions() +{ + local tab + tab=$(printf '\t') + local comp="$1" + local longest=$2 + + # Properly format the description string which follows a tab character if there is one + if [[ "$comp" == *$tab* ]]; then + desc=${comp#*$tab} + comp=${comp%%$tab*} + + # $COLUMNS stores the current shell width. + # Remove an extra 4 because we add 2 spaces and 2 parentheses. + maxdesclength=$(( COLUMNS - longest - 4 )) + + # Make sure we can fit a description of at least 8 characters + # if we are to align the descriptions. + if [[ $maxdesclength -gt 8 ]]; then + # Add the proper number of spaces to align the descriptions + for ((i = ${#comp} ; i < longest ; i++)); do + comp+=" " + done + else + # Don't pad the descriptions so we can fit more text after the completion + maxdesclength=$(( COLUMNS - ${#comp} - 4 )) + fi + + # If there is enough space for any description text, + # truncate the descriptions that are too long for the shell width + if [ $maxdesclength -gt 0 ]; then + if [ ${#desc} -gt $maxdesclength ]; then + desc=${desc:0:$(( maxdesclength - 1 ))} + desc+="…" + fi + comp+=" ($desc)" + fi + fi + + # Must use printf to escape all special characters + printf "%q" "${comp}" +} + +__start_swnt() +{ + local cur prev words cword split + + COMPREPLY=() + + # Call _init_completion from the bash-completion package + # to prepare the arguments properly + if declare -F _init_completion >/dev/null 2>&1; then + _init_completion -n "=:" || return + else + __swnt_init_completion -n "=:" || return + fi + + __swnt_debug + __swnt_debug "========= starting completion logic ==========" + __swnt_debug "cur is ${cur}, words[*] is ${words[*]}, #words[@] is ${#words[@]}, cword is $cword" + + # The user could have moved the cursor backwards on the command-line. + # We need to trigger completion from the $cword location, so we need + # to truncate the command-line ($words) up to the $cword location. + words=("${words[@]:0:$cword+1}") + __swnt_debug "Truncated words[*]: ${words[*]}," + + local out directive + __swnt_get_completion_results + __swnt_process_completion_results +} + +if [[ $(type -t compopt) = "builtin" ]]; then + complete -o default -F __start_swnt swnt +else + complete -o default -o nospace -F __start_swnt swnt +fi + +# ex: ts=4 sw=4 et filetype=sh diff --git a/completion.d/yapa-completion.bash b/completion.d/yapa-completion.bash new file mode 100644 index 0000000..d4ec00a --- /dev/null +++ b/completion.d/yapa-completion.bash @@ -0,0 +1,260 @@ + +# bash completion V2 for yapa -*- shell-script -*- + +__yapa_debug() +{ + if [[ -n ${BASH_COMP_DEBUG_FILE:-} ]]; then + echo "$*" >> "${BASH_COMP_DEBUG_FILE}" + fi +} + +# Macs have bash3 for which the bash-completion package doesn't include +# _init_completion. This is a minimal version of that function. +__yapa_init_completion() +{ + COMPREPLY=() + _get_comp_words_by_ref "$@" cur prev words cword +} + +# This function calls the yapa program to obtain the completion +# results and the directive. It fills the 'out' and 'directive' vars. +__yapa_get_completion_results() { + local requestComp lastParam lastChar args + + # Prepare the command to request completions for the program. + # Calling ${words[0]} instead of directly yapa allows to handle aliases + args=("${words[@]:1}") + requestComp="${words[0]} __complete ${args[*]}" + + lastParam=${words[$((${#words[@]}-1))]} + lastChar=${lastParam:$((${#lastParam}-1)):1} + __yapa_debug "lastParam ${lastParam}, lastChar ${lastChar}" + + if [ -z "${cur}" ] && [ "${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 method. + __yapa_debug "Adding extra empty parameter" + requestComp="${requestComp} ''" + fi + + # When completing a flag with an = (e.g., yapa -n=) + # bash focuses on the part after the =, so we need to remove + # the flag part from $cur + if [[ "${cur}" == -*=* ]]; then + cur="${cur#*=}" + fi + + __yapa_debug "Calling ${requestComp}" + # Use eval to handle any environment variables and such + out=$(eval "${requestComp}" 2>/dev/null) + + # Extract the directive integer at the very end of the output following a colon (:) + directive=${out##*:} + # Remove the directive + out=${out%:*} + if [ "${directive}" = "${out}" ]; then + # There is not directive specified + directive=0 + fi + __yapa_debug "The completion directive is: ${directive}" + __yapa_debug "The completions are: ${out[*]}" +} + +__yapa_process_completion_results() { + local shellCompDirectiveError=1 + local shellCompDirectiveNoSpace=2 + local shellCompDirectiveNoFileComp=4 + local shellCompDirectiveFilterFileExt=8 + local shellCompDirectiveFilterDirs=16 + + if [ $((directive & shellCompDirectiveError)) -ne 0 ]; then + # Error code. No completion. + __yapa_debug "Received error from custom completion go code" + return + else + if [ $((directive & shellCompDirectiveNoSpace)) -ne 0 ]; then + if [[ $(type -t compopt) = "builtin" ]]; then + __yapa_debug "Activating no space" + compopt -o nospace + else + __yapa_debug "No space directive not supported in this version of bash" + fi + fi + if [ $((directive & shellCompDirectiveNoFileComp)) -ne 0 ]; then + if [[ $(type -t compopt) = "builtin" ]]; then + __yapa_debug "Activating no file completion" + compopt +o default + else + __yapa_debug "No file completion directive not supported in this version of bash" + fi + fi + fi + + if [ $((directive & shellCompDirectiveFilterFileExt)) -ne 0 ]; then + # File extension filtering + local fullFilter filter filteringCmd + + # Do not use quotes around the $out variable or else newline + # characters will be kept. + for filter in ${out[*]}; do + fullFilter+="$filter|" + done + + filteringCmd="_filedir $fullFilter" + __yapa_debug "File filtering command: $filteringCmd" + $filteringCmd + elif [ $((directive & shellCompDirectiveFilterDirs)) -ne 0 ]; then + # File completion for directories only + + # Use printf to strip any trailing newline + local subdir + subdir=$(printf "%s" "${out[0]}") + if [ -n "$subdir" ]; then + __yapa_debug "Listing directories in $subdir" + pushd "$subdir" >/dev/null 2>&1 && _filedir -d && popd >/dev/null 2>&1 || return + else + __yapa_debug "Listing directories in ." + _filedir -d + fi + else + __yapa_handle_standard_completion_case + fi + + __yapa_handle_special_char "$cur" : + __yapa_handle_special_char "$cur" = +} + +__yapa_handle_standard_completion_case() { + local tab comp + tab=$(printf '\t') + + local longest=0 + # Look for the longest completion so that we can format things nicely + while IFS='' read -r comp; do + # Strip any description before checking the length + comp=${comp%%$tab*} + # Only consider the completions that match + comp=$(compgen -W "$comp" -- "$cur") + if ((${#comp}>longest)); then + longest=${#comp} + fi + done < <(printf "%s\n" "${out[@]}") + + local completions=() + while IFS='' read -r comp; do + if [ -z "$comp" ]; then + continue + fi + + __yapa_debug "Original comp: $comp" + comp="$(__yapa_format_comp_descriptions "$comp" "$longest")" + __yapa_debug "Final comp: $comp" + completions+=("$comp") + done < <(printf "%s\n" "${out[@]}") + + while IFS='' read -r comp; do + COMPREPLY+=("$comp") + done < <(compgen -W "${completions[*]}" -- "$cur") + + # If there is a single completion left, remove the description text + if [ ${#COMPREPLY[*]} -eq 1 ]; then + __yapa_debug "COMPREPLY[0]: ${COMPREPLY[0]}" + comp="${COMPREPLY[0]%% *}" + __yapa_debug "Removed description from single completion, which is now: ${comp}" + COMPREPLY=() + COMPREPLY+=("$comp") + fi +} + +__yapa_handle_special_char() +{ + local comp="$1" + local char=$2 + if [[ "$comp" == *${char}* && "$COMP_WORDBREAKS" == *${char}* ]]; then + local word=${comp%"${comp##*${char}}"} + local idx=${#COMPREPLY[*]} + while [[ $((--idx)) -ge 0 ]]; do + COMPREPLY[$idx]=${COMPREPLY[$idx]#"$word"} + done + fi +} + +__yapa_format_comp_descriptions() +{ + local tab + tab=$(printf '\t') + local comp="$1" + local longest=$2 + + # Properly format the description string which follows a tab character if there is one + if [[ "$comp" == *$tab* ]]; then + desc=${comp#*$tab} + comp=${comp%%$tab*} + + # $COLUMNS stores the current shell width. + # Remove an extra 4 because we add 2 spaces and 2 parentheses. + maxdesclength=$(( COLUMNS - longest - 4 )) + + # Make sure we can fit a description of at least 8 characters + # if we are to align the descriptions. + if [[ $maxdesclength -gt 8 ]]; then + # Add the proper number of spaces to align the descriptions + for ((i = ${#comp} ; i < longest ; i++)); do + comp+=" " + done + else + # Don't pad the descriptions so we can fit more text after the completion + maxdesclength=$(( COLUMNS - ${#comp} - 4 )) + fi + + # If there is enough space for any description text, + # truncate the descriptions that are too long for the shell width + if [ $maxdesclength -gt 0 ]; then + if [ ${#desc} -gt $maxdesclength ]; then + desc=${desc:0:$(( maxdesclength - 1 ))} + desc+="…" + fi + comp+=" ($desc)" + fi + fi + + # Must use printf to escape all special characters + printf "%q" "${comp}" +} + +__start_yapa() +{ + local cur prev words cword split + + COMPREPLY=() + + # Call _init_completion from the bash-completion package + # to prepare the arguments properly + if declare -F _init_completion >/dev/null 2>&1; then + _init_completion -n "=:" || return + else + __yapa_init_completion -n "=:" || return + fi + + __yapa_debug + __yapa_debug "========= starting completion logic ==========" + __yapa_debug "cur is ${cur}, words[*] is ${words[*]}, #words[@] is ${#words[@]}, cword is $cword" + + # The user could have moved the cursor backwards on the command-line. + # We need to trigger completion from the $cword location, so we need + # to truncate the command-line ($words) up to the $cword location. + words=("${words[@]:0:$cword+1}") + __yapa_debug "Truncated words[*]: ${words[*]}," + + local out directive + __yapa_get_completion_results + __yapa_process_completion_results +} + +if [[ $(type -t compopt) = "builtin" ]]; then + complete -o default -F __start_yapa yapa +else + complete -o default -o nospace -F __start_yapa yapa +fi + +# ex: ts=4 sw=4 et filetype=sh diff --git a/gtk-3.0/settings.ini b/gtk-3.0/settings.ini index 1927aec..50e1b2f 100644 --- a/gtk-3.0/settings.ini +++ b/gtk-3.0/settings.ini @@ -1,18 +1,18 @@ [Settings] gtk-application-prefer-dark-theme=0 gtk-theme-name=Gruvbox-Material-Dark -gtk-icon-theme-name=Tela-circle-grey-dark +gtk-icon-theme-name=Gruvbox-Material-Dark gtk-font-name=Roboto 10 gtk-cursor-theme-name=Adwaita gtk-cursor-theme-size=0 -gtk-toolbar-style=GTK_TOOLBAR_ICONS -gtk-toolbar-icon-size=GTK_ICON_SIZE_SMALL_TOOLBAR +gtk-toolbar-style=GTK_TOOLBAR_BOTH +gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR gtk-button-images=1 gtk-menu-images=1 gtk-enable-event-sounds=1 gtk-enable-input-feedback-sounds=1 gtk-xft-antialias=1 gtk-xft-hinting=1 -gtk-xft-hintstyle=hintmedium +gtk-xft-hintstyle=hintfull gtk-xft-rgba=rgb gtk-decoration-layout=menu: diff --git a/sway/config b/sway/config index 5068cf1..b2508a9 100644 --- a/sway/config +++ b/sway/config @@ -22,7 +22,7 @@ set $menu wofi -c ~/.config/wofi/config -s ~/.config/wofi/style.css -I set $gnome-schema org.gnome.desktop.interface exec_always { gsettings set $gnome-schema gtk-theme 'Gruvbox-Material-Dark' - gsettings set $gnome-schema icon-theme 'Tela-circle-grey-dark' + gsettings set $gnome-schema icon-theme 'Gruvbox-Material-Dark' gsettings set $gnome-schema font-name 'Roboto Regular 10' gsettings set $gnome-schema monospace-font-name 'Fira Code 10' gsettings set $gnome-schema document-font-name 'Roboto Regular 10' @@ -140,7 +140,7 @@ for_window [app_id=".*"] border pixel 1 # # Screenshots # - bindsym $mod+p exec grimshot save active + bindsym $mod+p exec grimshot save screen bindsym $mod+Shift+p exec grimshot save area bindsym $mod+Alt+p exec grimshot save output bindsym $mod+Ctrl+p exec grimshot save window @@ -275,6 +275,7 @@ titlebar_border_thickness 0 # include ~/.cache/wal/colors-sway output "*" background /home/nick/Pictures/Wallpapers/photo-1517999179346-a7078f1e40a6.jpeg fill +#output "*" background /home/nick/Pictures/Wallpapers/5b1iuo0xlth61.png fill #output "*" background $wallpaper fill # class border backgr. text indicator child_border diff --git a/waybar/config b/waybar/config index 5104597..b9e8be0 100644 --- a/waybar/config +++ b/waybar/config @@ -24,7 +24,7 @@ "wlr/taskbar": { "all-outputs": false, "format": "{icon} {title:.15}", - "icon-theme": "Tela-circle-grey-dark", + "icon-theme": "Gruvbox-Material-Dark", "icon-size": 14, "on-click": "activate", "on-middle-click": "close", @@ -100,7 +100,7 @@ ], "sway/workspaces": { "disable-scroll": true, - "all-outputs": true, + "all-outputs": false, "format": "{name} {icon}", "format-icons": { "1": "", @@ -270,4 +270,4 @@ ] } } -] \ No newline at end of file +]