diff options
39 files changed, 4724 insertions, 181 deletions
diff --git a/.gitmodules b/.gitmodules index 7875997..03de40d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,3 +7,9 @@ [submodule "doom-emacs/.emacs.d"] path = doom-emacs/.emacs.d url = https://github.com/hlissner/doom-emacs +[submodule "kak/.config/kak/plugins/plug.kak"] + path = kak/.config/kak/plugins/plug.kak + url = https://github.com/robertmeta/plug.kak.git +[submodule "kak/.config/kak/plugins/kak-lsp"] + path = kak/.config/kak/plugins/kak-lsp + url = https://github.com/kak-lsp/kak-lsp.git @@ -1,5 +1,5 @@ special_files := git nvim tmux zsh -simple_files := emacs spacemacs doom-emacs vim fish picom +simple_files := emacs spacemacs doom-emacs vim fish picom qutebrowser kak pkg_dependent_files := basics i3wm bspwm herbstluftwm xmonad x polybar all_files := $(special_files) $(simple_files) $(pkg_dependent_files) diff --git a/basics/.config/alacritty/alacritty.yml b/basics/.config/alacritty/alacritty.yml index ee87a85..f127df7 100644 --- a/basics/.config/alacritty/alacritty.yml +++ b/basics/.config/alacritty/alacritty.yml @@ -431,12 +431,12 @@ alt_send_esc: true # - AppKeypad key_bindings: # (Windows/Linux only) - - { key: V, mods: Control|Shift, action: Paste } - - { key: C, mods: Control|Shift, action: Copy } - - { key: Insert, mods: Shift, action: PasteSelection } - - { key: Key0, mods: Control, action: ResetFontSize } - - { key: Equals, mods: Control, action: IncreaseFontSize } - - { key: Subtract, mods: Control, action: DecreaseFontSize } + - { key: V, mods: Control|Shift, action: Paste } + - { key: C, mods: Control|Shift, action: Copy } + - { key: Insert, mods: Shift, action: PasteSelection } + - { key: Key0, mods: Control, action: ResetFontSize } + - { key: Equals, mods: Control, action: IncreaseFontSize } + - { key: Minus, mods: Control, action: DecreaseFontSize } # (macOS only) #- { key: Key0, mods: Command, action: ResetFontSize } diff --git a/basics/.config/dunst/dunstrc b/basics/.config/dunst/dunstrc index 80c3445..d572f7a 100644 --- a/basics/.config/dunst/dunstrc +++ b/basics/.config/dunst/dunstrc @@ -29,7 +29,7 @@ # the top and down respectively. # The width can be negative. In this case the actual width is the # screen width minus the width defined in within the geometry option. - geometry = "300x5-30+20" + geometry = "300x5-30+40" # Show how many messages are currently hidden (because of geometry). indicate_hidden = yes diff --git a/basics/.config/rofi/config.rasi b/basics/.config/rofi/config.rasi index 0fba3e1..7fb7e52 100644 --- a/basics/.config/rofi/config.rasi +++ b/basics/.config/rofi/config.rasi @@ -1,4 +1,6 @@ configuration { modi: "window,run,ssh,drun"; theme: "~/.config/rofi/themes/gruvbox/gruvbox-dark-soft.rasi"; + cache-dir: ".cache/rofi"; + drun-use-desktop-cache: true; } diff --git a/basics/.local/bin/scrnshot b/basics/.local/bin/scrnshot new file mode 100755 index 0000000..a2dda76 --- /dev/null +++ b/basics/.local/bin/scrnshot @@ -0,0 +1,5 @@ +#/bin/sh + +# TODO: configure delay, output directory and others + +scrot -s -p -e 'mv $f ~/Desktop/shots && echo "$$HOME/Desktop/shots/$f"' diff --git a/basics/.local/bin/setup-widescreen b/basics/.local/bin/setup-widescreen new file mode 100755 index 0000000..0082ff9 --- /dev/null +++ b/basics/.local/bin/setup-widescreen @@ -0,0 +1,10 @@ +#!/usr/bin/env sh + +# Modeline +# cvt 3440 1440 30 +xrandr --newmode "3440x1440_30.00" 196.25 3440 3600 3952 4464 1440 1443 1453 1468 -hsync +vsync + +xrandr --addmode HDMI1 3440x1440_30.00 + +xrandr --output HDMI1 --mode 3440x1440_30.00 --primary --left-of eDP1 + diff --git a/doom-emacs/.config/doom/init.el b/doom-emacs/.config/doom/init.el index 1e2a0ad..b9a93d5 100644 --- a/doom-emacs/.config/doom/init.el +++ b/doom-emacs/.config/doom/init.el @@ -41,7 +41,7 @@ ;;neotree ; a project drawer, like NERDTree for vim ophints ; highlight the region an operation acts on (popup +defaults) ; tame sudden yet inevitable temporary windows - tabs ; a tab bar for Emacs + ;;tabs ; a tab bar for Emacs treemacs ; a project drawer, like neotree but cooler ;;unicode ; extended unicode support for various languages vc-gutter ; vcs diff in the fringe @@ -119,7 +119,7 @@ ;;crystal ; ruby at the speed of c ;;csharp ; unity, .NET, and mono shenanigans data ; config/data formats - ;;(dart +flutter) ; paint ui and not much else + (dart +flutter) ; paint ui and not much else elixir ; erlang done right ;;elm ; care for a cup of TEA? emacs-lisp ; drown in parentheses diff --git a/doom-emacs/.emacs.d b/doom-emacs/.emacs.d -Subproject 3e2c98a0a3e02237da952dac78d265dc9503f07 +Subproject 88e18fc7c1d36bb2fe842d43ece0903556d2c5c diff --git a/herbstluftwm/.config/herbstluftwm/autostart b/herbstluftwm/.config/herbstluftwm/autostart index 052f191..5e5c942 100755 --- a/herbstluftwm/.config/herbstluftwm/autostart +++ b/herbstluftwm/.config/herbstluftwm/autostart @@ -16,8 +16,11 @@ if hc silent new_attr bool my_not_first_autostart; then #[ ! "$(pidof -x xss-lock)" ] && xss-lock -n /usr/lib/xsecurelock/dimmer -l -- xsecurelock & [ ! "$(pidof -x xss-lock)" ] && herbstclient spawn xss-lock -n /usr/lib/xsecurelock/dimmer -l -- slock fi +[ ! "$(pidof -x picom)" ] && herbstclient spawn nm-applet -#xsetroot -solid '#5A8E3A' +xwallpaper --zoom "$XDG_DATA_HOME/images/wallpaper.jpg" + +xsetroot -solid '#5A8E3A' # remove all existing keybindings hc keyunbind --all @@ -82,12 +85,15 @@ hc keybind $Mod-Control-Right resize right +$resizestep tag_names=( {1..9} 10 ) tag_keys=( {1..9} 0 ) +echo "start" > /tmp/herbst_autostart hc rename default "${tag_names[0]}" || true for i in "${!tag_names[@]}" ; do + echo "$i ${tag_names[$i]} ${tag_keys[$i]}" >> /tmp/herbst_autostart hc add "${tag_names[$i]}" + hc set_attr "tags.by-name.${tag_names[$i]}.index" "$i" key="${tag_keys[$i]}" if ! [ -z "$key" ] ; then - hc keybind "$Mod-$key" and . use_index "$i" . spawn "$dir/bring_sticky.sh" + hc keybind "$Mod-$key" and . use_index "$i" hc keybind "$Mod-Shift-$key" move_index "$i" fi done @@ -107,19 +113,17 @@ hc keybind $Mod-r remove hc keybind $Mod-Shift-space floating toggle hc keybind $Mod-f fullscreen toggle hc keybind $Mod-Shift-f set_attr clients.focus.floating toggle +hc keybind $Mod-Shift-m set_attr clients.focus.minimized true hc keybind $Mod-p pseudotile toggle # The following cycles through the available layouts within a frame, but skips # layouts, if the layout change wouldn't affect the actual window positions. # I.e. if there are two windows within a frame, the grid layout is skipped. hc keybind $Mod-space \ - or , and . emit_hook layout_changed \ - . compare tags.focus.curframe_wcount = 2 \ + or , and . compare tags.focus.curframe_wcount = 2 \ . cycle_layout +1 vertical horizontal max vertical grid \ , cycle_layout +1 -sticky_attr="my_sticky_client" -hc keybind $Mod-s or , set_attr clients.focus."$sticky_attr" toggle \ - , new_attr bool clients.focus."$sticky_attr" true +hc watch tags.focus.tiling.focused_frame.algorithm hc keybind $ModAlt-Tab spawn rofi -show window @@ -168,15 +172,17 @@ hc mousebind $Mod-Button2 zoom hc mousebind $Mod-Button3 resize # focus -hc keybind $Mod-BackSpace cycle_monitor +hc keybind $Mod-BackSpace spawn "$dir/cycle_main_monitors.sh" # Swap tag with next monitor hc keybind $Mod-Shift-BackSpace chain \ , new_attr string my_prev_monitor_tag \ , substitute T monitors.focus.tag \ set_attr my_prev_monitor_tag T \ - , cycle_monitor \ - , substitute T my_prev_monitor_tag \ - use T + , spawn bash -c \ + "'$dir/cycle_main_monitors.sh' \ + && herbstclient substitute T my_prev_monitor_tag \ + use T" + hc keybind $Mod-Tab cycle_all +1 hc keybind $Mod-Shift-Tab cycle_all -1 hc keybind $Mod-c cycle @@ -185,6 +191,14 @@ hc keybind $Mod-i jumpto urgent # theme hc attr theme.tiling.reset 1 hc attr theme.floating.reset 1 + +# title theme +hc attr theme.title_color '#000000' +hc attr theme.title_height 15 +hc attr theme.title_font 'Dejavu Sans:pixelsize=12' + +#hc attr theme.padding_top 2 + hc attr theme.active.color '#9fbc00' hc attr theme.normal.color '#454545' hc attr theme.urgent.color orange @@ -217,22 +231,31 @@ hc set hide_covered_windows off hc set focus_crosses_monitor_boundaries on hc set swap_monitors_to_get_tag on hc set focus_stealing_prevention off -hc set focus_follows_mouse true +hc set focus_follows_mouse false + +hc set raise_on_focus on hc set tree_style '╾│ ├└╼─┐' # rules rules="$XDG_CONFIG_HOME/herbstluftwm/rules" [ -x "$rules" ] && source "$rules" +hc apply_rules --all # unlock, just to be sure hc unlock +hc remove_monitor floatmon + # do multi monitor setup here, e.g.: # hc set_monitors 1280x1024+0+0 1280x1024+1280+0 # or simply: hc detect_monitors +# Setup floating monitor +hc spawn "$dir/floatmon.sh" +hc keybind $Mod-Shift-s spawn "$dir/toggle_floatmon.sh" + # restartpanels "$dir/polybar.sh" hlwm #restartpanels.sh diff --git a/herbstluftwm/.config/herbstluftwm/cycle_main_monitors.sh b/herbstluftwm/.config/herbstluftwm/cycle_main_monitors.sh new file mode 100755 index 0000000..fbac0e3 --- /dev/null +++ b/herbstluftwm/.config/herbstluftwm/cycle_main_monitors.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +hc() { + herbstclient "$@" +} + +hc lock + +hc cycle_monitor +while $(hc compare monitors.focus.name "!=" "") +do + hc cycle_monitor +done + +hc unlock + diff --git a/herbstluftwm/.config/herbstluftwm/float.sh b/herbstluftwm/.config/herbstluftwm/float.sh new file mode 100755 index 0000000..d190c5c --- /dev/null +++ b/herbstluftwm/.config/herbstluftwm/float.sh @@ -0,0 +1,9 @@ +#!/bin/bash +PADDING=$(herbstclient list_padding) + +#re-add monitor called 'float' with same padding and dimensions as the monitor under focus in tag 9 +herbstclient remove_monitor float +herbstclient add_monitor $(herbstclient list_monitors | grep \\\[FOCUS\\\] | grep -oe '[0-9]\+x[0-9]\++[0-9]\++[0-9]\+') 9 float +herbstclient lock_tag float +#add same padding: +herbstclient pad float $PADDING diff --git a/herbstluftwm/.config/herbstluftwm/floating.sh b/herbstluftwm/.config/herbstluftwm/floating.sh new file mode 100755 index 0000000..403259d --- /dev/null +++ b/herbstluftwm/.config/herbstluftwm/floating.sh @@ -0,0 +1,52 @@ +#!/usr/bin/env bash + +monitor=floatmon +tag=fl +Mod=${Mod:-Mod1} +Floatkey=${Floatkey:-Shift-f} + +hc() { "${herbstclient_command[@]:-herbstclient}" "$@" ;} + +size=$(herbstclient list_monitors | grep '\[FOCUS\]' | grep -oe '[0-9]\+x[0-9]\++[0-9]\++[0-9]\+') +echo "size is: $size" + +hc chain , add "$tag" , floating "$tag" on +hc or , add_monitor "$size" "$tag" "$monitor" \ + , move_monitor "$monitor" "$size" +hc raise_monitor "$monitor" +hc lock_tag "$monitor" + +cmd=( +or case: and + # if not on floating monitor + . compare monitors.focus.name != "$monitor" + # and if a client is focused + . get_attr clients.focus.winid + # then remember the last monitor of the client + . chain try new_attr string clients.focus.my_lastmon + try true + . substitute M monitors.focus.index + set_attr clients.focus.my_lastmon M + # and then move the client to the floating tag + . shift_to_monitor "$monitor" + . focus_monitor "$monitor" + . true + case: and + # if on the floating monitor + . compare monitors.focus.name = "$monitor" + # and if a client is focused + . get_attr clients.focus.winid + # then send it back to the original monitor + . substitute M clients.focus.my_lastmon chain + , shift_to_monitor M + , focus_monitor M + . true + case: and + # if the previous things fail, + # just move to the first monitor + . shift_to_monitor 0 + . focus_monitor 0 +) + +hc keybind $Mod-$Floatkey "${cmd[@]}" + diff --git a/herbstluftwm/.config/herbstluftwm/floatmon.sh b/herbstluftwm/.config/herbstluftwm/floatmon.sh new file mode 100755 index 0000000..9f55149 --- /dev/null +++ b/herbstluftwm/.config/herbstluftwm/floatmon.sh @@ -0,0 +1,68 @@ +#!/usr/bin/env bash + +monitor=floatmon +tag=fl +Mod=${Mod:-Mod4} +Floatkey=${Floatkey:-s} + +hc() { "${herbstclient_command[@]:-herbstclient}" "$@" ;} + +if which xwininfo &> /dev/null; then + size=$(xwininfo -root | + sed -n -e '/^ Width: / { + s/.*: //; + h + } + /^ Height: / { + s/.*: //g; + H; + x; + s/\n/x/p + }') +else + echo "This script requires the xwininfo binary." + exit 1 +fi + +hc chain , add "$tag" , floating "$tag" on +hc or , add_monitor "$size"+0+0 "$tag" "$monitor" \ + , move_monitor "$monitor" "$size"+0+0 +hc pad "$monitor" 32 32 32 32 +hc raise_monitor "$monitor" +hc lock_tag "$monitor" + +cmd=( +or case: and + # if not on floating monitor + . compare monitors.focus.name != "$monitor" + # and if a client is focused + . get_attr clients.focus.winid + # then remember the last monitor of the client + . chain try new_attr string clients.focus.my_lastmon + try true + . substitute M monitors.focus.index + set_attr clients.focus.my_lastmon M + # and then move the client to the floating tag + . or , chain - shift_to_monitor "$monitor" + - focus_monitor "$monitor" + , move "$tag" + . true + case: and + # if on the floating monitor + . compare monitors.focus.name = "$monitor" + # and if a client is focused + . get_attr clients.focus.winid + # then send it back to the original monitor + . substitute M clients.focus.my_lastmon chain + , shift_to_monitor M + , focus_monitor M + . true + case: and + # if the previous things fail, + # just move to the first monitor + . shift_to_monitor 0 + . focus_monitor 0 +) + +hc keybind $Mod-$Floatkey "${cmd[@]}" + diff --git a/herbstluftwm/.config/herbstluftwm/hiddentag.sh b/herbstluftwm/.config/herbstluftwm/hiddentag.sh new file mode 100755 index 0000000..8c41d33 --- /dev/null +++ b/herbstluftwm/.config/herbstluftwm/hiddentag.sh @@ -0,0 +1,29 @@ +#!/usr/bin/env bash + +tag=hidden +Mod=${Mod:-Mod4} +HideKey=${Floatkey:-t} + +hc() { "${herbstclient_command[@]:-herbstclient}" "$@" ;} + +hc add "$tag" + +cmd=( + and . chain try new_attr string clients.focus.my_original_tag + try true + . substitute T tags.focus.index + set_attr clients.focus.my_original_tag T + . move "$tag" + ) +unhide_cmd=( + foreach T clients. + sprintf S "%c.tag" T + and . compare S "=" "$tag" + . sprintf IDATTR "%c.winid" T + sprintf ID "%s" IDATTR + q + ) + +hc keybind $Mod-$HideKey "${cmd[@]}" +hc keybind $Mod-Shift-$HideKey + diff --git a/herbstluftwm/.config/herbstluftwm/lasttag.sh b/herbstluftwm/.config/herbstluftwm/lasttag.sh index d4c328c..170643b 100755 --- a/herbstluftwm/.config/herbstluftwm/lasttag.sh +++ b/herbstluftwm/.config/herbstluftwm/lasttag.sh @@ -15,7 +15,7 @@ tag="$(hc attr tags.focus.name)" lasttag="$tag" hc --idle '(tag_changed|goto_last_tag|reload)' \ - | while read line ; do + | while read -r line ; do IFS=$'\t' read -ra args <<< "$line" case ${args[0]} in tag_changed) @@ -23,13 +23,16 @@ hc --idle '(tag_changed|goto_last_tag|reload)' \ tag=${args[1]} ;; goto_last_tag) - [ "$lasttag" ] && hc and . use "$lasttag" . spawn "$dir/bring_sticky.sh" + [ "$lasttag" ] && hc use "$lasttag" ;; moveto_last_tag) - [ "$lasttag" ] && hc and . move "$lasttag" . spawn "$dir/bring_sticky.sh" + [ "$lasttag" ] && hc move "$lasttag" ;; reload) exit ;; esac + read -r -d '' -a visible_tags <<< "$(hc list_monitors | cut -d\" -f2)" + echo "new last_tag: ${lasttag}" >> /tmp/lasttag.log + echo "new tag: ${tag}" >> /tmp/lasttag.log done diff --git a/herbstluftwm/.config/herbstluftwm/panel.sh b/herbstluftwm/.config/herbstluftwm/panel.sh index 229e31e..41086c1 100755 --- a/herbstluftwm/.config/herbstluftwm/panel.sh +++ b/herbstluftwm/.config/herbstluftwm/panel.sh @@ -238,9 +238,8 @@ hc pad $monitor $panel_height windowtitle="${cmd[@]:2}" ;& layout_changed) - currenttag=$(hc tag_status | tr '\t' '\n' | sed -n 's/#//p') - focusedtaglayout=$(hc layout "$currenttag" @ | awk '{print $2}' | sed 's/://') - case "$focusedtaglayout" in + current_layout=$(hc get_attr tags.focus.tiling.focused_frame.algorithm) + case "$curent_layout" in vertical) layout="V" ;; horizontal) diff --git a/herbstluftwm/.config/herbstluftwm/polybar.sh b/herbstluftwm/.config/herbstluftwm/polybar.sh index 01d3d91..1c6d9a9 100755 --- a/herbstluftwm/.config/herbstluftwm/polybar.sh +++ b/herbstluftwm/.config/herbstluftwm/polybar.sh @@ -40,19 +40,22 @@ MONITOR=$(name "$primary_mon_name") polybar "topbar${wm}" & primary_height_var="${primary_mon_name}_height" declare "${primary_mon_name}_height=$((${!primary_height_var}+16))" +hc set auto_detect_panels true + while read -r mon; do echo "launching bar on $(name "$mon")" height_var="$(name "$mon")_height" echo "${height_var}" echo "${!height_var}" OFFSET_Y="$((${!height_var}-16))" MONITOR="$(name "$mon")" polybar "topbar2${wm}" & + echo "$(name "$mon") OFFSET Y $((${!height_var}-16))" #sleep 2 echo -n "name: " name "$mon" echo echo -n "id hlwm: " hlwm_id "$mon" - hc pad "$(hlwm_id "$mon")" "${!height_var}" + #hc pad "$(hlwm_id "$mon")" "${!height_var}" done <<< "$(polybar -m)" echo "Bars launched" diff --git a/herbstluftwm/.config/herbstluftwm/reindex.sh b/herbstluftwm/.config/herbstluftwm/reindex.sh new file mode 100755 index 0000000..b07c555 --- /dev/null +++ b/herbstluftwm/.config/herbstluftwm/reindex.sh @@ -0,0 +1,15 @@ +#!/bin/env bash + +hc() { "${herbstclient_command[@]:-herbstclient}" "$@" ;} + +num_tags=$(hc attr tags.count) + +hidden_tags="scratchpad hidden fl" + +i=1 + +for tag in $hidden_tags; do + hc set_attr "tags.by-name.$tag.index" $((num_tags-i)) + echo "$tag to $((num_tags-i))" + i=$((i+1)) +done diff --git a/herbstluftwm/.config/herbstluftwm/rules b/herbstluftwm/.config/herbstluftwm/rules index 9fedcae..4157ae1 100755 --- a/herbstluftwm/.config/herbstluftwm/rules +++ b/herbstluftwm/.config/herbstluftwm/rules @@ -29,13 +29,13 @@ hc rule windowtype~'_NET_WM_WINDOW_TYPE_(NOTIFICATION|DOCK|DESKTOP)' \ # _NET_WM_WINDOW_TYPE_(ATOM) = <windowtype> # WM_WINDOW_ROLE(STRING) = "<windowrole>" hc rule class='jetbrains-toolbox' \ - floating=on floatplacement=none focus=off -hc rule instance~'jetbrains-[a-z]*' class~'jetbrains-[a-z]*' title='win0' \ floating=on floatplacement=center focus=off -hc rule instance~'jetbrains-[a-z]*' class~'jetbrains-[a-z]*' \ +hc rule instance~'jetbrains-[a-z]*' class~'jetbrains-[a-z]*' title='win0' \ + floating=on floatplacement=center focus=off +hc rule instance~'jetbrains-[a-z]*' class~'jetbrains-[a-z]*' \ title='Cannot execute command' \ floating=on floatplacement=center focus=off -hc rule instance~'jetbrains-[a-z]*' class~'jetbrains-[a-z]*' \ +hc rule instance~'jetbrains-[a-z]*' class~'jetbrains-[a-z]*' \ title~'(Welcome.*)|(Java)' \ floating=on floatplacement=center focus=off hc rule instance='gcr-prompter' class='Gcr-prompter' title='Unlock Keyring' \ @@ -46,4 +46,6 @@ hc rule instance=Steam class=Steam title~'(.*)List(.*)' \ focus=off hc rule instance=scratchpad \ tag=scratchpad +hc rule title='Discord Updater' \ + floating=on diff --git a/herbstluftwm/.config/herbstluftwm/swap_monitor_tag.sh b/herbstluftwm/.config/herbstluftwm/swap_monitor_tag.sh new file mode 100755 index 0000000..8018c6d --- /dev/null +++ b/herbstluftwm/.config/herbstluftwm/swap_monitor_tag.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +dir="$XDG_CONFIG_HOME/herbstluftwm" + +hc() { + herbstclient "$@" +} + + +hc chain . \ + . lock \ + . new_attr string my_prev_monitor_tag \ + . substitute T monitors.focus.tag \ + set_attr my_prev_monitor_tag T \ + . spawn bash -c \ + "'$dir/cycle_main_monitors.sh' \ + && herbstclient substitute T my_prev_monitor_tag \ + use T" + +hc unlock diff --git a/herbstluftwm/.config/herbstluftwm/toggle_floatmon.sh b/herbstluftwm/.config/herbstluftwm/toggle_floatmon.sh new file mode 100755 index 0000000..f0b13b9 --- /dev/null +++ b/herbstluftwm/.config/herbstluftwm/toggle_floatmon.sh @@ -0,0 +1,33 @@ +#!/usr/bin/env bash + +# Toggle floating monitor + +monitor=floatmon +tag=fl + +hc() { "${herbstclient_command[@]:-herbstclient}" "$@" ;} + +if which xwininfo &> /dev/null; then + size=$(xwininfo -root | + sed -n -e '/^ Width: / { + s/.*: //; + h + } + /^ Height: / { + s/.*: //g; + H; + x; + s/\n/x/p + }') +else + echo "This script requires the xwininfo binary." + exit 1 +fi + +hc chain , add "$tag" , floating "$tag" on +hc or , and . add_monitor "$size"+0+0 "$tag" "$monitor" \ + . raise_monitor "$monitor" \ + . pad "$monitor" 32 32 32 32 \ + . lock_tag "$monitor" \ + , remove_monitor "$monitor" "$size"+0+0 + diff --git a/herbstluftwm/.local/bin/statusbar/polybar_hlwm_workspaces.sh b/herbstluftwm/.local/bin/statusbar/polybar_hlwm_workspaces.sh index b7cf5e6..52ca9e4 100755 --- a/herbstluftwm/.local/bin/statusbar/polybar_hlwm_workspaces.sh +++ b/herbstluftwm/.local/bin/statusbar/polybar_hlwm_workspaces.sh @@ -14,15 +14,16 @@ hlwm_id() { done <<< "$(monitor_bound "$1")" } +echo "${MONITOR:?"Polybar should set the MONITOR variable"}" + this_monitor=$(polybar -m | grep "$MONITOR") monitor=$(hlwm_id "$this_monitor") get_layout() { - currenttag=$(hc tag_status | tr '\t' '\n' | sed -n 's/#//p') - focusedtaglayout=$(hc layout "$currenttag" @ | awk '{print $2}' | sed 's/://') - case "$focusedtaglayout" in + current_layout=$(hc get_attr tags.focus.tiling.focused_frame.algorithm) + case "$current_layout" in vertical) echo "V" ;; horizontal) @@ -36,7 +37,7 @@ get_layout() { layout=$(get_layout) -herbstclient --idle "(tag_*|focus_changed|window_title_changed)" 2>/dev/null | { +herbstclient --idle "(tag_*|(focus|window_title|attribute)_changed)" 2>/dev/null | { while true; do # Read tags into $tags array @@ -45,6 +46,8 @@ herbstclient --idle "(tag_*|focus_changed|window_title_changed)" 2>/dev/null | { # Read the prefix from each tag for i in "${tags[@]}" ; do case ${i:1} in + 'fl') + ;& 'hidden') ;& 'scratchpad') @@ -81,7 +84,7 @@ herbstclient --idle "(tag_*|focus_changed|window_title_changed)" 2>/dev/null | { ;; esac - echo "%{A1:herbstclient use ${i:1}:} ${i:1} %{A -u -o F- B-}" + echo "%{A1:herbstclient and . focus_monitor $monitor . use ${i:1}:} ${i:1} %{A -u -o F- B-}" done echo "%{F-}%{B-}" @@ -91,10 +94,23 @@ herbstclient --idle "(tag_*|focus_changed|window_title_changed)" 2>/dev/null | { } | tr -d "\n" echo IFS=$'\t' read -ra cmd || break - case "${cmd[0]}" in - focus_changed|window_title_changed|layout_changed) - layout=$(get_layout) + #focus_changed|window_title_changed) + # layout=$(get_layout) ;; + attribute_changed) + if [[ "${cmd[1]}" == "tags.focus.tiling.focused_frame.algorithm" ]]; then + case "${cmd[3]}" in + vertical) + layout="V" ;; + horizontal) + layout="H" ;; + max) + layout="M" ;; + grid) + layout="G" ;; + esac + #layout="${cmd[3]}" + fi esac # wait for next event from herbstclient --idle # read -r || break diff --git a/kak/.config/kak-lsp/kak-lsp.toml b/kak/.config/kak-lsp/kak-lsp.toml new file mode 100644 index 0000000..8468450 --- /dev/null +++ b/kak/.config/kak-lsp/kak-lsp.toml @@ -0,0 +1,57 @@ +snippet_support = true +verbosity = 2 + +[semantic_scopes] +# Map textmate scopes to kakoune faces for semantic highlighting +# the underscores are translated to dots, and indicate nesting. +# That is, if variable_other_field is omitted, it will try the face for +# variable_other and then variable +# +# To see a list of available scopes in the debug buffer, run lsp-semantic-available-scopes +variable = "variable" +entity_name_function = "function" +entity_name_type = "type" +variable_other_enummember = "variable" +entity_name_namespace = "module" + +# Semantic tokens support +# See https://github.com/microsoft/vscode-languageserver-node/blob/8c8981eb4fb6adec27bf1bb5390a0f8f7df2899e/client/src/semanticTokens.proposed.ts#L288 +# for token/modifier types. + +[semantic_tokens] +type = "type" +variable = "variable" +namespace = "module" +function = "function" +string = "string" +keyword = "keyword" +operator = "operator" +comment = "comment" + +[semantic_token_modifiers] +documentation = "documentation" +readonly = "default+d" + +[server] +# exit session if no requests were received during given period in seconds +# works only in unix sockets mode (-s/--session) +# set to 0 to disable +timeout = 1800 # seconds = 30 minutes + +[language.bash] +filetypes = ["sh"] +roots = [".git", ".hg"] +command = "bash-language-server" +args = ["start"] + +#[language.deno] +#filetypes = ["typescript", "javascript"] +#roots = [".git"] +#command = "deno" +#args = ["lsp"] + +[language.typescript] +filetypes = ["typescript"] +roots = ["tsconfig.json"] +command = "typescript-language-server" +args = ["--stdio"] diff --git a/kak/.config/kak/kakrc b/kak/.config/kak/kakrc new file mode 100644 index 0000000..80b9252 --- /dev/null +++ b/kak/.config/kak/kakrc @@ -0,0 +1,62 @@ +colorscheme gruvbox + +set-option global tabstop 4 +set-option global indentwidth 4 + +set-option global scrolloff 1,3 + +#set-option global ui_options ncurses_status_on_top=true + +add-highlighter global/ number-lines -hlcursor -relative + +add-highlighter global/ regex \h+$ 0:Error + +add-highlighter global/ wrap -word -indent + +#set-option global autoinfo normal + + +# setup plug.kak +source "%val{config}/plugins/plug.kak/rc/plug.kak" + +plug "kak-lsp/kak-lsp" do %{ + cargo install --locked --force --path . +} config %{ + # uncomment to enable debugging + # eval %sh{echo ${kak_opt_lsp_cmd} >> /tmp/kak-lsp.log} + # set global lsp_cmd "kak-lsp -s %val{session} -vvv --log /tmp/kak-lsp.log" + # this is not necessary; the `lsp-enable-window` will take care of it + # eval %sh{${kak_opt_lsp_cmd} --kakoune -s $kak_session} + set global lsp_diagnostic_line_error_sign '║' + set global lsp_diagnostic_line_warning_sign '┊' + define-command ne -docstring 'go to next error/warning from lsp' %{ lsp-find-error --include-warnings } + define-command pe -docstring 'go to previous error/warning from lsp' %{ lsp-find-error --previous --include-warnings } + define-command ee -docstring 'go to current error/warning from lsp' %{ lsp-find-error --include-warnings; lsp-find-error --previous --include-warnings } + + define-command lsp-restart -docstring 'restar lsp server' %{ lsp-stop; lsp-start } + hook global WinSetOption filetype=(c|cpp|cc|rust|javascript|typescript) %{ + set-option window lsp_auto_highlight_references true + set-option window lsp_hover_anchor false + lsp-auto-hover-enable + echo -debug "Enabling LSP for filetype %opt{filetype}" + lsp-enable-window + } + + hook global WinSetOption filetype=(rust) %{ + set window lsp_server_configuration rust.clippy_preference="on" + } + + hook global WinSetOption filetype=rust %{ + hook window BufWritePre .* %{ + evaluate-commands %sh{ + test -f rustfmt.toml %% printf lsp-formatting-sync + } + } + } + + hook global KakEnd .* lsp-exit +} + +# enable lsp +#eval %sh{kak-lsp --kakoune -s $kak_session} +#lsp-enable diff --git a/kak/.config/kak/plugins/kak-lsp b/kak/.config/kak/plugins/kak-lsp new file mode 160000 +Subproject 188e87f7f86537070ad0e1b56f81ca753135f68 diff --git a/kak/.config/kak/plugins/plug.kak b/kak/.config/kak/plugins/plug.kak new file mode 160000 +Subproject cf02b00f3764cbd03ce9ab6eec2f4eed035c073 diff --git a/nvim/.config/nvim/autoload/plug.vim b/nvim/.config/nvim/autoload/plug.vim index 7914bfe..9c296ac 100644 --- a/nvim/.config/nvim/autoload/plug.vim +++ b/nvim/.config/nvim/autoload/plug.vim @@ -25,7 +25,7 @@ " Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' } " Plug 'tpope/vim-fireplace', { 'for': 'clojure' } " -" " Using a non-master branch +" " Using a non-default branch " Plug 'rdnetto/YCM-Generator', { 'branch': 'stable' } " " " Using a tagged release; wildcard allowed (requires git 1.9.2 or above) @@ -106,7 +106,7 @@ if s:is_win && &shellslash else let s:me = resolve(expand('<sfile>:p')) endif -let s:base_spec = { 'branch': 'master', 'frozen': 0 } +let s:base_spec = { 'branch': '', 'frozen': 0 } let s:TYPE = { \ 'string': type(''), \ 'list': type([]), @@ -116,6 +116,90 @@ let s:TYPE = { let s:loaded = get(s:, 'loaded', {}) let s:triggers = get(s:, 'triggers', {}) +function! s:isabsolute(dir) abort + return a:dir =~# '^/' || (has('win32') && a:dir =~? '^\%(\\\|[A-Z]:\)') +endfunction + +function! s:git_dir(dir) abort + let gitdir = s:trim(a:dir) . '/.git' + if isdirectory(gitdir) + return gitdir + endif + if !filereadable(gitdir) + return '' + endif + let gitdir = matchstr(get(readfile(gitdir), 0, ''), '^gitdir: \zs.*') + if len(gitdir) && !s:isabsolute(gitdir) + let gitdir = a:dir . '/' . gitdir + endif + return isdirectory(gitdir) ? gitdir : '' +endfunction + +function! s:git_origin_url(dir) abort + let gitdir = s:git_dir(a:dir) + let config = gitdir . '/config' + if empty(gitdir) || !filereadable(config) + return '' + endif + return matchstr(join(readfile(config)), '\[remote "origin"\].\{-}url\s*=\s*\zs\S*\ze') +endfunction + +function! s:git_revision(dir) abort + let gitdir = s:git_dir(a:dir) + let head = gitdir . '/HEAD' + if empty(gitdir) || !filereadable(head) + return '' + endif + + let line = get(readfile(head), 0, '') + let ref = matchstr(line, '^ref: \zs.*') + if empty(ref) + return line + endif + + if filereadable(gitdir . '/' . ref) + return get(readfile(gitdir . '/' . ref), 0, '') + endif + + if filereadable(gitdir . '/packed-refs') + for line in readfile(gitdir . '/packed-refs') + if line =~# ' ' . ref + return matchstr(line, '^[0-9a-f]*') + endif + endfor + endif + + return '' +endfunction + +function! s:git_local_branch(dir) abort + let gitdir = s:git_dir(a:dir) + let head = gitdir . '/HEAD' + if empty(gitdir) || !filereadable(head) + return '' + endif + let branch = matchstr(get(readfile(head), 0, ''), '^ref: refs/heads/\zs.*') + return len(branch) ? branch : 'HEAD' +endfunction + +function! s:git_origin_branch(spec) + if len(a:spec.branch) + return a:spec.branch + endif + + " The file may not be present if this is a local repository + let gitdir = s:git_dir(a:spec.dir) + let origin_head = gitdir.'/refs/remotes/origin/HEAD' + if len(gitdir) && filereadable(origin_head) + return matchstr(get(readfile(origin_head), 0, ''), + \ '^ref: refs/remotes/origin/\zs.*') + endif + + " The command may not return the name of a branch in detached HEAD state + let result = s:lines(s:system('git symbolic-ref --short HEAD', a:spec.dir)) + return v:shell_error ? '' : result[-1] +endfunction + if s:is_win function! s:plug_call(fn, ...) let shellslash = &shellslash @@ -646,25 +730,25 @@ function! s:parse_options(arg) endif let opts.tag = a:arg elseif type == s:TYPE.dict - call extend(opts, a:arg) for opt in ['branch', 'tag', 'commit', 'rtp', 'dir', 'as'] - if has_key(opts, opt) - \ && (type(opts[opt]) != s:TYPE.string || empty(opts[opt])) + if has_key(a:arg, opt) + \ && (type(a:arg[opt]) != s:TYPE.string || empty(a:arg[opt])) throw printf(opt_errfmt, opt, 'string') endif endfor for opt in ['on', 'for'] - if has_key(opts, opt) - \ && type(opts[opt]) != s:TYPE.list - \ && (type(opts[opt]) != s:TYPE.string || empty(opts[opt])) + if has_key(a:arg, opt) + \ && type(a:arg[opt]) != s:TYPE.list + \ && (type(a:arg[opt]) != s:TYPE.string || empty(a:arg[opt])) throw printf(opt_errfmt, opt, 'string or list') endif endfor - if has_key(opts, 'do') - \ && type(opts.do) != s:TYPE.funcref - \ && (type(opts.do) != s:TYPE.string || empty(opts.do)) + if has_key(a:arg, 'do') + \ && type(a:arg.do) != s:TYPE.funcref + \ && (type(a:arg.do) != s:TYPE.string || empty(a:arg.do)) throw printf(opt_errfmt, 'do', 'string or funcref') endif + call extend(opts, a:arg) if has_key(opts, 'dir') let opts.dir = s:dirpath(s:plug_expand(opts.dir)) endif @@ -720,7 +804,7 @@ function! s:syntax() syn match plugNumber /[0-9]\+[0-9.]*/ contained syn match plugBracket /[[\]]/ contained syn match plugX /x/ contained - syn match plugDash /^-/ + syn match plugDash /^-\{1}\ / syn match plugPlus /^+/ syn match plugStar /^*/ syn match plugMessage /\(^- \)\@<=.*/ @@ -738,6 +822,7 @@ function! s:syntax() syn match plugError /^x.*/ syn region plugDeleted start=/^\~ .*/ end=/^\ze\S/ syn match plugH2 /^.*:\n-\+$/ + syn match plugH2 /^-\{2,}/ syn keyword Function PlugInstall PlugStatus PlugUpdate PlugClean hi def link plug1 Title hi def link plug2 Repeat @@ -991,10 +1076,11 @@ endfunction function! s:checkout(spec) let sha = a:spec.commit - let output = s:system(['git', 'rev-parse', 'HEAD'], a:spec.dir) - if !v:shell_error && !s:hash_match(sha, s:lines(output)[0]) + let output = s:git_revision(a:spec.dir) + if !empty(output) && !s:hash_match(sha, s:lines(output)[0]) + let credential_helper = s:git_version_requirement(2) ? '-c credential.helper= ' : '' let output = s:system( - \ 'git fetch --depth 999999 && git checkout '.plug#shellescape(sha).' --', a:spec.dir) + \ 'git '.credential_helper.'fetch --depth 999999 && git checkout '.plug#shellescape(sha).' --', a:spec.dir) endif return output endfunction @@ -1206,7 +1292,7 @@ function! s:update_finish() call s:log4(name, 'Checking out '.tag) let out = s:system('git checkout -q '.plug#shellescape(tag).' -- 2>&1', spec.dir) else - let branch = get(spec, 'branch', 'master') + let branch = s:git_origin_branch(spec) call s:log4(name, 'Merging origin/'.s:esc(branch)) let out = s:system('git checkout -q '.plug#shellescape(branch).' -- 2>&1' \. (has_key(s:update.new, name) ? '' : ('&& git merge --ff-only '.plug#shellescape('origin/'.branch).' 2>&1')), spec.dir) @@ -1446,7 +1532,7 @@ while 1 " Without TCO, Vim stack is bound to explode let [error, _] = s:git_validate(spec, 0) if empty(error) if pull - let cmd = ['git', 'fetch'] + let cmd = s:git_version_requirement(2) ? ['git', '-c', 'credential.helper=', 'fetch'] : ['git', 'fetch'] if has_tag && !empty(globpath(spec.dir, '.git/shallow')) call extend(cmd, ['--depth', '99999999']) endif @@ -2211,18 +2297,17 @@ endfunction function! s:git_validate(spec, check_branch) let err = '' if isdirectory(a:spec.dir) - let result = s:lines(s:system('git rev-parse --abbrev-ref HEAD 2>&1 && git config -f .git/config remote.origin.url', a:spec.dir)) + let result = [s:git_local_branch(a:spec.dir), s:git_origin_url(a:spec.dir)] let remote = result[-1] - if v:shell_error + if empty(remote) let err = join([remote, 'PlugClean required.'], "\n") elseif !s:compare_git_uri(remote, a:spec.uri) let err = join(['Invalid URI: '.remote, \ 'Expected: '.a:spec.uri, \ 'PlugClean required.'], "\n") elseif a:check_branch && has_key(a:spec, 'commit') - let result = s:lines(s:system('git rev-parse HEAD 2>&1', a:spec.dir)) - let sha = result[-1] - if v:shell_error + let sha = s:git_revision(a:spec.dir) + if empty(sha) let err = join(add(result, 'PlugClean required.'), "\n") elseif !s:hash_match(sha, a:spec.commit) let err = join([printf('Invalid HEAD (expected: %s, actual: %s)', @@ -2230,8 +2315,9 @@ function! s:git_validate(spec, check_branch) \ 'PlugUpdate required.'], "\n") endif elseif a:check_branch - let branch = result[0] + let current_branch = result[0] " Check tag + let origin_branch = s:git_origin_branch(a:spec) if has_key(a:spec, 'tag') let tag = s:system_chomp('git describe --exact-match --tags HEAD 2>&1', a:spec.dir) if a:spec.tag !=# tag && a:spec.tag !~ '\*' @@ -2239,14 +2325,14 @@ function! s:git_validate(spec, check_branch) \ (empty(tag) ? 'N/A' : tag), a:spec.tag) endif " Check branch - elseif a:spec.branch !=# branch + elseif origin_branch !=# current_branch let err = printf('Invalid branch: %s (expected: %s). Try PlugUpdate.', - \ branch, a:spec.branch) + \ current_branch, origin_branch) endif if empty(err) let [ahead, behind] = split(s:lastline(s:system([ \ 'git', 'rev-list', '--count', '--left-right', - \ printf('HEAD...origin/%s', a:spec.branch) + \ printf('HEAD...origin/%s', origin_branch) \ ], a:spec.dir)), '\t') if !v:shell_error && ahead if behind @@ -2254,11 +2340,11 @@ function! s:git_validate(spec, check_branch) " pushable (and probably not that messed up). let err = printf( \ "Diverged from origin/%s (%d commit(s) ahead and %d commit(s) behind!\n" - \ .'Backup local changes and run PlugClean and PlugUpdate to reinstall it.', a:spec.branch, ahead, behind) + \ .'Backup local changes and run PlugClean and PlugUpdate to reinstall it.', origin_branch, ahead, behind) else let err = printf("Ahead of origin/%s by %d commit(s).\n" \ .'Cannot update until local changes are pushed.', - \ a:spec.branch, ahead) + \ origin_branch, ahead) endif endif endif @@ -2588,20 +2674,23 @@ function! s:diff() endif call s:append_ul(2, origin ? 'Pending updates:' : 'Last update:') for [k, v] in plugs - let range = origin ? '..origin/'.v.branch : 'HEAD@{1}..' - let cmd = ['git', 'log', '--graph', '--color=never'] - if s:git_version_requirement(2, 10, 0) - call add(cmd, '--no-show-signature') - endif - call extend(cmd, ['--pretty=format:%x01%h%x01%d%x01%s%x01%cr', range]) - if has_key(v, 'rtp') - call extend(cmd, ['--', v.rtp]) - endif - let diff = s:system_chomp(cmd, v.dir) - if !empty(diff) - let ref = has_key(v, 'tag') ? (' (tag: '.v.tag.')') : has_key(v, 'commit') ? (' '.v.commit) : '' - call append(5, extend(['', '- '.k.':'.ref], map(s:lines(diff), 's:format_git_log(v:val)'))) - let cnts[origin] += 1 + let branch = s:git_origin_branch(v) + if len(branch) + let range = origin ? '..origin/'.branch : 'HEAD@{1}..' + let cmd = ['git', 'log', '--graph', '--color=never'] + if s:git_version_requirement(2, 10, 0) + call add(cmd, '--no-show-signature') + endif + call extend(cmd, ['--pretty=format:%x01%h%x01%d%x01%s%x01%cr', range]) + if has_key(v, 'rtp') + call extend(cmd, ['--', v.rtp]) + endif + let diff = s:system_chomp(cmd, v.dir) + if !empty(diff) + let ref = has_key(v, 'tag') ? (' (tag: '.v.tag.')') : has_key(v, 'commit') ? (' '.v.commit) : '' + call append(5, extend(['', '- '.k.':'.ref], map(s:lines(diff), 's:format_git_log(v:val)'))) + let cnts[origin] += 1 + endif endif let bar .= '=' call s:progress_bar(2, bar, len(total)) @@ -2663,7 +2752,7 @@ function! s:snapshot(force, ...) abort let names = sort(keys(filter(copy(g:plugs), \'has_key(v:val, "uri") && !has_key(v:val, "commit") && isdirectory(v:val.dir)'))) for name in reverse(names) - let sha = s:system_chomp(['git', 'rev-parse', '--short', 'HEAD'], g:plugs[name].dir) + let sha = s:git_revision(g:plugs[name].dir) if !empty(sha) call append(anchor, printf("silent! let g:plugs['%s'].commit = '%s'", name, sha)) redraw diff --git a/nvim/.config/nvim/autoload/plug.vim.old b/nvim/.config/nvim/autoload/plug.vim.old new file mode 100644 index 0000000..7914bfe --- /dev/null +++ b/nvim/.config/nvim/autoload/plug.vim.old @@ -0,0 +1,2699 @@ +" vim-plug: Vim plugin manager +" ============================ +" +" Download plug.vim and put it in ~/.vim/autoload +" +" curl -fLo ~/.vim/autoload/plug.vim --create-dirs \ +" https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim +" +" Edit your .vimrc +" +" call plug#begin('~/.vim/plugged') +" +" " Make sure you use single quotes +" +" " Shorthand notation; fetches https://github.com/junegunn/vim-easy-align +" Plug 'junegunn/vim-easy-align' +" +" " Any valid git URL is allowed +" Plug 'https://github.com/junegunn/vim-github-dashboard.git' +" +" " Multiple Plug commands can be written in a single line using | separators +" Plug 'SirVer/ultisnips' | Plug 'honza/vim-snippets' +" +" " On-demand loading +" Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' } +" Plug 'tpope/vim-fireplace', { 'for': 'clojure' } +" +" " Using a non-master branch +" Plug 'rdnetto/YCM-Generator', { 'branch': 'stable' } +" +" " Using a tagged release; wildcard allowed (requires git 1.9.2 or above) +" Plug 'fatih/vim-go', { 'tag': '*' } +" +" " Plugin options +" Plug 'nsf/gocode', { 'tag': 'v.20150303', 'rtp': 'vim' } +" +" " Plugin outside ~/.vim/plugged with post-update hook +" Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' } +" +" " Unmanaged plugin (manually installed and updated) +" Plug '~/my-prototype-plugin' +" +" " Initialize plugin system +" call plug#end() +" +" Then reload .vimrc and :PlugInstall to install plugins. +" +" Plug options: +" +"| Option | Description | +"| ----------------------- | ------------------------------------------------ | +"| `branch`/`tag`/`commit` | Branch/tag/commit of the repository to use | +"| `rtp` | Subdirectory that contains Vim plugin | +"| `dir` | Custom directory for the plugin | +"| `as` | Use different name for the plugin | +"| `do` | Post-update hook (string or funcref) | +"| `on` | On-demand loading: Commands or `<Plug>`-mappings | +"| `for` | On-demand loading: File types | +"| `frozen` | Do not update unless explicitly specified | +" +" More information: https://github.com/junegunn/vim-plug +" +" +" Copyright (c) 2017 Junegunn Choi +" +" MIT License +" +" Permission is hereby granted, free of charge, to any person obtaining +" a copy of this software and associated documentation files (the +" "Software"), to deal in the Software without restriction, including +" without limitation the rights to use, copy, modify, merge, publish, +" distribute, sublicense, and/or sell copies of the Software, and to +" permit persons to whom the Software is furnished to do so, subject to +" the following conditions: +" +" The above copyright notice and this permission notice shall be +" included in all copies or substantial portions of the Software. +" +" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +" EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +" NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +" LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +" OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +" WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +if exists('g:loaded_plug') + finish +endif +let g:loaded_plug = 1 + +let s:cpo_save = &cpo +set cpo&vim + +let s:plug_src = 'https://github.com/junegunn/vim-plug.git' +let s:plug_tab = get(s:, 'plug_tab', -1) +let s:plug_buf = get(s:, 'plug_buf', -1) +let s:mac_gui = has('gui_macvim') && has('gui_running') +let s:is_win = has('win32') +let s:nvim = has('nvim-0.2') || (has('nvim') && exists('*jobwait') && !s:is_win) +let s:vim8 = has('patch-8.0.0039') && exists('*job_start') +if s:is_win && &shellslash + set noshellslash + let s:me = resolve(expand('<sfile>:p')) + set shellslash +else + let s:me = resolve(expand('<sfile>:p')) +endif +let s:base_spec = { 'branch': 'master', 'frozen': 0 } +let s:TYPE = { +\ 'string': type(''), +\ 'list': type([]), +\ 'dict': type({}), +\ 'funcref': type(function('call')) +\ } +let s:loaded = get(s:, 'loaded', {}) +let s:triggers = get(s:, 'triggers', {}) + +if s:is_win + function! s:plug_call(fn, ...) + let shellslash = &shellslash + try + set noshellslash + return call(a:fn, a:000) + finally + let &shellslash = shellslash + endtry + endfunction +else + function! s:plug_call(fn, ...) + return call(a:fn, a:000) + endfunction +endif + +function! s:plug_getcwd() + return s:plug_call('getcwd') +endfunction + +function! s:plug_fnamemodify(fname, mods) + return s:plug_call('fnamemodify', a:fname, a:mods) +endfunction + +function! s:plug_expand(fmt) + return s:plug_call('expand', a:fmt, 1) +endfunction + +function! s:plug_tempname() + return s:plug_call('tempname') +endfunction + +function! plug#begin(...) + if a:0 > 0 + let s:plug_home_org = a:1 + let home = s:path(s:plug_fnamemodify(s:plug_expand(a:1), ':p')) + elseif exists('g:plug_home') + let home = s:path(g:plug_home) + elseif !empty(&rtp) + let home = s:path(split(&rtp, ',')[0]) . '/plugged' + else + return s:err('Unable to determine plug home. Try calling plug#begin() with a path argument.') + endif + if s:plug_fnamemodify(home, ':t') ==# 'plugin' && s:plug_fnamemodify(home, ':h') ==# s:first_rtp + return s:err('Invalid plug home. '.home.' is a standard Vim runtime path and is not allowed.') + endif + + let g:plug_home = home + let g:plugs = {} + let g:plugs_order = [] + let s:triggers = {} + + call s:define_commands() + return 1 +endfunction + +function! s:define_commands() + command! -nargs=+ -bar Plug call plug#(<args>) + if !executable('git') + return s:err('`git` executable not found. Most commands will not be available. To suppress this message, prepend `silent!` to `call plug#begin(...)`.') + endif + if has('win32') + \ && &shellslash + \ && (&shell =~# 'cmd\(\.exe\)\?$' || &shell =~# 'powershell\(\.exe\)\?$') + return s:err('vim-plug does not support shell, ' . &shell . ', when shellslash is set.') + endif + if !has('nvim') + \ && (has('win32') || has('win32unix')) + \ && !has('multi_byte') + return s:err('Vim needs +multi_byte feature on Windows to run shell commands. Enable +iconv for best results.') + endif + command! -nargs=* -bar -bang -complete=customlist,s:names PlugInstall call s:install(<bang>0, [<f-args>]) + command! -nargs=* -bar -bang -complete=customlist,s:names PlugUpdate call s:update(<bang>0, [<f-args>]) + command! -nargs=0 -bar -bang PlugClean call s:clean(<bang>0) + command! -nargs=0 -bar PlugUpgrade if s:upgrade() | execute 'source' s:esc(s:me) | endif + command! -nargs=0 -bar PlugStatus call s:status() + command! -nargs=0 -bar PlugDiff call s:diff() + command! -nargs=? -bar -bang -complete=file PlugSnapshot call s:snapshot(<bang>0, <f-args>) +endfunction + +function! s:to_a(v) + return type(a:v) == s:TYPE.list ? a:v : [a:v] +endfunction + +function! s:to_s(v) + return type(a:v) == s:TYPE.string ? a:v : join(a:v, "\n") . "\n" +endfunction + +function! s:glob(from, pattern) + return s:lines(globpath(a:from, a:pattern)) +endfunction + +function! s:source(from, ...) + let found = 0 + for pattern in a:000 + for vim in s:glob(a:from, pattern) + execute 'source' s:esc(vim) + let found = 1 + endfor + endfor + return found +endfunction + +function! s:assoc(dict, key, val) + let a:dict[a:key] = add(get(a:dict, a:key, []), a:val) +endfunction + +function! s:ask(message, ...) + call inputsave() + echohl WarningMsg + let answer = input(a:message.(a:0 ? ' (y/N/a) ' : ' (y/N) ')) + echohl None + call inputrestore() + echo "\r" + return (a:0 && answer =~? '^a') ? 2 : (answer =~? '^y') ? 1 : 0 +endfunction + +function! s:ask_no_interrupt(...) + try + return call('s:ask', a:000) + catch + return 0 + endtry +endfunction + +function! s:lazy(plug, opt) + return has_key(a:plug, a:opt) && + \ (empty(s:to_a(a:plug[a:opt])) || + \ !isdirectory(a:plug.dir) || + \ len(s:glob(s:rtp(a:plug), 'plugin')) || + \ len(s:glob(s:rtp(a:plug), 'after/plugin'))) +endfunction + +function! plug#end() + if !exists('g:plugs') + return s:err('plug#end() called without calling plug#begin() first') + endif + + if exists('#PlugLOD') + augroup PlugLOD + autocmd! + augroup END + augroup! PlugLOD + endif + let lod = { 'ft': {}, 'map': {}, 'cmd': {} } + + if exists('g:did_load_filetypes') + filetype off + endif + for name in g:plugs_order + if !has_key(g:plugs, name) + continue + endif + let plug = g:plugs[name] + if get(s:loaded, name, 0) || !s:lazy(plug, 'on') && !s:lazy(plug, 'for') + let s:loaded[name] = 1 + continue + endif + + if has_key(plug, 'on') + let s:triggers[name] = { 'map': [], 'cmd': [] } + for cmd in s:to_a(plug.on) + if cmd =~? '^<Plug>.\+' + if empty(mapcheck(cmd)) && empty(mapcheck(cmd, 'i')) + call s:assoc(lod.map, cmd, name) + endif + call add(s:triggers[name].map, cmd) + elseif cmd =~# '^[A-Z]' + let cmd = substitute(cmd, '!*$', '', '') + if exists(':'.cmd) != 2 + call s:assoc(lod.cmd, cmd, name) + endif + call add(s:triggers[name].cmd, cmd) + else + call s:err('Invalid `on` option: '.cmd. + \ '. Should start with an uppercase letter or `<Plug>`.') + endif + endfor + endif + + if has_key(plug, 'for') + let types = s:to_a(plug.for) + if !empty(types) + augroup filetypedetect + call s:source(s:rtp(plug), 'ftdetect/**/*.vim', 'after/ftdetect/**/*.vim') + augroup END + endif + for type in types + call s:assoc(lod.ft, type, name) + endfor + endif + endfor + + for [cmd, names] in items(lod.cmd) + execute printf( + \ 'command! -nargs=* -range -bang -complete=file %s call s:lod_cmd(%s, "<bang>", <line1>, <line2>, <q-args>, %s)', + \ cmd, string(cmd), string(names)) + endfor + + for [map, names] in items(lod.map) + for [mode, map_prefix, key_prefix] in + \ [['i', '<C-O>', ''], ['n', '', ''], ['v', '', 'gv'], ['o', '', '']] + execute printf( + \ '%snoremap <silent> %s %s:<C-U>call <SID>lod_map(%s, %s, %s, "%s")<CR>', + \ mode, map, map_prefix, string(map), string(names), mode != 'i', key_prefix) + endfor + endfor + + for [ft, names] in items(lod.ft) + augroup PlugLOD + execute printf('autocmd FileType %s call <SID>lod_ft(%s, %s)', + \ ft, string(ft), string(names)) + augroup END + endfor + + call s:reorg_rtp() + filetype plugin indent on + if has('vim_starting') + if has('syntax') && !exists('g:syntax_on') + syntax enable + end + else + call s:reload_plugins() + endif +endfunction + +function! s:loaded_names() + return filter(copy(g:plugs_order), 'get(s:loaded, v:val, 0)') +endfunction + +function! s:load_plugin(spec) + call s:source(s:rtp(a:spec), 'plugin/**/*.vim', 'after/plugin/**/*.vim') +endfunction + +function! s:reload_plugins() + for name in s:loaded_names() + call s:load_plugin(g:plugs[name]) + endfor +endfunction + +function! s:trim(str) + return substitute(a:str, '[\/]\+$', '', '') +endfunction + +function! s:version_requirement(val, min) + for idx in range(0, len(a:min) - 1) + let v = get(a:val, idx, 0) + if v < a:min[idx] | return 0 + elseif v > a:min[idx] | return 1 + endif + endfor + return 1 +endfunction + +function! s:git_version_requirement(...) + if !exists('s:git_version') + let s:git_version = map(split(split(s:system(['git', '--version']))[2], '\.'), 'str2nr(v:val)') + endif + return s:version_requirement(s:git_version, a:000) +endfunction + +function! s:progress_opt(base) + return a:base && !s:is_win && + \ s:git_version_requirement(1, 7, 1) ? '--progress' : '' +endfunction + +function! s:rtp(spec) + return s:path(a:spec.dir . get(a:spec, 'rtp', '')) +endfunction + +if s:is_win + function! s:path(path) + return s:trim(substitute(a:path, '/', '\', 'g')) + endfunction + + function! s:dirpath(path) + return s:path(a:path) . '\' + endfunction + + function! s:is_local_plug(repo) + return a:repo =~? '^[a-z]:\|^[%~]' + endfunction + + " Copied from fzf + function! s:wrap_cmds(cmds) + let cmds = [ + \ '@echo off', + \ 'setlocal enabledelayedexpansion'] + \ + (type(a:cmds) == type([]) ? a:cmds : [a:cmds]) + \ + ['endlocal'] + if has('iconv') + if !exists('s:codepage') + let s:codepage = libcallnr('kernel32.dll', 'GetACP', 0) + endif + return map(cmds, printf('iconv(v:val."\r", "%s", "cp%d")', &encoding, s:codepage)) + endif + return map(cmds, 'v:val."\r"') + endfunction + + function! s:batchfile(cmd) + let batchfile = s:plug_tempname().'.bat' + call writefile(s:wrap_cmds(a:cmd), batchfile) + let cmd = plug#shellescape(batchfile, {'shell': &shell, 'script': 0}) + if &shell =~# 'powershell\(\.exe\)\?$' + let cmd = '& ' . cmd + endif + return [batchfile, cmd] + endfunction +else + function! s:path(path) + return s:trim(a:path) + endfunction + + function! s:dirpath(path) + return substitute(a:path, '[/\\]*$', '/', '') + endfunction + + function! s:is_local_plug(repo) + return a:repo[0] =~ '[/$~]' + endfunction +endif + +function! s:err(msg) + echohl ErrorMsg + echom '[vim-plug] '.a:msg + echohl None +endfunction + +function! s:warn(cmd, msg) + echohl WarningMsg + execute a:cmd 'a:msg' + echohl None +endfunction + +function! s:esc(path) + return escape(a:path, ' ') +endfunction + +function! s:escrtp(path) + return escape(a:path, ' ,') +endfunction + +function! s:remove_rtp() + for name in s:loaded_names() + let rtp = s:rtp(g:plugs[name]) + execute 'set rtp-='.s:escrtp(rtp) + let after = globpath(rtp, 'after') + if isdirectory(after) + execute 'set rtp-='.s:escrtp(after) + endif + endfor +endfunction + +function! s:reorg_rtp() + if !empty(s:first_rtp) + execute 'set rtp-='.s:first_rtp + execute 'set rtp-='.s:last_rtp + endif + + " &rtp is modified from outside + if exists('s:prtp') && s:prtp !=# &rtp + call s:remove_rtp() + unlet! s:middle + endif + + let s:middle = get(s:, 'middle', &rtp) + let rtps = map(s:loaded_names(), 's:rtp(g:plugs[v:val])') + let afters = filter(map(copy(rtps), 'globpath(v:val, "after")'), '!empty(v:val)') + let rtp = join(map(rtps, 'escape(v:val, ",")'), ',') + \ . ','.s:middle.',' + \ . join(map(afters, 'escape(v:val, ",")'), ',') + let &rtp = substitute(substitute(rtp, ',,*', ',', 'g'), '^,\|,$', '', 'g') + let s:prtp = &rtp + + if !empty(s:first_rtp) + execute 'set rtp^='.s:first_rtp + execute 'set rtp+='.s:last_rtp + endif +endfunction + +function! s:doautocmd(...) + if exists('#'.join(a:000, '#')) + execute 'doautocmd' ((v:version > 703 || has('patch442')) ? '<nomodeline>' : '') join(a:000) + endif +endfunction + +function! s:dobufread(names) + for name in a:names + let path = s:rtp(g:plugs[name]) + for dir in ['ftdetect', 'ftplugin', 'after/ftdetect', 'after/ftplugin'] + if len(finddir(dir, path)) + if exists('#BufRead') + doautocmd BufRead + endif + return + endif + endfor + endfor +endfunction + +function! plug#load(...) + if a:0 == 0 + return s:err('Argument missing: plugin name(s) required') + endif + if !exists('g:plugs') + return s:err('plug#begin was not called') + endif + let names = a:0 == 1 && type(a:1) == s:TYPE.list ? a:1 : a:000 + let unknowns = filter(copy(names), '!has_key(g:plugs, v:val)') + if !empty(unknowns) + let s = len(unknowns) > 1 ? 's' : '' + return s:err(printf('Unknown plugin%s: %s', s, join(unknowns, ', '))) + end + let unloaded = filter(copy(names), '!get(s:loaded, v:val, 0)') + if !empty(unloaded) + for name in unloaded + call s:lod([name], ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin']) + endfor + call s:dobufread(unloaded) + return 1 + end + return 0 +endfunction + +function! s:remove_triggers(name) + if !has_key(s:triggers, a:name) + return + endif + for cmd in s:triggers[a:name].cmd + execute 'silent! delc' cmd + endfor + for map in s:triggers[a:name].map + execute 'silent! unmap' map + execute 'silent! iunmap' map + endfor + call remove(s:triggers, a:name) +endfunction + +function! s:lod(names, types, ...) + for name in a:names + call s:remove_triggers(name) + let s:loaded[name] = 1 + endfor + call s:reorg_rtp() + + for name in a:names + let rtp = s:rtp(g:plugs[name]) + for dir in a:types + call s:source(rtp, dir.'/**/*.vim') + endfor + if a:0 + if !s:source(rtp, a:1) && !empty(s:glob(rtp, a:2)) + execute 'runtime' a:1 + endif + call s:source(rtp, a:2) + endif + call s:doautocmd('User', name) + endfor +endfunction + +function! s:lod_ft(pat, names) + let syn = 'syntax/'.a:pat.'.vim' + call s:lod(a:names, ['plugin', 'after/plugin'], syn, 'after/'.syn) + execute 'autocmd! PlugLOD FileType' a:pat + call s:doautocmd('filetypeplugin', 'FileType') + call s:doautocmd('filetypeindent', 'FileType') +endfunction + +function! s:lod_cmd(cmd, bang, l1, l2, args, names) + call s:lod(a:names, ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin']) + call s:dobufread(a:names) + execute printf('%s%s%s %s', (a:l1 == a:l2 ? '' : (a:l1.','.a:l2)), a:cmd, a:bang, a:args) +endfunction + +function! s:lod_map(map, names, with_prefix, prefix) + call s:lod(a:names, ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin']) + call s:dobufread(a:names) + let extra = '' + while 1 + let c = getchar(0) + if c == 0 + break + endif + let extra .= nr2char(c) + endwhile + + if a:with_prefix + let prefix = v:count ? v:count : '' + let prefix .= '"'.v:register.a:prefix + if mode(1) == 'no' + if v:operator == 'c' + let prefix = "\<esc>" . prefix + endif + let prefix .= v:operator + endif + call feedkeys(prefix, 'n') + endif + call feedkeys(substitute(a:map, '^<Plug>', "\<Plug>", '') . extra) +endfunction + +function! plug#(repo, ...) + if a:0 > 1 + return s:err('Invalid number of arguments (1..2)') + endif + + try + let repo = s:trim(a:repo) + let opts = a:0 == 1 ? s:parse_options(a:1) : s:base_spec + let name = get(opts, 'as', s:plug_fnamemodify(repo, ':t:s?\.git$??')) + let spec = extend(s:infer_properties(name, repo), opts) + if !has_key(g:plugs, name) + call add(g:plugs_order, name) + endif + let g:plugs[name] = spec + let s:loaded[name] = get(s:loaded, name, 0) + catch + return s:err(repo . ' ' . v:exception) + endtry +endfunction + +function! s:parse_options(arg) + let opts = copy(s:base_spec) + let type = type(a:arg) + let opt_errfmt = 'Invalid argument for "%s" option of :Plug (expected: %s)' + if type == s:TYPE.string + if empty(a:arg) + throw printf(opt_errfmt, 'tag', 'string') + endif + let opts.tag = a:arg + elseif type == s:TYPE.dict + call extend(opts, a:arg) + for opt in ['branch', 'tag', 'commit', 'rtp', 'dir', 'as'] + if has_key(opts, opt) + \ && (type(opts[opt]) != s:TYPE.string || empty(opts[opt])) + throw printf(opt_errfmt, opt, 'string') + endif + endfor + for opt in ['on', 'for'] + if has_key(opts, opt) + \ && type(opts[opt]) != s:TYPE.list + \ && (type(opts[opt]) != s:TYPE.string || empty(opts[opt])) + throw printf(opt_errfmt, opt, 'string or list') + endif + endfor + if has_key(opts, 'do') + \ && type(opts.do) != s:TYPE.funcref + \ && (type(opts.do) != s:TYPE.string || empty(opts.do)) + throw printf(opt_errfmt, 'do', 'string or funcref') + endif + if has_key(opts, 'dir') + let opts.dir = s:dirpath(s:plug_expand(opts.dir)) + endif + else + throw 'Invalid argument type (expected: string or dictionary)' + endif + return opts +endfunction + +function! s:infer_properties(name, repo) + let repo = a:repo + if s:is_local_plug(repo) + return { 'dir': s:dirpath(s:plug_expand(repo)) } + else + if repo =~ ':' + let uri = repo + else + if repo !~ '/' + throw printf('Invalid argument: %s (implicit `vim-scripts'' expansion is deprecated)', repo) + endif + let fmt = get(g:, 'plug_url_format', 'https://git::@github.com/%s.git') + let uri = printf(fmt, repo) + endif + return { 'dir': s:dirpath(g:plug_home.'/'.a:name), 'uri': uri } + endif +endfunction + +function! s:install(force, names) + call s:update_impl(0, a:force, a:names) +endfunction + +function! s:update(force, names) + call s:update_impl(1, a:force, a:names) +endfunction + +function! plug#helptags() + if !exists('g:plugs') + return s:err('plug#begin was not called') + endif + for spec in values(g:plugs) + let docd = join([s:rtp(spec), 'doc'], '/') + if isdirectory(docd) + silent! execute 'helptags' s:esc(docd) + endif + endfor + return 1 +endfunction + +function! s:syntax() + syntax clear + syntax region plug1 start=/\%1l/ end=/\%2l/ contains=plugNumber + syntax region plug2 start=/\%2l/ end=/\%3l/ contains=plugBracket,plugX + syn match plugNumber /[0-9]\+[0-9.]*/ contained + syn match plugBracket /[[\]]/ contained + syn match plugX /x/ contained + syn match plugDash /^-/ + syn match plugPlus /^+/ + syn match plugStar /^*/ + syn match plugMessage /\(^- \)\@<=.*/ + syn match plugName /\(^- \)\@<=[^ ]*:/ + syn match plugSha /\%(: \)\@<=[0-9a-f]\{4,}$/ + syn match plugTag /(tag: [^)]\+)/ + syn match plugInstall /\(^+ \)\@<=[^:]*/ + syn match plugUpdate /\(^* \)\@<=[^:]*/ + syn match plugCommit /^ \X*[0-9a-f]\{7,9} .*/ contains=plugRelDate,plugEdge,plugTag + syn match plugEdge /^ \X\+$/ + syn match plugEdge /^ \X*/ contained nextgroup=plugSha + syn match plugSha /[0-9a-f]\{7,9}/ contained + syn match plugRelDate /([^)]*)$/ contained + syn match plugNotLoaded /(not loaded)$/ + syn match plugError /^x.*/ + syn region plugDeleted start=/^\~ .*/ end=/^\ze\S/ + syn match plugH2 /^.*:\n-\+$/ + syn keyword Function PlugInstall PlugStatus PlugUpdate PlugClean + hi def link plug1 Title + hi def link plug2 Repeat + hi def link plugH2 Type + hi def link plugX Exception + hi def link plugBracket Structure + hi def link plugNumber Number + + hi def link plugDash Special + hi def link plugPlus Constant + hi def link plugStar Boolean + + hi def link plugMessage Function + hi def link plugName Label + hi def link plugInstall Function + hi def link plugUpdate Type + + hi def link plugError Error + hi def link plugDeleted Ignore + hi def link plugRelDate Comment + hi def link plugEdge PreProc + hi def link plugSha Identifier + hi def link plugTag Constant + + hi def link plugNotLoaded Comment +endfunction + +function! s:lpad(str, len) + return a:str . repeat(' ', a:len - len(a:str)) +endfunction + +function! s:lines(msg) + return split(a:msg, "[\r\n]") +endfunction + +function! s:lastline(msg) + return get(s:lines(a:msg), -1, '') +endfunction + +function! s:new_window() + execute get(g:, 'plug_window', 'vertical topleft new') +endfunction + +function! s:plug_window_exists() + let buflist = tabpagebuflist(s:plug_tab) + return !empty(buflist) && index(buflist, s:plug_buf) >= 0 +endfunction + +function! s:switch_in() + if !s:plug_window_exists() + return 0 + endif + + if winbufnr(0) != s:plug_buf + let s:pos = [tabpagenr(), winnr(), winsaveview()] + execute 'normal!' s:plug_tab.'gt' + let winnr = bufwinnr(s:plug_buf) + execute winnr.'wincmd w' + call add(s:pos, winsaveview()) + else + let s:pos = [winsaveview()] + endif + + setlocal modifiable + return 1 +endfunction + +function! s:switch_out(...) + call winrestview(s:pos[-1]) + setlocal nomodifiable + if a:0 > 0 + execute a:1 + endif + + if len(s:pos) > 1 + execute 'normal!' s:pos[0].'gt' + execute s:pos[1] 'wincmd w' + call winrestview(s:pos[2]) + endif +endfunction + +function! s:finish_bindings() + nnoremap <silent> <buffer> R :call <SID>retry()<cr> + nnoremap <silent> <buffer> D :PlugDiff<cr> + nnoremap <silent> <buffer> S :PlugStatus<cr> + nnoremap <silent> <buffer> U :call <SID>status_update()<cr> + xnoremap <silent> <buffer> U :call <SID>status_update()<cr> + nnoremap <silent> <buffer> ]] :silent! call <SID>section('')<cr> + nnoremap <silent> <buffer> [[ :silent! call <SID>section('b')<cr> +endfunction + +function! s:prepare(...) + if empty(s:plug_getcwd()) + throw 'Invalid current working directory. Cannot proceed.' + endif + + for evar in ['$GIT_DIR', '$GIT_WORK_TREE'] + if exists(evar) + throw evar.' detected. Cannot proceed.' + endif + endfor + + call s:job_abort() + if s:switch_in() + if b:plug_preview == 1 + pc + endif + enew + else + call s:new_window() + endif + + nnoremap <silent> <buffer> q :if b:plug_preview==1<bar>pc<bar>endif<bar>bd<cr> + if a:0 == 0 + call s:finish_bindings() + endif + let b:plug_preview = -1 + let s:plug_tab = tabpagenr() + let s:plug_buf = winbufnr(0) + call s:assign_name() + + for k in ['<cr>', 'L', 'o', 'X', 'd', 'dd'] + execute 'silent! unmap <buffer>' k + endfor + setlocal buftype=nofile bufhidden=wipe nobuflisted nolist noswapfile nowrap cursorline modifiable nospell + if exists('+colorcolumn') + setlocal colorcolumn= + endif + setf vim-plug + if exists('g:syntax_on') + call s:syntax() + endif +endfunction + +function! s:assign_name() + " Assign buffer name + let prefix = '[Plugins]' + let name = prefix + let idx = 2 + while bufexists(name) + let name = printf('%s (%s)', prefix, idx) + let idx = idx + 1 + endwhile + silent! execute 'f' fnameescape(name) +endfunction + +function! s:chsh(swap) + let prev = [&shell, &shellcmdflag, &shellredir] + if !s:is_win + set shell=sh + endif + if a:swap + if &shell =~# 'powershell\(\.exe\)\?$' || &shell =~# 'pwsh$' + let &shellredir = '2>&1 | Out-File -Encoding UTF8 %s' + elseif &shell =~# 'sh' || &shell =~# 'cmd\(\.exe\)\?$' + set shellredir=>%s\ 2>&1 + endif + endif + return prev +endfunction + +function! s:bang(cmd, ...) + let batchfile = '' + try + let [sh, shellcmdflag, shrd] = s:chsh(a:0) + " FIXME: Escaping is incomplete. We could use shellescape with eval, + " but it won't work on Windows. + let cmd = a:0 ? s:with_cd(a:cmd, a:1) : a:cmd + if s:is_win + let [batchfile, cmd] = s:batchfile(cmd) + endif + let g:_plug_bang = (s:is_win && has('gui_running') ? 'silent ' : '').'!'.escape(cmd, '#!%') + execute "normal! :execute g:_plug_bang\<cr>\<cr>" + finally + unlet g:_plug_bang + let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd] + if s:is_win && filereadable(batchfile) + call delete(batchfile) + endif + endtry + return v:shell_error ? 'Exit status: ' . v:shell_error : '' +endfunction + +function! s:regress_bar() + let bar = substitute(getline(2)[1:-2], '.*\zs=', 'x', '') + call s:progress_bar(2, bar, len(bar)) +endfunction + +function! s:is_updated(dir) + return !empty(s:system_chomp(['git', 'log', '--pretty=format:%h', 'HEAD...HEAD@{1}'], a:dir)) +endfunction + +function! s:do(pull, force, todo) + for [name, spec] in items(a:todo) + if !isdirectory(spec.dir) + continue + endif + let installed = has_key(s:update.new, name) + let updated = installed ? 0 : + \ (a:pull && index(s:update.errors, name) < 0 && s:is_updated(spec.dir)) + if a:force || installed || updated + execute 'cd' s:esc(spec.dir) + call append(3, '- Post-update hook for '. name .' ... ') + let error = '' + let type = type(spec.do) + if type == s:TYPE.string + if spec.do[0] == ':' + if !get(s:loaded, name, 0) + let s:loaded[name] = 1 + call s:reorg_rtp() + endif + call s:load_plugin(spec) + try + execute spec.do[1:] + catch + let error = v:exception + endtry + if !s:plug_window_exists() + cd - + throw 'Warning: vim-plug was terminated by the post-update hook of '.name + endif + else + let error = s:bang(spec.do) + endif + elseif type == s:TYPE.funcref + try + call s:load_plugin(spec) + let status = installed ? 'installed' : (updated ? 'updated' : 'unchanged') + call spec.do({ 'name': name, 'status': status, 'force': a:force }) + catch + let error = v:exception + endtry + else + let error = 'Invalid hook type' + endif + call s:switch_in() + call setline(4, empty(error) ? (getline(4) . 'OK') + \ : ('x' . getline(4)[1:] . error)) + if !empty(error) + call add(s:update.errors, name) + call s:regress_bar() + endif + cd - + endif + endfor +endfunction + +function! s:hash_match(a, b) + return stridx(a:a, a:b) == 0 || stridx(a:b, a:a) == 0 +endfunction + +function! s:checkout(spec) + let sha = a:spec.commit + let output = s:system(['git', 'rev-parse', 'HEAD'], a:spec.dir) + if !v:shell_error && !s:hash_match(sha, s:lines(output)[0]) + let output = s:system( + \ 'git fetch --depth 999999 && git checkout '.plug#shellescape(sha).' --', a:spec.dir) + endif + return output +endfunction + +function! s:finish(pull) + let new_frozen = len(filter(keys(s:update.new), 'g:plugs[v:val].frozen')) + if new_frozen + let s = new_frozen > 1 ? 's' : '' + call append(3, printf('- Installed %d frozen plugin%s', new_frozen, s)) + endif + call append(3, '- Finishing ... ') | 4 + redraw + call plug#helptags() + call plug#end() + call setline(4, getline(4) . 'Done!') + redraw + let msgs = [] + if !empty(s:update.errors) + call add(msgs, "Press 'R' to retry.") + endif + if a:pull && len(s:update.new) < len(filter(getline(5, '$'), + \ "v:val =~ '^- ' && v:val !~# 'Already up.to.date'")) + call add(msgs, "Press 'D' to see the updated changes.") + endif + echo join(msgs, ' ') + call s:finish_bindings() +endfunction + +function! s:retry() + if empty(s:update.errors) + return + endif + echo + call s:update_impl(s:update.pull, s:update.force, + \ extend(copy(s:update.errors), [s:update.threads])) +endfunction + +function! s:is_managed(name) + return has_key(g:plugs[a:name], 'uri') +endfunction + +function! s:names(...) + return sort(filter(keys(g:plugs), 'stridx(v:val, a:1) == 0 && s:is_managed(v:val)')) +endfunction + +function! s:check_ruby() + silent! ruby require 'thread'; VIM::command("let g:plug_ruby = '#{RUBY_VERSION}'") + if !exists('g:plug_ruby') + redraw! + return s:warn('echom', 'Warning: Ruby interface is broken') + endif + let ruby_version = split(g:plug_ruby, '\.') + unlet g:plug_ruby + return s:version_requirement(ruby_version, [1, 8, 7]) +endfunction + +function! s:update_impl(pull, force, args) abort + let sync = index(a:args, '--sync') >= 0 || has('vim_starting') + let args = filter(copy(a:args), 'v:val != "--sync"') + let threads = (len(args) > 0 && args[-1] =~ '^[1-9][0-9]*$') ? + \ remove(args, -1) : get(g:, 'plug_threads', 16) + + let managed = filter(copy(g:plugs), 's:is_managed(v:key)') + let todo = empty(args) ? filter(managed, '!v:val.frozen || !isdirectory(v:val.dir)') : + \ filter(managed, 'index(args, v:key) >= 0') + + if empty(todo) + return s:warn('echo', 'No plugin to '. (a:pull ? 'update' : 'install')) + endif + + if !s:is_win && s:git_version_requirement(2, 3) + let s:git_terminal_prompt = exists('$GIT_TERMINAL_PROMPT') ? $GIT_TERMINAL_PROMPT : '' + let $GIT_TERMINAL_PROMPT = 0 + for plug in values(todo) + let plug.uri = substitute(plug.uri, + \ '^https://git::@github\.com', 'https://github.com', '') + endfor + endif + + if !isdirectory(g:plug_home) + try + call mkdir(g:plug_home, 'p') + catch + return s:err(printf('Invalid plug directory: %s. '. + \ 'Try to call plug#begin with a valid directory', g:plug_home)) + endtry + endif + + if has('nvim') && !exists('*jobwait') && threads > 1 + call s:warn('echom', '[vim-plug] Update Neovim for parallel installer') + endif + + let use_job = s:nvim || s:vim8 + let python = (has('python') || has('python3')) && !use_job + let ruby = has('ruby') && !use_job && (v:version >= 703 || v:version == 702 && has('patch374')) && !(s:is_win && has('gui_running')) && threads > 1 && s:check_ruby() + + let s:update = { + \ 'start': reltime(), + \ 'all': todo, + \ 'todo': copy(todo), + \ 'errors': [], + \ 'pull': a:pull, + \ 'force': a:force, + \ 'new': {}, + \ 'threads': (python || ruby || use_job) ? min([len(todo), threads]) : 1, + \ 'bar': '', + \ 'fin': 0 + \ } + + call s:prepare(1) + call append(0, ['', '']) + normal! 2G + silent! redraw + + let s:clone_opt = [] + if get(g:, 'plug_shallow', 1) + call extend(s:clone_opt, ['--depth', '1']) + if s:git_version_requirement(1, 7, 10) + call add(s:clone_opt, '--no-single-branch') + endif + endif + + if has('win32unix') || has('wsl') + call extend(s:clone_opt, ['-c', 'core.eol=lf', '-c', 'core.autocrlf=input']) + endif + + let s:submodule_opt = s:git_version_requirement(2, 8) ? ' --jobs='.threads : '' + + " Python version requirement (>= 2.7) + if python && !has('python3') && !ruby && !use_job && s:update.threads > 1 + redir => pyv + silent python import platform; print platform.python_version() + redir END + let python = s:version_requirement( + \ map(split(split(pyv)[0], '\.'), 'str2nr(v:val)'), [2, 6]) + endif + + if (python || ruby) && s:update.threads > 1 + try + let imd = &imd + if s:mac_gui + set noimd + endif + if ruby + call s:update_ruby() + else + call s:update_python() + endif + catch + let lines = getline(4, '$') + let printed = {} + silent! 4,$d _ + for line in lines + let name = s:extract_name(line, '.', '') + if empty(name) || !has_key(printed, name) + call append('$', line) + if !empty(name) + let printed[name] = 1 + if line[0] == 'x' && index(s:update.errors, name) < 0 + call add(s:update.errors, name) + end + endif + endif + endfor + finally + let &imd = imd + call s:update_finish() + endtry + else + call s:update_vim() + while use_job && sync + sleep 100m + if s:update.fin + break + endif + endwhile + endif +endfunction + +function! s:log4(name, msg) + call setline(4, printf('- %s (%s)', a:msg, a:name)) + redraw +endfunction + +function! s:update_finish() + if exists('s:git_terminal_prompt') + let $GIT_TERMINAL_PROMPT = s:git_terminal_prompt + endif + if s:switch_in() + call append(3, '- Updating ...') | 4 + for [name, spec] in items(filter(copy(s:update.all), 'index(s:update.errors, v:key) < 0 && (s:update.force || s:update.pull || has_key(s:update.new, v:key))')) + let [pos, _] = s:logpos(name) + if !pos + continue + endif + if has_key(spec, 'commit') + call s:log4(name, 'Checking out '.spec.commit) + let out = s:checkout(spec) + elseif has_key(spec, 'tag') + let tag = spec.tag + if tag =~ '\*' + let tags = s:lines(s:system('git tag --list '.plug#shellescape(tag).' --sort -version:refname 2>&1', spec.dir)) + if !v:shell_error && !empty(tags) + let tag = tags[0] + call s:log4(name, printf('Latest tag for %s -> %s', spec.tag, tag)) + call append(3, '') + endif + endif + call s:log4(name, 'Checking out '.tag) + let out = s:system('git checkout -q '.plug#shellescape(tag).' -- 2>&1', spec.dir) + else + let branch = get(spec, 'branch', 'master') + call s:log4(name, 'Merging origin/'.s:esc(branch)) + let out = s:system('git checkout -q '.plug#shellescape(branch).' -- 2>&1' + \. (has_key(s:update.new, name) ? '' : ('&& git merge --ff-only '.plug#shellescape('origin/'.branch).' 2>&1')), spec.dir) + endif + if !v:shell_error && filereadable(spec.dir.'/.gitmodules') && + \ (s:update.force || has_key(s:update.new, name) || s:is_updated(spec.dir)) + call s:log4(name, 'Updating submodules. This may take a while.') + let out .= s:bang('git submodule update --init --recursive'.s:submodule_opt.' 2>&1', spec.dir) + endif + let msg = s:format_message(v:shell_error ? 'x': '-', name, out) + if v:shell_error + call add(s:update.errors, name) + call s:regress_bar() + silent execute pos 'd _' + call append(4, msg) | 4 + elseif !empty(out) + call setline(pos, msg[0]) + endif + redraw + endfor + silent 4 d _ + try + call s:do(s:update.pull, s:update.force, filter(copy(s:update.all), 'index(s:update.errors, v:key) < 0 && has_key(v:val, "do")')) + catch + call s:warn('echom', v:exception) + call s:warn('echo', '') + return + endtry + call s:finish(s:update.pull) + call setline(1, 'Updated. Elapsed time: ' . split(reltimestr(reltime(s:update.start)))[0] . ' sec.') + call s:switch_out('normal! gg') + endif +endfunction + +function! s:job_abort() + if (!s:nvim && !s:vim8) || !exists('s:jobs') + return + endif + + for [name, j] in items(s:jobs) + if s:nvim + silent! call jobstop(j.jobid) + elseif s:vim8 + silent! call job_stop(j.jobid) + endif + if j.new + call s:rm_rf(g:plugs[name].dir) + endif + endfor + let s:jobs = {} +endfunction + +function! s:last_non_empty_line(lines) + let len = len(a:lines) + for idx in range(len) + let line = a:lines[len-idx-1] + if !empty(line) + return line + endif + endfor + return '' +endfunction + +function! s:job_out_cb(self, data) abort + let self = a:self + let data = remove(self.lines, -1) . a:data + let lines = map(split(data, "\n", 1), 'split(v:val, "\r", 1)[-1]') + call extend(self.lines, lines) + " To reduce the number of buffer updates + let self.tick = get(self, 'tick', -1) + 1 + if !self.running || self.tick % len(s:jobs) == 0 + let bullet = self.running ? (self.new ? '+' : '*') : (self.error ? 'x' : '-') + let result = self.error ? join(self.lines, "\n") : s:last_non_empty_line(self.lines) + call s:log(bullet, self.name, result) + endif +endfunction + +function! s:job_exit_cb(self, data) abort + let a:self.running = 0 + let a:self.error = a:data != 0 + call s:reap(a:self.name) + call s:tick() +endfunction + +function! s:job_cb(fn, job, ch, data) + if !s:plug_window_exists() " plug window closed + return s:job_abort() + endif + call call(a:fn, [a:job, a:data]) +endfunction + +function! s:nvim_cb(job_id, data, event) dict abort + return (a:event == 'stdout' || a:event == 'stderr') ? + \ s:job_cb('s:job_out_cb', self, 0, join(a:data, "\n")) : + \ s:job_cb('s:job_exit_cb', self, 0, a:data) +endfunction + +function! s:spawn(name, cmd, opts) + let job = { 'name': a:name, 'running': 1, 'error': 0, 'lines': [''], + \ 'new': get(a:opts, 'new', 0) } + let s:jobs[a:name] = job + + if s:nvim + if has_key(a:opts, 'dir') + let job.cwd = a:opts.dir + endif + let argv = a:cmd + call extend(job, { + \ 'on_stdout': function('s:nvim_cb'), + \ 'on_stderr': function('s:nvim_cb'), + \ 'on_exit': function('s:nvim_cb'), + \ }) + let jid = s:plug_call('jobstart', argv, job) + if jid > 0 + let job.jobid = jid + else + let job.running = 0 + let job.error = 1 + let job.lines = [jid < 0 ? argv[0].' is not executable' : + \ 'Invalid arguments (or job table is full)'] + endif + elseif s:vim8 + let cmd = join(map(copy(a:cmd), 'plug#shellescape(v:val, {"script": 0})')) + if has_key(a:opts, 'dir') + let cmd = s:with_cd(cmd, a:opts.dir, 0) + endif + let argv = s:is_win ? ['cmd', '/s', '/c', '"'.cmd.'"'] : ['sh', '-c', cmd] + let jid = job_start(s:is_win ? join(argv, ' ') : argv, { + \ 'out_cb': function('s:job_cb', ['s:job_out_cb', job]), + \ 'err_cb': function('s:job_cb', ['s:job_out_cb', job]), + \ 'exit_cb': function('s:job_cb', ['s:job_exit_cb', job]), + \ 'err_mode': 'raw', + \ 'out_mode': 'raw' + \}) + if job_status(jid) == 'run' + let job.jobid = jid + else + let job.running = 0 + let job.error = 1 + let job.lines = ['Failed to start job'] + endif + else + let job.lines = s:lines(call('s:system', has_key(a:opts, 'dir') ? [a:cmd, a:opts.dir] : [a:cmd])) + let job.error = v:shell_error != 0 + let job.running = 0 + endif +endfunction + +function! s:reap(name) + let job = s:jobs[a:name] + if job.error + call add(s:update.errors, a:name) + elseif get(job, 'new', 0) + let s:update.new[a:name] = 1 + endif + let s:update.bar .= job.error ? 'x' : '=' + + let bullet = job.error ? 'x' : '-' + let result = job.error ? join(job.lines, "\n") : s:last_non_empty_line(job.lines) + call s:log(bullet, a:name, empty(result) ? 'OK' : result) + call s:bar() + + call remove(s:jobs, a:name) +endfunction + +function! s:bar() + if s:switch_in() + let total = len(s:update.all) + call setline(1, (s:update.pull ? 'Updating' : 'Installing'). + \ ' plugins ('.len(s:update.bar).'/'.total.')') + call s:progress_bar(2, s:update.bar, total) + call s:switch_out() + endif +endfunction + +function! s:logpos(name) + let max = line('$') + for i in range(4, max > 4 ? max : 4) + if getline(i) =~# '^[-+x*] '.a:name.':' + for j in range(i + 1, max > 5 ? max : 5) + if getline(j) !~ '^ ' + return [i, j - 1] + endif + endfor + return [i, i] + endif + endfor + return [0, 0] +endfunction + +function! s:log(bullet, name, lines) + if s:switch_in() + let [b, e] = s:logpos(a:name) + if b > 0 + silent execute printf('%d,%d d _', b, e) + if b > winheight('.') + let b = 4 + endif + else + let b = 4 + endif + " FIXME For some reason, nomodifiable is set after :d in vim8 + setlocal modifiable + call append(b - 1, s:format_message(a:bullet, a:name, a:lines)) + call s:switch_out() + endif +endfunction + +function! s:update_vim() + let s:jobs = {} + + call s:bar() + call s:tick() +endfunction + +function! s:tick() + let pull = s:update.pull + let prog = s:progress_opt(s:nvim || s:vim8) +while 1 " Without TCO, Vim stack is bound to explode + if empty(s:update.todo) + if empty(s:jobs) && !s:update.fin + call s:update_finish() + let s:update.fin = 1 + endif + return + endif + + let name = keys(s:update.todo)[0] + let spec = remove(s:update.todo, name) + let new = empty(globpath(spec.dir, '.git', 1)) + + call s:log(new ? '+' : '*', name, pull ? 'Updating ...' : 'Installing ...') + redraw + + let has_tag = has_key(spec, 'tag') + if !new + let [error, _] = s:git_validate(spec, 0) + if empty(error) + if pull + let cmd = ['git', 'fetch'] + if has_tag && !empty(globpath(spec.dir, '.git/shallow')) + call extend(cmd, ['--depth', '99999999']) + endif + if !empty(prog) + call add(cmd, prog) + endif + call s:spawn(name, cmd, { 'dir': spec.dir }) + else + let s:jobs[name] = { 'running': 0, 'lines': ['Already installed'], 'error': 0 } + endif + else + let s:jobs[name] = { 'running': 0, 'lines': s:lines(error), 'error': 1 } + endif + else + let cmd = ['git', 'clone'] + if !has_tag + call extend(cmd, s:clone_opt) + endif + if !empty(prog) + call add(cmd, prog) + endif + call s:spawn(name, extend(cmd, [spec.uri, s:trim(spec.dir)]), { 'new': 1 }) + endif + + if !s:jobs[name].running + call s:reap(name) + endif + if len(s:jobs) >= s:update.threads + break + endif +endwhile +endfunction + +function! s:update_python() +let py_exe = has('python') ? 'python' : 'python3' +execute py_exe "<< EOF" +import datetime +import functools +import os +try: + import queue +except ImportError: + import Queue as queue +import random +import re +import shutil +import signal +import subprocess +import tempfile +import threading as thr +import time +import traceback +import vim + +G_NVIM = vim.eval("has('nvim')") == '1' +G_PULL = vim.eval('s:update.pull') == '1' +G_RETRIES = int(vim.eval('get(g:, "plug_retries", 2)')) + 1 +G_TIMEOUT = int(vim.eval('get(g:, "plug_timeout", 60)')) +G_CLONE_OPT = ' '.join(vim.eval('s:clone_opt')) +G_PROGRESS = vim.eval('s:progress_opt(1)') +G_LOG_PROB = 1.0 / int(vim.eval('s:update.threads')) +G_STOP = thr.Event() +G_IS_WIN = vim.eval('s:is_win') == '1' + +class PlugError(Exception): + def __init__(self, msg): + self.msg = msg +class CmdTimedOut(PlugError): + pass +class CmdFailed(PlugError): + pass +class InvalidURI(PlugError): + pass +class Action(object): + INSTALL, UPDATE, ERROR, DONE = ['+', '*', 'x', '-'] + +class Buffer(object): + def __init__(self, lock, num_plugs, is_pull): + self.bar = '' + self.event = 'Updating' if is_pull else 'Installing' + self.lock = lock + self.maxy = int(vim.eval('winheight(".")')) + self.num_plugs = num_plugs + + def __where(self, name): + """ Find first line with name in current buffer. Return line num. """ + found, lnum = False, 0 + matcher = re.compile('^[-+x*] {0}:'.format(name)) + for line in vim.current.buffer: + if matcher.search(line) is not None: + found = True + break + lnum += 1 + + if not found: + lnum = -1 + return lnum + + def header(self): + curbuf = vim.current.buffer + curbuf[0] = self.event + ' plugins ({0}/{1})'.format(len(self.bar), self.num_plugs) + + num_spaces = self.num_plugs - len(self.bar) + curbuf[1] = '[{0}{1}]'.format(self.bar, num_spaces * ' ') + + with self.lock: + vim.command('normal! 2G') + vim.command('redraw') + + def write(self, action, name, lines): + first, rest = lines[0], lines[1:] + msg = ['{0} {1}{2}{3}'.format(action, name, ': ' if first else '', first)] + msg.extend([' ' + line for line in rest]) + + try: + if action == Action.ERROR: + self.bar += 'x' + vim.command("call add(s:update.errors, '{0}')".format(name)) + elif action == Action.DONE: + self.bar += '=' + + curbuf = vim.current.buffer + lnum = self.__where(name) + if lnum != -1: # Found matching line num + del curbuf[lnum] + if lnum > self.maxy and action in set([Action.INSTALL, Action.UPDATE]): + lnum = 3 + else: + lnum = 3 + curbuf.append(msg, lnum) + + self.header() + except vim.error: + pass + +class Command(object): + CD = 'cd /d' if G_IS_WIN else 'cd' + + def __init__(self, cmd, cmd_dir=None, timeout=60, cb=None, clean=None): + self.cmd = cmd + if cmd_dir: + self.cmd = '{0} {1} && {2}'.format(Command.CD, cmd_dir, self.cmd) + self.timeout = timeout + self.callback = cb if cb else (lambda msg: None) + self.clean = clean if clean else (lambda: None) + self.proc = None + + @property + def alive(self): + """ Returns true only if command still running. """ + return self.proc and self.proc.poll() is None + + def execute(self, ntries=3): + """ Execute the command with ntries if CmdTimedOut. + Returns the output of the command if no Exception. + """ + attempt, finished, limit = 0, False, self.timeout + + while not finished: + try: + attempt += 1 + result = self.try_command() + finished = True + return result + except CmdTimedOut: + if attempt != ntries: + self.notify_retry() + self.timeout += limit + else: + raise + + def notify_retry(self): + """ Retry required for command, notify user. """ + for count in range(3, 0, -1): + if G_STOP.is_set(): + raise KeyboardInterrupt + msg = 'Timeout. Will retry in {0} second{1} ...'.format( + count, 's' if count != 1 else '') + self.callback([msg]) + time.sleep(1) + self.callback(['Retrying ...']) + + def try_command(self): + """ Execute a cmd & poll for callback. Returns list of output. + Raises CmdFailed -> return code for Popen isn't 0 + Raises CmdTimedOut -> command exceeded timeout without new output + """ + first_line = True + + try: + tfile = tempfile.NamedTemporaryFile(mode='w+b') + preexec_fn = not G_IS_WIN and os.setsid or None + self.proc = subprocess.Popen(self.cmd, stdout=tfile, + stderr=subprocess.STDOUT, + stdin=subprocess.PIPE, shell=True, + preexec_fn=preexec_fn) + thrd = thr.Thread(target=(lambda proc: proc.wait()), args=(self.proc,)) + thrd.start() + + thread_not_started = True + while thread_not_started: + try: + thrd.join(0.1) + thread_not_started = False + except RuntimeError: + pass + + while self.alive: + if G_STOP.is_set(): + raise KeyboardInterrupt + + if first_line or random.random() < G_LOG_PROB: + first_line = False + line = '' if G_IS_WIN else nonblock_read(tfile.name) + if line: + self.callback([line]) + + time_diff = time.time() - os.path.getmtime(tfile.name) + if time_diff > self.timeout: + raise CmdTimedOut(['Timeout!']) + + thrd.join(0.5) + + tfile.seek(0) + result = [line.decode('utf-8', 'replace').rstrip() for line in tfile] + + if self.proc.returncode != 0: + raise CmdFailed([''] + result) + + return result + except: + self.terminate() + raise + + def terminate(self): + """ Terminate process and cleanup. """ + if self.alive: + if G_IS_WIN: + os.kill(self.proc.pid, signal.SIGINT) + else: + os.killpg(self.proc.pid, signal.SIGTERM) + self.clean() + +class Plugin(object): + def __init__(self, name, args, buf_q, lock): + self.name = name + self.args = args + self.buf_q = buf_q + self.lock = lock + self.tag = args.get('tag', 0) + + def manage(self): + try: + if os.path.exists(self.args['dir']): + self.update() + else: + self.install() + with self.lock: + thread_vim_command("let s:update.new['{0}'] = 1".format(self.name)) + except PlugError as exc: + self.write(Action.ERROR, self.name, exc.msg) + except KeyboardInterrupt: + G_STOP.set() + self.write(Action.ERROR, self.name, ['Interrupted!']) + except: + # Any exception except those above print stack trace + msg = 'Trace:\n{0}'.format(traceback.format_exc().rstrip()) + self.write(Action.ERROR, self.name, msg.split('\n')) + raise + + def install(self): + target = self.args['dir'] + if target[-1] == '\\': + target = target[0:-1] + + def clean(target): + def _clean(): + try: + shutil.rmtree(target) + except OSError: + pass + return _clean + + self.write(Action.INSTALL, self.name, ['Installing ...']) + callback = functools.partial(self.write, Action.INSTALL, self.name) + cmd = 'git clone {0} {1} {2} {3} 2>&1'.format( + '' if self.tag else G_CLONE_OPT, G_PROGRESS, self.args['uri'], + esc(target)) + com = Command(cmd, None, G_TIMEOUT, callback, clean(target)) + result = com.execute(G_RETRIES) + self.write(Action.DONE, self.name, result[-1:]) + + def repo_uri(self): + cmd = 'git rev-parse --abbrev-ref HEAD 2>&1 && git config -f .git/config remote.origin.url' + command = Command(cmd, self.args['dir'], G_TIMEOUT,) + result = command.execute(G_RETRIES) + return result[-1] + + def update(self): + actual_uri = self.repo_uri() + expect_uri = self.args['uri'] + regex = re.compile(r'^(?:\w+://)?(?:[^@/]*@)?([^:/]*(?::[0-9]*)?)[:/](.*?)(?:\.git)?/?$') + ma = regex.match(actual_uri) + mb = regex.match(expect_uri) + if ma is None or mb is None or ma.groups() != mb.groups(): + msg = ['', + 'Invalid URI: {0}'.format(actual_uri), + 'Expected {0}'.format(expect_uri), + 'PlugClean required.'] + raise InvalidURI(msg) + + if G_PULL: + self.write(Action.UPDATE, self.name, ['Updating ...']) + callback = functools.partial(self.write, Action.UPDATE, self.name) + fetch_opt = '--depth 99999999' if self.tag and os.path.isfile(os.path.join(self.args['dir'], '.git/shallow')) else '' + cmd = 'git fetch {0} {1} 2>&1'.format(fetch_opt, G_PROGRESS) + com = Command(cmd, self.args['dir'], G_TIMEOUT, callback) + result = com.execute(G_RETRIES) + self.write(Action.DONE, self.name, result[-1:]) + else: + self.write(Action.DONE, self.name, ['Already installed']) + + def write(self, action, name, msg): + self.buf_q.put((action, name, msg)) + +class PlugThread(thr.Thread): + def __init__(self, tname, args): + super(PlugThread, self).__init__() + self.tname = tname + self.args = args + + def run(self): + thr.current_thread().name = self.tname + buf_q, work_q, lock = self.args + + try: + while not G_STOP.is_set(): + name, args = work_q.get_nowait() + plug = Plugin(name, args, buf_q, lock) + plug.manage() + work_q.task_done() + except queue.Empty: + pass + +class RefreshThread(thr.Thread): + def __init__(self, lock): + super(RefreshThread, self).__init__() + self.lock = lock + self.running = True + + def run(self): + while self.running: + with self.lock: + thread_vim_command('noautocmd normal! a') + time.sleep(0.33) + + def stop(self): + self.running = False + +if G_NVIM: + def thread_vim_command(cmd): + vim.session.threadsafe_call(lambda: vim.command(cmd)) +else: + def thread_vim_command(cmd): + vim.command(cmd) + +def esc(name): + return '"' + name.replace('"', '\"') + '"' + +def nonblock_read(fname): + """ Read a file with nonblock flag. Return the last line. """ + fread = os.open(fname, os.O_RDONLY | os.O_NONBLOCK) + buf = os.read(fread, 100000).decode('utf-8', 'replace') + os.close(fread) + + line = buf.rstrip('\r\n') + left = max(line.rfind('\r'), line.rfind('\n')) + if left != -1: + left += 1 + line = line[left:] + + return line + +def main(): + thr.current_thread().name = 'main' + nthreads = int(vim.eval('s:update.threads')) + plugs = vim.eval('s:update.todo') + mac_gui = vim.eval('s:mac_gui') == '1' + + lock = thr.Lock() + buf = Buffer(lock, len(plugs), G_PULL) + buf_q, work_q = queue.Queue(), queue.Queue() + for work in plugs.items(): + work_q.put(work) + + start_cnt = thr.active_count() + for num in range(nthreads): + tname = 'PlugT-{0:02}'.format(num) + thread = PlugThread(tname, (buf_q, work_q, lock)) + thread.start() + if mac_gui: + rthread = RefreshThread(lock) + rthread.start() + + while not buf_q.empty() or thr.active_count() != start_cnt: + try: + action, name, msg = buf_q.get(True, 0.25) + buf.write(action, name, ['OK'] if not msg else msg) + buf_q.task_done() + except queue.Empty: + pass + except KeyboardInterrupt: + G_STOP.set() + + if mac_gui: + rthread.stop() + rthread.join() + +main() +EOF +endfunction + +function! s:update_ruby() + ruby << EOF + module PlugStream + SEP = ["\r", "\n", nil] + def get_line + buffer = '' + loop do + char = readchar rescue return + if SEP.include? char.chr + buffer << $/ + break + else + buffer << char + end + end + buffer + end + end unless defined?(PlugStream) + + def esc arg + %["#{arg.gsub('"', '\"')}"] + end + + def killall pid + pids = [pid] + if /mswin|mingw|bccwin/ =~ RUBY_PLATFORM + pids.each { |pid| Process.kill 'INT', pid.to_i rescue nil } + else + unless `which pgrep 2> /dev/null`.empty? + children = pids + until children.empty? + children = children.map { |pid| + `pgrep -P #{pid}`.lines.map { |l| l.chomp } + }.flatten + pids += children + end + end + pids.each { |pid| Process.kill 'TERM', pid.to_i rescue nil } + end + end + + def compare_git_uri a, b + regex = %r{^(?:\w+://)?(?:[^@/]*@)?([^:/]*(?::[0-9]*)?)[:/](.*?)(?:\.git)?/?$} + regex.match(a).to_a.drop(1) == regex.match(b).to_a.drop(1) + end + + require 'thread' + require 'fileutils' + require 'timeout' + running = true + iswin = VIM::evaluate('s:is_win').to_i == 1 + pull = VIM::evaluate('s:update.pull').to_i == 1 + base = VIM::evaluate('g:plug_home') + all = VIM::evaluate('s:update.todo') + limit = VIM::evaluate('get(g:, "plug_timeout", 60)') + tries = VIM::evaluate('get(g:, "plug_retries", 2)') + 1 + nthr = VIM::evaluate('s:update.threads').to_i + maxy = VIM::evaluate('winheight(".")').to_i + vim7 = VIM::evaluate('v:version').to_i <= 703 && RUBY_PLATFORM =~ /darwin/ + cd = iswin ? 'cd /d' : 'cd' + tot = VIM::evaluate('len(s:update.todo)') || 0 + bar = '' + skip = 'Already installed' + mtx = Mutex.new + take1 = proc { mtx.synchronize { running && all.shift } } + logh = proc { + cnt = bar.length + $curbuf[1] = "#{pull ? 'Updating' : 'Installing'} plugins (#{cnt}/#{tot})" + $curbuf[2] = '[' + bar.ljust(tot) + ']' + VIM::command('normal! 2G') + VIM::command('redraw') + } + where = proc { |name| (1..($curbuf.length)).find { |l| $curbuf[l] =~ /^[-+x*] #{name}:/ } } + log = proc { |name, result, type| + mtx.synchronize do + ing = ![true, false].include?(type) + bar += type ? '=' : 'x' unless ing + b = case type + when :install then '+' when :update then '*' + when true, nil then '-' else + VIM::command("call add(s:update.errors, '#{name}')") + 'x' + end + result = + if type || type.nil? + ["#{b} #{name}: #{result.lines.to_a.last || 'OK'}"] + elsif result =~ /^Interrupted|^Timeout/ + ["#{b} #{name}: #{result}"] + else + ["#{b} #{name}"] + result.lines.map { |l| " " << l } + end + if lnum = where.call(name) + $curbuf.delete lnum + lnum = 4 if ing && lnum > maxy + end + result.each_with_index do |line, offset| + $curbuf.append((lnum || 4) - 1 + offset, line.gsub(/\e\[./, '').chomp) + end + logh.call + end + } + bt = proc { |cmd, name, type, cleanup| + tried = timeout = 0 + begin + tried += 1 + timeout += limit + fd = nil + data = '' + if iswin + Timeout::timeout(timeout) do + tmp = VIM::evaluate('tempname()') + system("(#{cmd}) > #{tmp}") + data = File.read(tmp).chomp + File.unlink tmp rescue nil + end + else + fd = IO.popen(cmd).extend(PlugStream) + first_line = true + log_prob = 1.0 / nthr + while line = Timeout::timeout(timeout) { fd.get_line } + data << line + log.call name, line.chomp, type if name && (first_line || rand < log_prob) + first_line = false + end + fd.close + end + [$? == 0, data.chomp] + rescue Timeout::Error, Interrupt => e + if fd && !fd.closed? + killall fd.pid + fd.close + end + cleanup.call if cleanup + if e.is_a?(Timeout::Error) && tried < tries + 3.downto(1) do |countdown| + s = countdown > 1 ? 's' : '' + log.call name, "Timeout. Will retry in #{countdown} second#{s} ...", type + sleep 1 + end + log.call name, 'Retrying ...', type + retry + end + [false, e.is_a?(Interrupt) ? "Interrupted!" : "Timeout!"] + end + } + main = Thread.current + threads = [] + watcher = Thread.new { + if vim7 + while VIM::evaluate('getchar(1)') + sleep 0.1 + end + else + require 'io/console' # >= Ruby 1.9 + nil until IO.console.getch == 3.chr + end + mtx.synchronize do + running = false + threads.each { |t| t.raise Interrupt } unless vim7 + end + threads.each { |t| t.join rescue nil } + main.kill + } + refresh = Thread.new { + while true + mtx.synchronize do + break unless running + VIM::command('noautocmd normal! a') + end + sleep 0.2 + end + } if VIM::evaluate('s:mac_gui') == 1 + + clone_opt = VIM::evaluate('s:clone_opt').join(' ') + progress = VIM::evaluate('s:progress_opt(1)') + nthr.times do + mtx.synchronize do + threads << Thread.new { + while pair = take1.call + name = pair.first + dir, uri, tag = pair.last.values_at *%w[dir uri tag] + exists = File.directory? dir + ok, result = + if exists + chdir = "#{cd} #{iswin ? dir : esc(dir)}" + ret, data = bt.call "#{chdir} && git rev-parse --abbrev-ref HEAD 2>&1 && git config -f .git/config remote.origin.url", nil, nil, nil + current_uri = data.lines.to_a.last + if !ret + if data =~ /^Interrupted|^Timeout/ + [false, data] + else + [false, [data.chomp, "PlugClean required."].join($/)] + end + elsif !compare_git_uri(current_uri, uri) + [false, ["Invalid URI: #{current_uri}", + "Expected: #{uri}", + "PlugClean required."].join($/)] + else + if pull + log.call name, 'Updating ...', :update + fetch_opt = (tag && File.exist?(File.join(dir, '.git/shallow'))) ? '--depth 99999999' : '' + bt.call "#{chdir} && git fetch #{fetch_opt} #{progress} 2>&1", name, :update, nil + else + [true, skip] + end + end + else + d = esc dir.sub(%r{[\\/]+$}, '') + log.call name, 'Installing ...', :install + bt.call "git clone #{clone_opt unless tag} #{progress} #{uri} #{d} 2>&1", name, :install, proc { + FileUtils.rm_rf dir + } + end + mtx.synchronize { VIM::command("let s:update.new['#{name}'] = 1") } if !exists && ok + log.call name, result, ok + end + } if running + end + end + threads.each { |t| t.join rescue nil } + logh.call + refresh.kill if refresh + watcher.kill +EOF +endfunction + +function! s:shellesc_cmd(arg, script) + let escaped = substitute('"'.a:arg.'"', '[&|<>()@^!"]', '^&', 'g') + return substitute(escaped, '%', (a:script ? '%' : '^') . '&', 'g') +endfunction + +function! s:shellesc_ps1(arg) + return "'".substitute(escape(a:arg, '\"'), "'", "''", 'g')."'" +endfunction + +function! s:shellesc_sh(arg) + return "'".substitute(a:arg, "'", "'\\\\''", 'g')."'" +endfunction + +" Escape the shell argument based on the shell. +" Vim and Neovim's shellescape() are insufficient. +" 1. shellslash determines whether to use single/double quotes. +" Double-quote escaping is fragile for cmd.exe. +" 2. It does not work for powershell. +" 3. It does not work for *sh shells if the command is executed +" via cmd.exe (ie. cmd.exe /c sh -c command command_args) +" 4. It does not support batchfile syntax. +" +" Accepts an optional dictionary with the following keys: +" - shell: same as Vim/Neovim 'shell' option. +" If unset, fallback to 'cmd.exe' on Windows or 'sh'. +" - script: If truthy and shell is cmd.exe, escape for batchfile syntax. +function! plug#shellescape(arg, ...) + if a:arg =~# '^[A-Za-z0-9_/:.-]\+$' + return a:arg + endif + let opts = a:0 > 0 && type(a:1) == s:TYPE.dict ? a:1 : {} + let shell = get(opts, 'shell', s:is_win ? 'cmd.exe' : 'sh') + let script = get(opts, 'script', 1) + if shell =~# 'cmd\(\.exe\)\?$' + return s:shellesc_cmd(a:arg, script) + elseif shell =~# 'powershell\(\.exe\)\?$' || shell =~# 'pwsh$' + return s:shellesc_ps1(a:arg) + endif + return s:shellesc_sh(a:arg) +endfunction + +function! s:glob_dir(path) + return map(filter(s:glob(a:path, '**'), 'isdirectory(v:val)'), 's:dirpath(v:val)') +endfunction + +function! s:progress_bar(line, bar, total) + call setline(a:line, '[' . s:lpad(a:bar, a:total) . ']') +endfunction + +function! s:compare_git_uri(a, b) + " See `git help clone' + " https:// [user@] github.com[:port] / junegunn/vim-plug [.git] + " [git@] github.com[:port] : junegunn/vim-plug [.git] + " file:// / junegunn/vim-plug [/] + " / junegunn/vim-plug [/] + let pat = '^\%(\w\+://\)\='.'\%([^@/]*@\)\='.'\([^:/]*\%(:[0-9]*\)\=\)'.'[:/]'.'\(.\{-}\)'.'\%(\.git\)\=/\?$' + let ma = matchlist(a:a, pat) + let mb = matchlist(a:b, pat) + return ma[1:2] ==# mb[1:2] +endfunction + +function! s:format_message(bullet, name, message) + if a:bullet != 'x' + return [printf('%s %s: %s', a:bullet, a:name, s:lastline(a:message))] + else + let lines = map(s:lines(a:message), '" ".v:val') + return extend([printf('x %s:', a:name)], lines) + endif +endfunction + +function! s:with_cd(cmd, dir, ...) + let script = a:0 > 0 ? a:1 : 1 + return printf('cd%s %s && %s', s:is_win ? ' /d' : '', plug#shellescape(a:dir, {'script': script}), a:cmd) +endfunction + +function! s:system(cmd, ...) + let batchfile = '' + try + let [sh, shellcmdflag, shrd] = s:chsh(1) + if type(a:cmd) == s:TYPE.list + " Neovim's system() supports list argument to bypass the shell + " but it cannot set the working directory for the command. + " Assume that the command does not rely on the shell. + if has('nvim') && a:0 == 0 + return system(a:cmd) + endif + let cmd = join(map(copy(a:cmd), 'plug#shellescape(v:val, {"shell": &shell, "script": 0})')) + if &shell =~# 'powershell\(\.exe\)\?$' + let cmd = '& ' . cmd + endif + else + let cmd = a:cmd + endif + if a:0 > 0 + let cmd = s:with_cd(cmd, a:1, type(a:cmd) != s:TYPE.list) + endif + if s:is_win && type(a:cmd) != s:TYPE.list + let [batchfile, cmd] = s:batchfile(cmd) + endif + return system(cmd) + finally + let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd] + if s:is_win && filereadable(batchfile) + call delete(batchfile) + endif + endtry +endfunction + +function! s:system_chomp(...) + let ret = call('s:system', a:000) + return v:shell_error ? '' : substitute(ret, '\n$', '', '') +endfunction + +function! s:git_validate(spec, check_branch) + let err = '' + if isdirectory(a:spec.dir) + let result = s:lines(s:system('git rev-parse --abbrev-ref HEAD 2>&1 && git config -f .git/config remote.origin.url', a:spec.dir)) + let remote = result[-1] + if v:shell_error + let err = join([remote, 'PlugClean required.'], "\n") + elseif !s:compare_git_uri(remote, a:spec.uri) + let err = join(['Invalid URI: '.remote, + \ 'Expected: '.a:spec.uri, + \ 'PlugClean required.'], "\n") + elseif a:check_branch && has_key(a:spec, 'commit') + let result = s:lines(s:system('git rev-parse HEAD 2>&1', a:spec.dir)) + let sha = result[-1] + if v:shell_error + let err = join(add(result, 'PlugClean required.'), "\n") + elseif !s:hash_match(sha, a:spec.commit) + let err = join([printf('Invalid HEAD (expected: %s, actual: %s)', + \ a:spec.commit[:6], sha[:6]), + \ 'PlugUpdate required.'], "\n") + endif + elseif a:check_branch + let branch = result[0] + " Check tag + if has_key(a:spec, 'tag') + let tag = s:system_chomp('git describe --exact-match --tags HEAD 2>&1', a:spec.dir) + if a:spec.tag !=# tag && a:spec.tag !~ '\*' + let err = printf('Invalid tag: %s (expected: %s). Try PlugUpdate.', + \ (empty(tag) ? 'N/A' : tag), a:spec.tag) + endif + " Check branch + elseif a:spec.branch !=# branch + let err = printf('Invalid branch: %s (expected: %s). Try PlugUpdate.', + \ branch, a:spec.branch) + endif + if empty(err) + let [ahead, behind] = split(s:lastline(s:system([ + \ 'git', 'rev-list', '--count', '--left-right', + \ printf('HEAD...origin/%s', a:spec.branch) + \ ], a:spec.dir)), '\t') + if !v:shell_error && ahead + if behind + " Only mention PlugClean if diverged, otherwise it's likely to be + " pushable (and probably not that messed up). + let err = printf( + \ "Diverged from origin/%s (%d commit(s) ahead and %d commit(s) behind!\n" + \ .'Backup local changes and run PlugClean and PlugUpdate to reinstall it.', a:spec.branch, ahead, behind) + else + let err = printf("Ahead of origin/%s by %d commit(s).\n" + \ .'Cannot update until local changes are pushed.', + \ a:spec.branch, ahead) + endif + endif + endif + endif + else + let err = 'Not found' + endif + return [err, err =~# 'PlugClean'] +endfunction + +function! s:rm_rf(dir) + if isdirectory(a:dir) + return s:system(s:is_win + \ ? 'rmdir /S /Q '.plug#shellescape(a:dir) + \ : ['rm', '-rf', a:dir]) + endif +endfunction + +function! s:clean(force) + call s:prepare() + call append(0, 'Searching for invalid plugins in '.g:plug_home) + call append(1, '') + + " List of valid directories + let dirs = [] + let errs = {} + let [cnt, total] = [0, len(g:plugs)] + for [name, spec] in items(g:plugs) + if !s:is_managed(name) + call add(dirs, spec.dir) + else + let [err, clean] = s:git_validate(spec, 1) + if clean + let errs[spec.dir] = s:lines(err)[0] + else + call add(dirs, spec.dir) + endif + endif + let cnt += 1 + call s:progress_bar(2, repeat('=', cnt), total) + normal! 2G + redraw + endfor + + let allowed = {} + for dir in dirs + let allowed[s:dirpath(s:plug_fnamemodify(dir, ':h:h'))] = 1 + let allowed[dir] = 1 + for child in s:glob_dir(dir) + let allowed[child] = 1 + endfor + endfor + + let todo = [] + let found = sort(s:glob_dir(g:plug_home)) + while !empty(found) + let f = remove(found, 0) + if !has_key(allowed, f) && isdirectory(f) + call add(todo, f) + call append(line('$'), '- ' . f) + if has_key(errs, f) + call append(line('$'), ' ' . errs[f]) + endif + let found = filter(found, 'stridx(v:val, f) != 0') + end + endwhile + + 4 + redraw + if empty(todo) + call append(line('$'), 'Already clean.') + else + let s:clean_count = 0 + call append(3, ['Directories to delete:', '']) + redraw! + if a:force || s:ask_no_interrupt('Delete all directories?') + call s:delete([6, line('$')], 1) + else + call setline(4, 'Cancelled.') + nnoremap <silent> <buffer> d :set opfunc=<sid>delete_op<cr>g@ + nmap <silent> <buffer> dd d_ + xnoremap <silent> <buffer> d :<c-u>call <sid>delete_op(visualmode(), 1)<cr> + echo 'Delete the lines (d{motion}) to delete the corresponding directories' + endif + endif + 4 + setlocal nomodifiable +endfunction + +function! s:delete_op(type, ...) + call s:delete(a:0 ? [line("'<"), line("'>")] : [line("'["), line("']")], 0) +endfunction + +function! s:delete(range, force) + let [l1, l2] = a:range + let force = a:force + let err_count = 0 + while l1 <= l2 + let line = getline(l1) + if line =~ '^- ' && isdirectory(line[2:]) + execute l1 + redraw! + let answer = force ? 1 : s:ask('Delete '.line[2:].'?', 1) + let force = force || answer > 1 + if answer + let err = s:rm_rf(line[2:]) + setlocal modifiable + if empty(err) + call setline(l1, '~'.line[1:]) + let s:clean_count += 1 + else + delete _ + call append(l1 - 1, s:format_message('x', line[1:], err)) + let l2 += len(s:lines(err)) + let err_count += 1 + endif + let msg = printf('Removed %d directories.', s:clean_count) + if err_count > 0 + let msg .= printf(' Failed to remove %d directories.', err_count) + endif + call setline(4, msg) + setlocal nomodifiable + endif + endif + let l1 += 1 + endwhile +endfunction + +function! s:upgrade() + echo 'Downloading the latest version of vim-plug' + redraw + let tmp = s:plug_tempname() + let new = tmp . '/plug.vim' + + try + let out = s:system(['git', 'clone', '--depth', '1', s:plug_src, tmp]) + if v:shell_error + return s:err('Error upgrading vim-plug: '. out) + endif + + if readfile(s:me) ==# readfile(new) + echo 'vim-plug is already up-to-date' + return 0 + else + call rename(s:me, s:me . '.old') + call rename(new, s:me) + unlet g:loaded_plug + echo 'vim-plug has been upgraded' + return 1 + endif + finally + silent! call s:rm_rf(tmp) + endtry +endfunction + +function! s:upgrade_specs() + for spec in values(g:plugs) + let spec.frozen = get(spec, 'frozen', 0) + endfor +endfunction + +function! s:status() + call s:prepare() + call append(0, 'Checking plugins') + call append(1, '') + + let ecnt = 0 + let unloaded = 0 + let [cnt, total] = [0, len(g:plugs)] + for [name, spec] in items(g:plugs) + let is_dir = isdirectory(spec.dir) + if has_key(spec, 'uri') + if is_dir + let [err, _] = s:git_validate(spec, 1) + let [valid, msg] = [empty(err), empty(err) ? 'OK' : err] + else + let [valid, msg] = [0, 'Not found. Try PlugInstall.'] + endif + else + if is_dir + let [valid, msg] = [1, 'OK'] + else + let [valid, msg] = [0, 'Not found.'] + endif + endif + let cnt += 1 + let ecnt += !valid + " `s:loaded` entry can be missing if PlugUpgraded + if is_dir && get(s:loaded, name, -1) == 0 + let unloaded = 1 + let msg .= ' (not loaded)' + endif + call s:progress_bar(2, repeat('=', cnt), total) + call append(3, s:format_message(valid ? '-' : 'x', name, msg)) + normal! 2G + redraw + endfor + call setline(1, 'Finished. '.ecnt.' error(s).') + normal! gg + setlocal nomodifiable + if unloaded + echo "Press 'L' on each line to load plugin, or 'U' to update" + nnoremap <silent> <buffer> L :call <SID>status_load(line('.'))<cr> + xnoremap <silent> <buffer> L :call <SID>status_load(line('.'))<cr> + end +endfunction + +function! s:extract_name(str, prefix, suffix) + return matchstr(a:str, '^'.a:prefix.' \zs[^:]\+\ze:.*'.a:suffix.'$') +endfunction + +function! s:status_load(lnum) + let line = getline(a:lnum) + let name = s:extract_name(line, '-', '(not loaded)') + if !empty(name) + call plug#load(name) + setlocal modifiable + call setline(a:lnum, substitute(line, ' (not loaded)$', '', '')) + setlocal nomodifiable + endif +endfunction + +function! s:status_update() range + let lines = getline(a:firstline, a:lastline) + let names = filter(map(lines, 's:extract_name(v:val, "[x-]", "")'), '!empty(v:val)') + if !empty(names) + echo + execute 'PlugUpdate' join(names) + endif +endfunction + +function! s:is_preview_window_open() + silent! wincmd P + if &previewwindow + wincmd p + return 1 + endif +endfunction + +function! s:find_name(lnum) + for lnum in reverse(range(1, a:lnum)) + let line = getline(lnum) + if empty(line) + return '' + endif + let name = s:extract_name(line, '-', '') + if !empty(name) + return name + endif + endfor + return '' +endfunction + +function! s:preview_commit() + if b:plug_preview < 0 + let b:plug_preview = !s:is_preview_window_open() + endif + + let sha = matchstr(getline('.'), '^ \X*\zs[0-9a-f]\{7,9}') + if empty(sha) + return + endif + + let name = s:find_name(line('.')) + if empty(name) || !has_key(g:plugs, name) || !isdirectory(g:plugs[name].dir) + return + endif + + if exists('g:plug_pwindow') && !s:is_preview_window_open() + execute g:plug_pwindow + execute 'e' sha + else + execute 'pedit' sha + wincmd P + endif + setlocal previewwindow filetype=git buftype=nofile nobuflisted modifiable + let batchfile = '' + try + let [sh, shellcmdflag, shrd] = s:chsh(1) + let cmd = 'cd '.plug#shellescape(g:plugs[name].dir).' && git show --no-color --pretty=medium '.sha + if s:is_win + let [batchfile, cmd] = s:batchfile(cmd) + endif + execute 'silent %!' cmd + finally + let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd] + if s:is_win && filereadable(batchfile) + call delete(batchfile) + endif + endtry + setlocal nomodifiable + nnoremap <silent> <buffer> q :q<cr> + wincmd p +endfunction + +function! s:section(flags) + call search('\(^[x-] \)\@<=[^:]\+:', a:flags) +endfunction + +function! s:format_git_log(line) + let indent = ' ' + let tokens = split(a:line, nr2char(1)) + if len(tokens) != 5 + return indent.substitute(a:line, '\s*$', '', '') + endif + let [graph, sha, refs, subject, date] = tokens + let tag = matchstr(refs, 'tag: [^,)]\+') + let tag = empty(tag) ? ' ' : ' ('.tag.') ' + return printf('%s%s%s%s%s (%s)', indent, graph, sha, tag, subject, date) +endfunction + +function! s:append_ul(lnum, text) + call append(a:lnum, ['', a:text, repeat('-', len(a:text))]) +endfunction + +function! s:diff() + call s:prepare() + call append(0, ['Collecting changes ...', '']) + let cnts = [0, 0] + let bar = '' + let total = filter(copy(g:plugs), 's:is_managed(v:key) && isdirectory(v:val.dir)') + call s:progress_bar(2, bar, len(total)) + for origin in [1, 0] + let plugs = reverse(sort(items(filter(copy(total), (origin ? '' : '!').'(has_key(v:val, "commit") || has_key(v:val, "tag"))')))) + if empty(plugs) + continue + endif + call s:append_ul(2, origin ? 'Pending updates:' : 'Last update:') + for [k, v] in plugs + let range = origin ? '..origin/'.v.branch : 'HEAD@{1}..' + let cmd = ['git', 'log', '--graph', '--color=never'] + if s:git_version_requirement(2, 10, 0) + call add(cmd, '--no-show-signature') + endif + call extend(cmd, ['--pretty=format:%x01%h%x01%d%x01%s%x01%cr', range]) + if has_key(v, 'rtp') + call extend(cmd, ['--', v.rtp]) + endif + let diff = s:system_chomp(cmd, v.dir) + if !empty(diff) + let ref = has_key(v, 'tag') ? (' (tag: '.v.tag.')') : has_key(v, 'commit') ? (' '.v.commit) : '' + call append(5, extend(['', '- '.k.':'.ref], map(s:lines(diff), 's:format_git_log(v:val)'))) + let cnts[origin] += 1 + endif + let bar .= '=' + call s:progress_bar(2, bar, len(total)) + normal! 2G + redraw + endfor + if !cnts[origin] + call append(5, ['', 'N/A']) + endif + endfor + call setline(1, printf('%d plugin(s) updated.', cnts[0]) + \ . (cnts[1] ? printf(' %d plugin(s) have pending updates.', cnts[1]) : '')) + + if cnts[0] || cnts[1] + nnoremap <silent> <buffer> <plug>(plug-preview) :silent! call <SID>preview_commit()<cr> + if empty(maparg("\<cr>", 'n')) + nmap <buffer> <cr> <plug>(plug-preview) + endif + if empty(maparg('o', 'n')) + nmap <buffer> o <plug>(plug-preview) + endif + endif + if cnts[0] + nnoremap <silent> <buffer> X :call <SID>revert()<cr> + echo "Press 'X' on each block to revert the update" + endif + normal! gg + setlocal nomodifiable +endfunction + +function! s:revert() + if search('^Pending updates', 'bnW') + return + endif + + let name = s:find_name(line('.')) + if empty(name) || !has_key(g:plugs, name) || + \ input(printf('Revert the update of %s? (y/N) ', name)) !~? '^y' + return + endif + + call s:system('git reset --hard HEAD@{1} && git checkout '.plug#shellescape(g:plugs[name].branch).' --', g:plugs[name].dir) + setlocal modifiable + normal! "_dap + setlocal nomodifiable + echo 'Reverted' +endfunction + +function! s:snapshot(force, ...) abort + call s:prepare() + setf vim + call append(0, ['" Generated by vim-plug', + \ '" '.strftime("%c"), + \ '" :source this file in vim to restore the snapshot', + \ '" or execute: vim -S snapshot.vim', + \ '', '', 'PlugUpdate!']) + 1 + let anchor = line('$') - 3 + let names = sort(keys(filter(copy(g:plugs), + \'has_key(v:val, "uri") && !has_key(v:val, "commit") && isdirectory(v:val.dir)'))) + for name in reverse(names) + let sha = s:system_chomp(['git', 'rev-parse', '--short', 'HEAD'], g:plugs[name].dir) + if !empty(sha) + call append(anchor, printf("silent! let g:plugs['%s'].commit = '%s'", name, sha)) + redraw + endif + endfor + + if a:0 > 0 + let fn = s:plug_expand(a:1) + if filereadable(fn) && !(a:force || s:ask(a:1.' already exists. Overwrite?')) + return + endif + call writefile(getline(1, '$'), fn) + echo 'Saved as '.a:1 + silent execute 'e' s:esc(fn) + setf vim + endif +endfunction + +function! s:split_rtp() + return split(&rtp, '\\\@<!,') +endfunction + +let s:first_rtp = s:escrtp(get(s:split_rtp(), 0, '')) +let s:last_rtp = s:escrtp(get(s:split_rtp(), -1, '')) + +if exists('g:plugs') + let g:plugs_order = get(g:, 'plugs_order', keys(g:plugs)) + call s:upgrade_specs() + call s:define_commands() +endif + +let &cpo = s:cpo_save +unlet s:cpo_save diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim index eedad06..e417b9d 100644 --- a/nvim/.config/nvim/init.vim +++ b/nvim/.config/nvim/init.vim @@ -1,4 +1,5 @@ call plug#begin('~/.local/share/nvim/plugged') +Plug 'nvim-telescope/telescope.nvim' Plug 'editorconfig/editorconfig-vim' Plug 'tpope/vim-sensible' @@ -37,23 +38,33 @@ Plug 'preservim/nerdtree' Plug 'Xuyuanp/nerdtree-git-plugin' Plug 'preservim/nerdcommenter' + +Plug 'neovim/nvim-lspconfig' +Plug 'nvim-lua/completion-nvim' + call plug#end() -"basics + +" basics +" tabs syntax on -set noerrorbells set tabstop=4 softtabstop=4 set shiftwidth=4 set expandtab set smartindent +set number +set relativenumber +set nohlsearch +set hidden +set noerrorbells set nowrap set incsearch set list set cursorline -set number -set rnu +set scrolloff=8 set colorcolumn=80 +set signcolumn=yes set background=dark "set background=light @@ -68,6 +79,7 @@ colorscheme gruvbox " transparent bg highlight Normal ctermbg=none +highlight Normal guibg=none "esc imap jk <Esc> @@ -87,6 +99,10 @@ endif source $HOME/.config/nvim/modules/coc.vim +set completeopt=menuone,noinsert,noselect +let g:completion_matching_strategy_list = ['exact', 'substring', 'fuzzy'] +lua require'lspconfig'.tsserver.setup{ on_attach=require'completion'.on_attach } + "leader let mapleader = " " noremap <silent> <Leader> :WhichKey '<Space>'<CR> @@ -117,3 +133,13 @@ map <leader>wl :wincmd l<CR> nnoremap <Leader>pt :NERDTreeToggle<Enter> nnoremap <silent> <Leader>pv :NERDTreeFind<Enter> +fun! TrimWhitespace() + let l:save = winsaveview() + keeppatterns %s/\s\+$//e + call winrestview(l:save) +endfun + +augroup PSTR + autocmd! + autocmd BufWritePre * :call TrimWhitespace() +augroup END diff --git a/polybar/.config/polybar/config b/polybar/.config/polybar/config index 050b0a5..0467bb1 100644 --- a/polybar/.config/polybar/config +++ b/polybar/.config/polybar/config @@ -130,6 +130,7 @@ offset-y = ${env:OFFSET_Y:0} scroll-up = herbstclient use_index +1 scroll-down = herbstclient use_index -1 +border-bottom-size = ${bar/base.height} [bar/topbar2-base] inherit = bar/base @@ -176,7 +177,7 @@ modules-left = bspwm [bar/topbar2-hlwm] inherit = bar/topbar2-base -offset-y = ${env:OFFSET_Y:40} +offset-y = ${env:OFFSET_Y:16} override-redirect = false scroll-up = herbstclient use_index +1 diff --git a/polybar/.local/bin/playercl b/polybar/.local/bin/playercl new file mode 100755 index 0000000..83f4a40 --- /dev/null +++ b/polybar/.local/bin/playercl @@ -0,0 +1,246 @@ +#!/usr/bin/env python + +# MIT License +# +# Copyright (c) 2018 Andreas Backx +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. + +"""Spotify DBus listener""" + + +import os +import socket +import logging +from concurrent.futures import ThreadPoolExecutor + +import click +import dbus # type: ignore +import dbus.mainloop.glib # type: ignore +from dbus.mainloop.glib import DBusGMainLoop +from gi.repository import GLib # type: ignore +#from spotipy import SpotifyException +#from spotipy.oauth2 import SpotifyClientCredentials + +INACTIVE_COLOR = '%{F#6E6E6E}' +ACTIVE_COLOR = '%{F#CECECE}' +DEFAULT_COLOR = '%{F-}' + +SERVER_ADDRESS = '/tmp/playercl-socket' +LOG_FILE = '/tmp/playercl.log' + + + +class Playercl: + """MediaPlayer DBus Listener""" + + # pylint: disable=too-many-instance-attributes + + MEDIA_PLAYER_PREFIX = 'org.mpris.MediaPlayer2' + + SPOTIFY_BUS = 'org.mpris.MediaPlayer2.spotify' + SPOTIFYD_BUS = 'org.mpris.MediaPlayer2.spotifyd' + MPRIS_OBJECT_PATH = '/org/mpris/MediaPlayer2' + + PLAYER_INTERFACE = 'org.mpris.MediaPlayer2.Player' + PROPERTIES_INTERFACE = 'org.freedesktop.DBus.Properties' + + SAVE_REMOVE = b'save' + + logging.basicConfig(filename=LOG_FILE, filemode='w', level=logging.DEBUG) + logger = logging.getLogger("playercl") + + def __init__(self): + DBusGMainLoop(set_as_default=True) + self.session_bus = dbus.SessionBus() + self.last_output = '' + + self.player_objects = dict() + self.current_player = None + + # Last shown metadata + self.last_title = None + # Whether the current song is added to the library + self.saved_track = False + # Whether to ignore the update + self.ignore = False + # DBus session object + self.freedesktop = None + + def monitor(self): + """ Monitor """ + self.logger.info("monitor") + self.locate_player_services() + self.freedesktop = self.session_bus.get_object( + "org.freedesktop.DBus", + "/org/freedesktop/DBus" + ) + self.freedesktop.connect_to_signal( + "NameOwnerChanged", + self.on_name_owner_changed + ) + + executor = ThreadPoolExecutor(max_workers=2) + executor.submit(self._start_glib_loop) + executor.submit(self._start_server) + + @staticmethod + def _start_glib_loop(): + """ Start Glib loop """ + loop = GLib.MainLoop() + loop.run() + + @staticmethod + def _start_server(): + try: + os.unlink(SERVER_ADDRESS) + except OSError: + if os.path.exists(SERVER_ADDRESS): + raise + sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + sock.bind(SERVER_ADDRESS) + sock.listen(5) + + @property + def empty_output(self): + """ is output empty""" + return not self.last_output + + @property + def metadata_status(self): + """ Get song status """ + properties = self.get_current_player_properties() + metadata = properties.Get( + Playercl.PLAYER_INTERFACE, + 'Metadata' + ) + playback_status = properties.Get( + Playercl.PLAYER_INTERFACE, + 'PlaybackStatus' + ) + return metadata, playback_status + + def output(self, line): + """ Output for polybar """ + if line != self.last_output: + print(line, flush=True) + self.last_output = line + + def locate_player_services(self): + """ Get all players """ + self.logger.info("Find services") + for service in self.session_bus.list_names(): + if service.startswith(self.MEDIA_PLAYER_PREFIX): + self.logger.info("service: %s", service) + self.add_player_service(service) + + def output_playback_status(self, data, retry=False): + """ output current song """ + if self.ignore: + return + + if 'Metadata' not in data or 'xesam:artist' not in data: + self.output('') + + metadata = data['Metadata'] + artists = metadata['xesam:artist'] + artist = artists[0] if artists else None + artist_string = f'{artist} -' if artist else '' + + title = metadata['xesam:title'] + playback_status = data['PlaybackStatus'] + same_song = title == self.last_title + + color = ACTIVE_COLOR if playback_status == 'Playing' else INACTIVE_COLOR + # divider = '+' if same_song and self.saved_track else '-' + self.output(f'{color}{artist_string}{title}{DEFAULT_COLOR}') + + if not same_song: + self.last_title = title + + def on_properties_changed(self, interface, data, *args, **kwargs): + """On name properties changed event""" + self.logger.info("properties_changed: %s, %s, %s, %s", interface, data, args, kwargs) + self.output_playback_status(data) + + def set_current_player(self, name): + """ set the current player by getting what's currently playing""" + self.current_player = name + + def get_current_player_properties(self): + """ return the player intefrace for the current player """ + property_interface = dbus.Interface( + self.player_objects[self.current_player], + dbus_interface=self.PROPERTIES_INTERFACE) + return property_interface + + def add_player_service(self, service, path=None): + """ Add a service to our known list of players """ + self.logger.info("add player service: %s", service) + if not path: + path = self.MPRIS_OBJECT_PATH + try: + player = self.session_bus.get_object(service, path) + self.player_objects[service] = player + player.connect_to_signal( + "PropertiesChanged", + self.on_properties_changed, + sender_keyword='sender', + path_keyword='path') + self.set_current_player(service) + if self.empty_output: + metadata, playback_status = self.metadata_status + self.output_playback_status( + data={ + 'Metadata': metadata, + 'PlaybackStatus': playback_status, + } + ) + except dbus.DBusException as error: + self.logger.warning("Exception: %s", error) + + def on_name_owner_changed(self, name, old_owner, new_owner): + """On name owner changed event""" + if name.startswith(self.MEDIA_PLAYER_PREFIX): + self.logger.info("name owner changed: name: %s old: %s new: %s", name, old_owner, new_owner or "Removed") + if not old_owner: # new object + self.add_player_service(name) + elif not new_owner: + del self.player_objects[name] + + # if old_owner is None then new object + # if new_owner is None then deleted + # check name for MPRIS prefix then add to self.player_objects if + # not in list + + +@click.group() +def cli(): + """Script for listening to Spotify over dbus and adding tracks to your library.""" + + +@cli.command() +def status(): + """Follow the status of the currently playing song on Spotify.""" + player = Playercl() + player.monitor() + + +if __name__ == '__main__': + cli() diff --git a/polybar/.local/bin/spotifycl b/polybar/.local/bin/spotifycl index ffee9f0..f7ced52 100755 --- a/polybar/.local/bin/spotifycl +++ b/polybar/.local/bin/spotifycl @@ -22,32 +22,34 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. +"""Spotify DBus listener""" + import os import socket -import sys -import time -import traceback +import logging from concurrent.futures import ThreadPoolExecutor import click -import dbus -import dbus.mainloop.glib -import spotipy -import spotipy.util as util +import dbus # type: ignore +import dbus.mainloop.glib # type: ignore from dbus.mainloop.glib import DBusGMainLoop -from gi.repository import GLib -from spotipy import SpotifyException -from spotipy.oauth2 import SpotifyClientCredentials +from gi.repository import GLib # type: ignore +#from spotipy import SpotifyException +#from spotipy.oauth2 import SpotifyClientCredentials + +INACTIVE_COLOR = '%{F#6E6E6E}' +ACTIVE_COLOR = '%{F#CECECE}' +DEFAULT_COLOR = '%{F-}' -inactive_color = '%{F#6E6E6E}' -active_color = '%{F#CECECE}' -default_color = '%{F-}' +SERVER_ADDRESS = '/tmp/spotifycl-socket' -server_address = '/tmp/spotifycl-socket' class Spotify: + """Spotify DBus Listener""" + + # pylint: disable=too-many-instance-attributes SPOTIFY_BUS = 'org.mpris.MediaPlayer2.spotify' SPOTIFYD_BUS = 'org.mpris.MediaPlayer2.spotifyd' @@ -58,6 +60,9 @@ class Spotify: SAVE_REMOVE = b'save' + logging.basicConfig(filename="/tmp/spotifycl.log", level=logging.DEBUG) + logger = logging.getLogger("spotifycl") + def __init__(self): DBusGMainLoop(set_as_default=True) self.session_bus = dbus.SessionBus() @@ -70,8 +75,13 @@ class Spotify: self.saved_track = False # Whether to ignore the update self.ignore = False + # DBus session object + self.freedesktop = None + self.spotify = None def monitor(self): + """ Monitor """ + self.logger.info("monitor") self.setup_properties_changed() self.freedesktop = self.session_bus.get_object( "org.freedesktop.DBus", @@ -87,22 +97,26 @@ class Spotify: executor.submit(self._start_glib_loop) executor.submit(self._start_server) - def _start_glib_loop(self): + @staticmethod + def _start_glib_loop(): + """ Start Glib loop """ loop = GLib.MainLoop() loop.run() - def _start_server(self): + @staticmethod + def _start_server(): try: - os.unlink(server_address) + os.unlink(SERVER_ADDRESS) except OSError: - if os.path.exists(server_address): + if os.path.exists(SERVER_ADDRESS): raise sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) - sock.bind(server_address) + sock.bind(SERVER_ADDRESS) sock.listen(5) @property def metadata_status(self): + """ Get song status """ spotify_properties = dbus.Interface( self.spotify, dbus_interface=Spotify.PROPERTIES_INTERFACE @@ -118,6 +132,7 @@ class Spotify: return metadata, playback_status def output(self, line): + """ Output for polybar """ if not line: self.empty_output = True if line != self.last_output: @@ -125,15 +140,21 @@ class Spotify: self.last_output = line def setup_spotify(self): + """ Setup spotify DBus session object """ + self.logger.info("setup spotify") try: self.spotify = self.session_bus.get_object( Spotify.SPOTIFY_BUS, Spotify.SPOTIFY_OBJECT_PATH ) - except dbus.DBusException: - self.spotify = self.session_bus.get_object(Spotify.SPOTIFYD_BUS, Spotify.SPOTIFY_OBJECT_PATH) + except dbus.DBusException as error: + self.logger.warning("DbusException: %s", error) + self.spotify = self.session_bus.get_object( + Spotify.SPOTIFYD_BUS, + Spotify.SPOTIFY_OBJECT_PATH) def setup_properties_changed(self): + """ Setup propertise changed """ try: self.setup_spotify() self.spotify.connect_to_signal( @@ -151,9 +172,11 @@ class Spotify: ) except dbus.DBusException: + self.logger.warning("Exception") self.output('') def output_playback_status(self, data, retry=False): + """ output current song """ if self.ignore: return @@ -169,17 +192,21 @@ class Spotify: playback_status = data['PlaybackStatus'] same_song = title == self.last_title - color = active_color if playback_status == 'Playing' else inactive_color + color = ACTIVE_COLOR if playback_status == 'Playing' else INACTIVE_COLOR # divider = '+' if same_song and self.saved_track else '-' - self.output(f'{color}{artist} - {title}{default_color}') + self.output(f'{color}{artist} - {title}{DEFAULT_COLOR}') if not same_song: self.last_title = title def on_properties_changed(self, interface, data, *args, **kwargs): + """On name properties changed event""" + del interface, args, kwargs self.output_playback_status(data) def on_name_owner_changed(self, name, old_owner, new_owner): + """On name owner changed event""" + del old_owner if name == self.SPOTIFY_BUS: if new_owner: # Spotify was opened. @@ -193,7 +220,6 @@ class Spotify: @click.group() def cli(): """Script for listening to Spotify over dbus and adding tracks to your library.""" - pass @cli.command() diff --git a/qutebrowser/.config/qutebrowser/config.py b/qutebrowser/.config/qutebrowser/config.py new file mode 100644 index 0000000..b533853 --- /dev/null +++ b/qutebrowser/.config/qutebrowser/config.py @@ -0,0 +1,4 @@ +c.url.start_pages = ['https://start.duckduckgo.com', 'https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/img/cheatsheet-big.png'] +c.input.partial_timeout = 10000 +c.messages.timeout = 5000 +c.content.pdfjs = True diff --git a/x/.config/x/xprofile b/x/.config/x/xprofile index 5ed8c5b..7b1aca8 100755 --- a/x/.config/x/xprofile +++ b/x/.config/x/xprofile @@ -1,8 +1,7 @@ #!/bin/sh # set keyboard -setxkbmap -layout us,us -variant ,dvp -option grp:shifts_toggle -setxkbmap -option caps:swapescape +setxkbmap -layout us,us -variant ,dvp -option grp:shifts_toggle -option caps:swapescape xset r rate 300 50 # set wallpaper diff --git a/zsh/.config/zsh/.zshrc b/zsh/.config/zsh/.zshrc index 91c966c..d2806f0 100644 --- a/zsh/.config/zsh/.zshrc +++ b/zsh/.config/zsh/.zshrc @@ -7,10 +7,11 @@ stty stop undef # Disable ctrl-s to freeze terminal. # History HISTFILE="$XDG_CACHE_HOME/zsh/history" -HISTSIZE=50000 +HISTSIZE=10000 SAVEHIST=10000 setopt extended_history # record timestamp of command in HISTFILE setopt hist_expire_dups_first # delete duplicates first when HISTFILE size exceeds HISTSIZE +setopt hist_ignore_all_dups # ignore all duplicated commands setopt hist_ignore_dups # ignore duplicated commands history list setopt hist_ignore_space # ignore commands that start with space setopt hist_verify # show command with history expansion to user before running it @@ -143,7 +144,6 @@ if type "deno" > /dev/null; then #unset deno_cache fi - if type "thefuck" > /dev/null; then thefuck_cache_dir="$XDG_CACHE_HOME/thefuck" thefuck_cache="$thefuck_cache_dir/thefuck_init-zsh" diff --git a/zsh/.local/share/zsh/functions/_deno b/zsh/.local/share/zsh/functions/_deno index 1d820f4..3bef4ba 100644 --- a/zsh/.local/share/zsh/functions/_deno +++ b/zsh/.local/share/zsh/functions/_deno @@ -17,6 +17,7 @@ _deno() { _arguments "${_arguments_options[@]}" \ '-L+[Set log level]: :(debug info)' \ '--log-level=[Set log level]: :(debug info)' \ +'--unstable[Enable unstable features and APIs]' \ '-q[Suppress diagnostic output]' \ '--quiet[Suppress diagnostic output]' \ '-h[Prints help information]' \ @@ -34,21 +35,24 @@ _deno() { case $line[1] in (bundle) _arguments "${_arguments_options[@]}" \ -'--lock=[Check the specified lock file]' \ -'--cert=[Load certificate authority from PEM encoded file]' \ -'-r+[Reload source code cache (recompile TypeScript)]' \ -'--reload=[Reload source code cache (recompile TypeScript)]' \ -'--importmap=[UNSTABLE: Load import map file]' \ +'--import-map=[UNSTABLE: Load import map file]' \ '-c+[Load tsconfig.json configuration file]' \ '--config=[Load tsconfig.json configuration file]' \ +'-r+[Reload source code cache (recompile TypeScript)]' \ +'--reload=[Reload source code cache (recompile TypeScript)]' \ +'--lock=[Check the specified lock file]' \ +'--cert=[Load certificate authority from PEM encoded file]' \ '-L+[Set log level]: :(debug info)' \ '--log-level=[Set log level]: :(debug info)' \ -'--lock-write[Write lock file. Use with --lock.]' \ -'--unstable[Enable unstable APIs]' \ +'--no-remote[Do not resolve remote modules]' \ +'--no-check[Skip type checking modules]' \ +'--lock-write[Write lock file (use with --lock)]' \ +'--watch[Watch for file changes and restart process automatically]' \ '-h[Prints help information]' \ '--help[Prints help information]' \ '-V[Prints version information]' \ '--version[Prints version information]' \ +'--unstable[Enable unstable features and APIs]' \ '-q[Suppress diagnostic output]' \ '--quiet[Suppress diagnostic output]' \ ':source_file:_files' \ @@ -57,26 +61,67 @@ _arguments "${_arguments_options[@]}" \ ;; (cache) _arguments "${_arguments_options[@]}" \ +'--import-map=[UNSTABLE: Load import map file]' \ +'-c+[Load tsconfig.json configuration file]' \ +'--config=[Load tsconfig.json configuration file]' \ '-r+[Reload source code cache (recompile TypeScript)]' \ '--reload=[Reload source code cache (recompile TypeScript)]' \ '--lock=[Check the specified lock file]' \ -'--importmap=[UNSTABLE: Load import map file]' \ +'--cert=[Load certificate authority from PEM encoded file]' \ +'-L+[Set log level]: :(debug info)' \ +'--log-level=[Set log level]: :(debug info)' \ +'--no-remote[Do not resolve remote modules]' \ +'--no-check[Skip type checking modules]' \ +'--lock-write[Write lock file (use with --lock)]' \ +'-h[Prints help information]' \ +'--help[Prints help information]' \ +'-V[Prints version information]' \ +'--version[Prints version information]' \ +'--unstable[Enable unstable features and APIs]' \ +'-q[Suppress diagnostic output]' \ +'--quiet[Suppress diagnostic output]' \ +':file:_files' \ +&& ret=0 +;; +(compile) +_arguments "${_arguments_options[@]}" \ +'--import-map=[UNSTABLE: Load import map file]' \ '-c+[Load tsconfig.json configuration file]' \ '--config=[Load tsconfig.json configuration file]' \ +'-r+[Reload source code cache (recompile TypeScript)]' \ +'--reload=[Reload source code cache (recompile TypeScript)]' \ +'--lock=[Check the specified lock file]' \ '--cert=[Load certificate authority from PEM encoded file]' \ +'--allow-read=[Allow file system read access]' \ +'--allow-write=[Allow file system write access]' \ +'--allow-net=[Allow network access]' \ +'--location=[Value of '\''globalThis.location'\'' used by some web APIs]' \ +'--v8-flags=[Set V8 command line options (for help: --v8-flags=--help)]' \ +'--seed=[Seed Math.random()]' \ +'-o+[Output file (defaults to $PWD/<inferred-name>)]' \ +'--output=[Output file (defaults to $PWD/<inferred-name>)]' \ +'--target=[Target OS architecture]: :(x86_64-unknown-linux-gnu x86_64-pc-windows-msvc x86_64-apple-darwin aarch64-apple-darwin)' \ '-L+[Set log level]: :(debug info)' \ '--log-level=[Set log level]: :(debug info)' \ -'--lock-write[Write lock file. Use with --lock.]' \ -'--unstable[Enable unstable APIs]' \ -'--no-check[Skip type checking modules]' \ '--no-remote[Do not resolve remote modules]' \ +'--no-check[Skip type checking modules]' \ +'--lock-write[Write lock file (use with --lock)]' \ +'--allow-env[Allow environment access]' \ +'--allow-run[Allow running subprocesses]' \ +'--allow-plugin[Allow loading plugins]' \ +'--allow-hrtime[Allow high resolution time measurement]' \ +'-A[Allow all permissions]' \ +'--allow-all[Allow all permissions]' \ +'--cached-only[Require that remote dependencies are already cached]' \ +'--lite[Use lite runtime]' \ '-h[Prints help information]' \ '--help[Prints help information]' \ '-V[Prints version information]' \ '--version[Prints version information]' \ +'--unstable[Enable unstable features and APIs]' \ '-q[Suppress diagnostic output]' \ '--quiet[Suppress diagnostic output]' \ -':file:_files' \ +':script_arg -- Script arg:_files' \ && ret=0 ;; (completions) @@ -87,6 +132,7 @@ _arguments "${_arguments_options[@]}" \ '--help[Prints help information]' \ '-V[Prints version information]' \ '--version[Prints version information]' \ +'--unstable[Enable unstable features and APIs]' \ '-q[Suppress diagnostic output]' \ '--quiet[Suppress diagnostic output]' \ ':shell:(zsh bash fish powershell elvish)' \ @@ -94,32 +140,44 @@ _arguments "${_arguments_options[@]}" \ ;; (doc) _arguments "${_arguments_options[@]}" \ +'--import-map=[UNSTABLE: Load import map file]' \ '-r+[Reload source code cache (recompile TypeScript)]' \ '--reload=[Reload source code cache (recompile TypeScript)]' \ '-L+[Set log level]: :(debug info)' \ '--log-level=[Set log level]: :(debug info)' \ -'--unstable[Enable unstable APIs]' \ -'--json[Output documentation in JSON format.]' \ +'--json[Output documentation in JSON format]' \ '--private[Output private documentation]' \ '-h[Prints help information]' \ '--help[Prints help information]' \ '-V[Prints version information]' \ '--version[Prints version information]' \ +'--unstable[Enable unstable features and APIs]' \ '-q[Suppress diagnostic output]' \ '--quiet[Suppress diagnostic output]' \ '::source_file:_files' \ -'::filter -- Dot separated path to symbol.:_files' \ +'::filter -- Dot separated path to symbol:_files' \ && ret=0 ;; (eval) _arguments "${_arguments_options[@]}" \ +'--import-map=[UNSTABLE: Load import map file]' \ +'-c+[Load tsconfig.json configuration file]' \ +'--config=[Load tsconfig.json configuration file]' \ +'-r+[Reload source code cache (recompile TypeScript)]' \ +'--reload=[Reload source code cache (recompile TypeScript)]' \ +'--lock=[Check the specified lock file]' \ +'--cert=[Load certificate authority from PEM encoded file]' \ '--inspect=[activate inspector on host:port (default: 127.0.0.1:9229)]' \ '--inspect-brk=[activate inspector on host:port and break at start of user script]' \ -'--cert=[Load certificate authority from PEM encoded file]' \ -'--v8-flags=[Set V8 command line options. For help: --v8-flags=--help]' \ +'--location=[Value of '\''globalThis.location'\'' used by some web APIs]' \ +'--v8-flags=[Set V8 command line options (for help: --v8-flags=--help)]' \ +'--seed=[Seed Math.random()]' \ '-L+[Set log level]: :(debug info)' \ '--log-level=[Set log level]: :(debug info)' \ -'--unstable[Enable unstable APIs]' \ +'--no-remote[Do not resolve remote modules]' \ +'--no-check[Skip type checking modules]' \ +'--lock-write[Write lock file (use with --lock)]' \ +'--cached-only[Require that remote dependencies are already cached]' \ '-T[Treat eval input as TypeScript]' \ '--ts[Treat eval input as TypeScript]' \ '-p[print result to stdout]' \ @@ -128,22 +186,25 @@ _arguments "${_arguments_options[@]}" \ '--help[Prints help information]' \ '-V[Prints version information]' \ '--version[Prints version information]' \ +'--unstable[Enable unstable features and APIs]' \ '-q[Suppress diagnostic output]' \ '--quiet[Suppress diagnostic output]' \ -':code:_files' \ +':code_arg -- Code arg:_files' \ && ret=0 ;; (fmt) _arguments "${_arguments_options[@]}" \ +'--ext=[Set standard input (stdin) content type]: :(ts tsx js jsx md)' \ '--ignore=[Ignore formatting particular source files. Use with --unstable]' \ '-L+[Set log level]: :(debug info)' \ '--log-level=[Set log level]: :(debug info)' \ -'--check[Check if the source files are formatted.]' \ -'--unstable[Enable unstable APIs]' \ +'--check[Check if the source files are formatted]' \ +'--watch[Watch for file changes and restart process automatically]' \ '-h[Prints help information]' \ '--help[Prints help information]' \ '-V[Prints version information]' \ '--version[Prints version information]' \ +'--unstable[Enable unstable features and APIs]' \ '-q[Suppress diagnostic output]' \ '--quiet[Suppress diagnostic output]' \ '::files:_files' \ @@ -154,15 +215,16 @@ _arguments "${_arguments_options[@]}" \ '-r+[Reload source code cache (recompile TypeScript)]' \ '--reload=[Reload source code cache (recompile TypeScript)]' \ '--cert=[Load certificate authority from PEM encoded file]' \ +'--import-map=[UNSTABLE: Load import map file]' \ '-L+[Set log level]: :(debug info)' \ '--log-level=[Set log level]: :(debug info)' \ '--no-check[Skip type checking modules]' \ -'--unstable[Enable unstable APIs]' \ '--json[Outputs the information in JSON format]' \ '-h[Prints help information]' \ '--help[Prints help information]' \ '-V[Prints version information]' \ '--version[Prints version information]' \ +'--unstable[Enable unstable features and APIs]' \ '-q[Suppress diagnostic output]' \ '--quiet[Suppress diagnostic output]' \ '::file:_files' \ @@ -170,48 +232,73 @@ _arguments "${_arguments_options[@]}" \ ;; (install) _arguments "${_arguments_options[@]}" \ +'--import-map=[UNSTABLE: Load import map file]' \ +'-c+[Load tsconfig.json configuration file]' \ +'--config=[Load tsconfig.json configuration file]' \ +'-r+[Reload source code cache (recompile TypeScript)]' \ +'--reload=[Reload source code cache (recompile TypeScript)]' \ +'--lock=[Check the specified lock file]' \ +'--cert=[Load certificate authority from PEM encoded file]' \ '--allow-read=[Allow file system read access]' \ '--allow-write=[Allow file system write access]' \ '--allow-net=[Allow network access]' \ +'--inspect=[activate inspector on host:port (default: 127.0.0.1:9229)]' \ +'--inspect-brk=[activate inspector on host:port and break at start of user script]' \ +'--location=[Value of '\''globalThis.location'\'' used by some web APIs]' \ +'--v8-flags=[Set V8 command line options (for help: --v8-flags=--help)]' \ +'--seed=[Seed Math.random()]' \ '-n+[Executable file name]' \ '--name=[Executable file name]' \ '--root=[Installation root]' \ -'--cert=[Load certificate authority from PEM encoded file]' \ -'-c+[Load tsconfig.json configuration file]' \ -'--config=[Load tsconfig.json configuration file]' \ '-L+[Set log level]: :(debug info)' \ '--log-level=[Set log level]: :(debug info)' \ +'--no-remote[Do not resolve remote modules]' \ +'--no-check[Skip type checking modules]' \ +'--lock-write[Write lock file (use with --lock)]' \ '--allow-env[Allow environment access]' \ '--allow-run[Allow running subprocesses]' \ '--allow-plugin[Allow loading plugins]' \ '--allow-hrtime[Allow high resolution time measurement]' \ '-A[Allow all permissions]' \ '--allow-all[Allow all permissions]' \ +'--cached-only[Require that remote dependencies are already cached]' \ '-f[Forcefully overwrite existing installation]' \ '--force[Forcefully overwrite existing installation]' \ -'--no-check[Skip type checking modules]' \ -'--unstable[Enable unstable APIs]' \ '-h[Prints help information]' \ '--help[Prints help information]' \ '-V[Prints version information]' \ '--version[Prints version information]' \ +'--unstable[Enable unstable features and APIs]' \ '-q[Suppress diagnostic output]' \ '--quiet[Suppress diagnostic output]' \ ':cmd:_files' \ && ret=0 ;; +(lsp) +_arguments "${_arguments_options[@]}" \ +'-L+[Set log level]: :(debug info)' \ +'--log-level=[Set log level]: :(debug info)' \ +'-h[Prints help information]' \ +'--help[Prints help information]' \ +'-V[Prints version information]' \ +'--version[Prints version information]' \ +'--unstable[Enable unstable features and APIs]' \ +'-q[Suppress diagnostic output]' \ +'--quiet[Suppress diagnostic output]' \ +&& ret=0 +;; (lint) _arguments "${_arguments_options[@]}" \ -'--ignore=[Ignore linting particular source files.]' \ +'--ignore=[Ignore linting particular source files]' \ '-L+[Set log level]: :(debug info)' \ '--log-level=[Set log level]: :(debug info)' \ -'--unstable[Enable unstable APIs]' \ '--rules[List available rules]' \ -'--json[Output lint result in JSON format.]' \ +'--json[Output lint result in JSON format]' \ '-h[Prints help information]' \ '--help[Prints help information]' \ '-V[Prints version information]' \ '--version[Prints version information]' \ +'--unstable[Enable unstable features and APIs]' \ '-q[Suppress diagnostic output]' \ '--quiet[Suppress diagnostic output]' \ '::files:_files' \ @@ -219,111 +306,127 @@ _arguments "${_arguments_options[@]}" \ ;; (repl) _arguments "${_arguments_options[@]}" \ +'--import-map=[UNSTABLE: Load import map file]' \ +'-c+[Load tsconfig.json configuration file]' \ +'--config=[Load tsconfig.json configuration file]' \ +'-r+[Reload source code cache (recompile TypeScript)]' \ +'--reload=[Reload source code cache (recompile TypeScript)]' \ +'--lock=[Check the specified lock file]' \ +'--cert=[Load certificate authority from PEM encoded file]' \ '--inspect=[activate inspector on host:port (default: 127.0.0.1:9229)]' \ '--inspect-brk=[activate inspector on host:port and break at start of user script]' \ -'--v8-flags=[Set V8 command line options. For help: --v8-flags=--help]' \ -'--cert=[Load certificate authority from PEM encoded file]' \ +'--location=[Value of '\''globalThis.location'\'' used by some web APIs]' \ +'--v8-flags=[Set V8 command line options (for help: --v8-flags=--help)]' \ +'--seed=[Seed Math.random()]' \ '-L+[Set log level]: :(debug info)' \ '--log-level=[Set log level]: :(debug info)' \ -'--unstable[Enable unstable APIs]' \ +'--no-remote[Do not resolve remote modules]' \ +'--no-check[Skip type checking modules]' \ +'--lock-write[Write lock file (use with --lock)]' \ +'--cached-only[Require that remote dependencies are already cached]' \ '-h[Prints help information]' \ '--help[Prints help information]' \ '-V[Prints version information]' \ '--version[Prints version information]' \ +'--unstable[Enable unstable features and APIs]' \ '-q[Suppress diagnostic output]' \ '--quiet[Suppress diagnostic output]' \ && ret=0 ;; (run) _arguments "${_arguments_options[@]}" \ -'--inspect=[activate inspector on host:port (default: 127.0.0.1:9229)]' \ -'--inspect-brk=[activate inspector on host:port and break at start of user script]' \ -'--allow-read=[Allow file system read access]' \ -'--allow-write=[Allow file system write access]' \ -'--allow-net=[Allow network access]' \ -'--importmap=[UNSTABLE: Load import map file]' \ -'-r+[Reload source code cache (recompile TypeScript)]' \ -'--reload=[Reload source code cache (recompile TypeScript)]' \ +'--import-map=[UNSTABLE: Load import map file]' \ '-c+[Load tsconfig.json configuration file]' \ '--config=[Load tsconfig.json configuration file]' \ +'-r+[Reload source code cache (recompile TypeScript)]' \ +'--reload=[Reload source code cache (recompile TypeScript)]' \ '--lock=[Check the specified lock file]' \ -'--v8-flags=[Set V8 command line options. For help: --v8-flags=--help]' \ '--cert=[Load certificate authority from PEM encoded file]' \ +'--allow-read=[Allow file system read access]' \ +'--allow-write=[Allow file system write access]' \ +'--allow-net=[Allow network access]' \ +'--inspect=[activate inspector on host:port (default: 127.0.0.1:9229)]' \ +'--inspect-brk=[activate inspector on host:port and break at start of user script]' \ +'--location=[Value of '\''globalThis.location'\'' used by some web APIs]' \ +'--v8-flags=[Set V8 command line options (for help: --v8-flags=--help)]' \ '--seed=[Seed Math.random()]' \ '-L+[Set log level]: :(debug info)' \ '--log-level=[Set log level]: :(debug info)' \ +'--no-remote[Do not resolve remote modules]' \ +'--no-check[Skip type checking modules]' \ +'--lock-write[Write lock file (use with --lock)]' \ '--allow-env[Allow environment access]' \ '--allow-run[Allow running subprocesses]' \ '--allow-plugin[Allow loading plugins]' \ '--allow-hrtime[Allow high resolution time measurement]' \ '-A[Allow all permissions]' \ '--allow-all[Allow all permissions]' \ -'--unstable[Enable unstable APIs]' \ -'--lock-write[Write lock file. Use with --lock.]' \ -'--no-check[Skip type checking modules]' \ -'--no-remote[Do not resolve remote modules]' \ '--cached-only[Require that remote dependencies are already cached]' \ -'--watch[Watch for file changes and restart process automatically]' \ +'(--inspect --inspect-brk)--watch[Watch for file changes and restart process automatically]' \ '-h[Prints help information]' \ '--help[Prints help information]' \ '-V[Prints version information]' \ '--version[Prints version information]' \ +'--unstable[Enable unstable features and APIs]' \ '-q[Suppress diagnostic output]' \ '--quiet[Suppress diagnostic output]' \ -':script_arg -- script args:_files' \ +':script_arg -- Script arg:_files' \ && ret=0 ;; (test) _arguments "${_arguments_options[@]}" \ -'--inspect=[activate inspector on host:port (default: 127.0.0.1:9229)]' \ -'--inspect-brk=[activate inspector on host:port and break at start of user script]' \ -'--allow-read=[Allow file system read access]' \ -'--allow-write=[Allow file system write access]' \ -'--allow-net=[Allow network access]' \ -'--importmap=[UNSTABLE: Load import map file]' \ -'-r+[Reload source code cache (recompile TypeScript)]' \ -'--reload=[Reload source code cache (recompile TypeScript)]' \ +'--import-map=[UNSTABLE: Load import map file]' \ '-c+[Load tsconfig.json configuration file]' \ '--config=[Load tsconfig.json configuration file]' \ +'-r+[Reload source code cache (recompile TypeScript)]' \ +'--reload=[Reload source code cache (recompile TypeScript)]' \ '--lock=[Check the specified lock file]' \ -'--v8-flags=[Set V8 command line options. For help: --v8-flags=--help]' \ '--cert=[Load certificate authority from PEM encoded file]' \ +'--allow-read=[Allow file system read access]' \ +'--allow-write=[Allow file system write access]' \ +'--allow-net=[Allow network access]' \ +'--inspect=[activate inspector on host:port (default: 127.0.0.1:9229)]' \ +'--inspect-brk=[activate inspector on host:port and break at start of user script]' \ +'--location=[Value of '\''globalThis.location'\'' used by some web APIs]' \ +'--v8-flags=[Set V8 command line options (for help: --v8-flags=--help)]' \ '--seed=[Seed Math.random()]' \ '--filter=[Run tests with this string or pattern in the test name]' \ +'(--inspect --inspect-brk)--coverage=[Collect coverage information]' \ '-L+[Set log level]: :(debug info)' \ '--log-level=[Set log level]: :(debug info)' \ +'--no-remote[Do not resolve remote modules]' \ +'--no-check[Skip type checking modules]' \ +'--lock-write[Write lock file (use with --lock)]' \ '--allow-env[Allow environment access]' \ '--allow-run[Allow running subprocesses]' \ '--allow-plugin[Allow loading plugins]' \ '--allow-hrtime[Allow high resolution time measurement]' \ '-A[Allow all permissions]' \ '--allow-all[Allow all permissions]' \ -'--unstable[Enable unstable APIs]' \ -'--lock-write[Write lock file. Use with --lock.]' \ -'--no-check[Skip type checking modules]' \ -'--no-remote[Do not resolve remote modules]' \ '--cached-only[Require that remote dependencies are already cached]' \ -'--failfast[Stop on first error]' \ +'--no-run[Cache test modules, but don'\''t run tests]' \ +'--fail-fast[Stop on first error]' \ '--allow-none[Don'\''t return error code if no test files are found]' \ -'(--inspect --inspect-brk)--coverage[Collect coverage information]' \ '-h[Prints help information]' \ '--help[Prints help information]' \ '-V[Prints version information]' \ '--version[Prints version information]' \ +'--unstable[Enable unstable features and APIs]' \ '-q[Suppress diagnostic output]' \ '--quiet[Suppress diagnostic output]' \ '::files -- List of file names to run:_files' \ +'::script_arg -- Script arg:_files' \ && ret=0 ;; (types) _arguments "${_arguments_options[@]}" \ '-L+[Set log level]: :(debug info)' \ '--log-level=[Set log level]: :(debug info)' \ -'--unstable[Enable unstable APIs]' \ '-h[Prints help information]' \ '--help[Prints help information]' \ '-V[Prints version information]' \ '--version[Prints version information]' \ +'--unstable[Enable unstable features and APIs]' \ '-q[Suppress diagnostic output]' \ '--quiet[Suppress diagnostic output]' \ && ret=0 @@ -338,8 +441,10 @@ _arguments "${_arguments_options[@]}" \ '--dry-run[Perform all checks without replacing old exe]' \ '-f[Replace current exe even if not out-of-date]' \ '--force[Replace current exe even if not out-of-date]' \ +'--canary[Upgrade to canary builds]' \ '-h[Prints help information]' \ '--help[Prints help information]' \ +'--unstable[Enable unstable features and APIs]' \ '-q[Suppress diagnostic output]' \ '--quiet[Suppress diagnostic output]' \ && ret=0 @@ -352,6 +457,7 @@ _arguments "${_arguments_options[@]}" \ '--help[Prints help information]' \ '-V[Prints version information]' \ '--version[Prints version information]' \ +'--unstable[Enable unstable features and APIs]' \ '-q[Suppress diagnostic output]' \ '--quiet[Suppress diagnostic output]' \ && ret=0 @@ -366,12 +472,14 @@ _deno_commands() { local commands; commands=( "bundle:Bundle module and dependencies into single file" \ "cache:Cache the dependencies" \ +"compile:Compile the script into a self contained executable" \ "completions:Generate shell completions" \ "doc:Show documentation for a module" \ "eval:Eval script" \ "fmt:Format source files" \ "info:Show info about cache or info related to source file" \ "install:Install script as an executable" \ +"lsp:Start the language server" \ "lint:Lint source files" \ "repl:Read Eval Print Loop" \ "run:Run a program given a filename or url to the module. Use '-' as a filename to read from stdin." \ @@ -396,6 +504,13 @@ _deno__cache_commands() { ) _describe -t commands 'deno cache commands' commands "$@" } +(( $+functions[_deno__compile_commands] )) || +_deno__compile_commands() { + local commands; commands=( + + ) + _describe -t commands 'deno compile commands' commands "$@" +} (( $+functions[_deno__completions_commands] )) || _deno__completions_commands() { local commands; commands=( @@ -452,6 +567,13 @@ _deno__lint_commands() { ) _describe -t commands 'deno lint commands' commands "$@" } +(( $+functions[_deno__lsp_commands] )) || +_deno__lsp_commands() { + local commands; commands=( + + ) + _describe -t commands 'deno lsp commands' commands "$@" +} (( $+functions[_deno__repl_commands] )) || _deno__repl_commands() { local commands; commands=( diff --git a/zsh/.local/share/zsh/functions/_op b/zsh/.local/share/zsh/functions/_op new file mode 100644 index 0000000..0485231 --- /dev/null +++ b/zsh/.local/share/zsh/functions/_op @@ -0,0 +1,871 @@ +#compdef _op op + + +function _op { + local -a commands + + _arguments -C \ + '--account[use the account with this `shorthand`]:' \ + '--cache[store and use cached information]' \ + '--config[use this configuration `directory`]:' \ + '(-h --help)'{-h,--help}'[get help for op]' \ + '--session[authenticate with this session `token`]:' \ + "1: :->cmnds" \ + "*::arg:->args" + + case $state in + cmnds) + commands=( + "add:Grant access to groups or vaults" + "completion:Generate shell completion information" + "confirm:Confirm a user" + "create:Create an object" + "delete:Remove an object" + "edit:Edit an object" + "encode:Encode the JSON needed to create an item" + "forget:Remove a 1Password account from this device" + "get:Get details about an object" + "help:Get help for a command" + "list:List objects and events" + "reactivate:Reactivate a suspended user" + "remove:Revoke access to groups or vaults" + "signin:Sign in to a 1Password account" + "signout:Sign out of a 1Password account" + "suspend:Suspend a user" + "update:Check for and download updates" + ) + _describe "command" commands + ;; + esac + + case "$words[1]" in + add) + _op_add + ;; + completion) + _op_completion + ;; + confirm) + _op_confirm + ;; + create) + _op_create + ;; + delete) + _op_delete + ;; + edit) + _op_edit + ;; + encode) + _op_encode + ;; + forget) + _op_forget + ;; + get) + _op_get + ;; + help) + _op_help + ;; + list) + _op_list + ;; + reactivate) + _op_reactivate + ;; + remove) + _op_remove + ;; + signin) + _op_signin + ;; + signout) + _op_signout + ;; + suspend) + _op_suspend + ;; + update) + _op_update + ;; + esac +} + + +function _op_add { + local -a commands + + _arguments -C \ + '(-h --help)'{-h,--help}'[get help with add]' \ + '--account[use the account with this `shorthand`]:' \ + '--cache[store and use cached information]' \ + '--config[use this configuration `directory`]:' \ + '--session[authenticate with this session `token`]:' \ + "1: :->cmnds" \ + "*::arg:->args" + + case $state in + cmnds) + commands=( + "group:Grant a group access to a vault" + "user:Grant a user access to a vault or group" + ) + _describe "command" commands + ;; + esac + + case "$words[1]" in + group) + _op_add_group + ;; + user) + _op_add_user + ;; + esac +} + +function _op_add_group { + _arguments \ + '(-h --help)'{-h,--help}'[get help with add group]' \ + '--account[use the account with this `shorthand`]:' \ + '--cache[store and use cached information]' \ + '--config[use this configuration `directory`]:' \ + '--session[authenticate with this session `token`]:' +} + +function _op_add_user { + _arguments \ + '(-h --help)'{-h,--help}'[get help with add user]' \ + '--role[set the user'\''s `role` in a group (member or manager) (default "member")]:' \ + '--account[use the account with this `shorthand`]:' \ + '--cache[store and use cached information]' \ + '--config[use this configuration `directory`]:' \ + '--session[authenticate with this session `token`]:' +} + +function _op_completion { + _arguments \ + '(-h --help)'{-h,--help}'[get help with completion]' \ + '--account[use the account with this `shorthand`]:' \ + '--cache[store and use cached information]' \ + '--config[use this configuration `directory`]:' \ + '--session[authenticate with this session `token`]:' +} + +function _op_confirm { + _arguments \ + '--all[confirm all unconfirmed users]' \ + '(-h --help)'{-h,--help}'[get help with confirm]' \ + '--account[use the account with this `shorthand`]:' \ + '--cache[store and use cached information]' \ + '--config[use this configuration `directory`]:' \ + '--session[authenticate with this session `token`]:' +} + + +function _op_create { + local -a commands + + _arguments -C \ + '(-h --help)'{-h,--help}'[get help with create]' \ + '--account[use the account with this `shorthand`]:' \ + '--cache[store and use cached information]' \ + '--config[use this configuration `directory`]:' \ + '--session[authenticate with this session `token`]:' \ + "1: :->cmnds" \ + "*::arg:->args" + + case $state in + cmnds) + commands=( + "document:Create a document" + "group:Create a group" + "item:Create an item" + "user:Create a user" + "vault:Create a vault" + ) + _describe "command" commands + ;; + esac + + case "$words[1]" in + document) + _op_create_document + ;; + group) + _op_create_group + ;; + item) + _op_create_item + ;; + user) + _op_create_user + ;; + vault) + _op_create_vault + ;; + esac +} + +function _op_create_document { + _arguments \ + '--filename[set the file'\''s `name`]:' \ + '(-h --help)'{-h,--help}'[get help with create document]' \ + '--tags[add one or more `tags` (comma-separated) to the item]:' \ + '--title[set the item'\''s `title`]:' \ + '--vault[save the document in this `vault`]:' \ + '--account[use the account with this `shorthand`]:' \ + '--cache[store and use cached information]' \ + '--config[use this configuration `directory`]:' \ + '--session[authenticate with this session `token`]:' +} + +function _op_create_group { + _arguments \ + '--description[set the group'\''s `description`]:' \ + '(-h --help)'{-h,--help}'[get help with create group]' \ + '--account[use the account with this `shorthand`]:' \ + '--cache[store and use cached information]' \ + '--config[use this configuration `directory`]:' \ + '--session[authenticate with this session `token`]:' +} + +function _op_create_item { + _arguments \ + '--generate-password[give the item a randomly generated password]' \ + '(-h --help)'{-h,--help}'[get help with create item]' \ + '--tags[add one or more `tags` (comma-separated) to the item]:' \ + '--title[set the item'\''s `title`]:' \ + '--url[set the `URL` associated with the item]:' \ + '--vault[save the item in this `vault`]:' \ + '--account[use the account with this `shorthand`]:' \ + '--cache[store and use cached information]' \ + '--config[use this configuration `directory`]:' \ + '--session[authenticate with this session `token`]:' +} + +function _op_create_user { + _arguments \ + '(-h --help)'{-h,--help}'[get help with create user]' \ + '--language[set the user'\''s account `language`]:' \ + '--account[use the account with this `shorthand`]:' \ + '--cache[store and use cached information]' \ + '--config[use this configuration `directory`]:' \ + '--session[authenticate with this session `token`]:' +} + +function _op_create_vault { + _arguments \ + '--allow-admins-to-manage[set whether admins can manage vault access]:' \ + '--description[set the group'\''s `description`]:' \ + '(-h --help)'{-h,--help}'[get help with create vault]' \ + '--account[use the account with this `shorthand`]:' \ + '--cache[store and use cached information]' \ + '--config[use this configuration `directory`]:' \ + '--session[authenticate with this session `token`]:' +} + + +function _op_delete { + local -a commands + + _arguments -C \ + '(-h --help)'{-h,--help}'[get help with delete]' \ + '--account[use the account with this `shorthand`]:' \ + '--cache[store and use cached information]' \ + '--config[use this configuration `directory`]:' \ + '--session[authenticate with this session `token`]:' \ + "1: :->cmnds" \ + "*::arg:->args" + + case $state in + cmnds) + commands=( + "document:Move a document to the Trash" + "group:Remove a group" + "item:Move an item to the Trash" + "trash:Empty a vault's Trash" + "user:Completely remove a user" + "vault:Remove a vault" + ) + _describe "command" commands + ;; + esac + + case "$words[1]" in + document) + _op_delete_document + ;; + group) + _op_delete_group + ;; + item) + _op_delete_item + ;; + trash) + _op_delete_trash + ;; + user) + _op_delete_user + ;; + vault) + _op_delete_vault + ;; + esac +} + +function _op_delete_document { + _arguments \ + '(-h --help)'{-h,--help}'[get help with delete document]' \ + '--vault[look for the document in this `vault`]:' \ + '--account[use the account with this `shorthand`]:' \ + '--cache[store and use cached information]' \ + '--config[use this configuration `directory`]:' \ + '--session[authenticate with this session `token`]:' +} + +function _op_delete_group { + _arguments \ + '(-h --help)'{-h,--help}'[get help with delete group]' \ + '--account[use the account with this `shorthand`]:' \ + '--cache[store and use cached information]' \ + '--config[use this configuration `directory`]:' \ + '--session[authenticate with this session `token`]:' +} + +function _op_delete_item { + _arguments \ + '(-h --help)'{-h,--help}'[get help with delete item]' \ + '--vault[look for the item in this `vault`]:' \ + '--account[use the account with this `shorthand`]:' \ + '--cache[store and use cached information]' \ + '--config[use this configuration `directory`]:' \ + '--session[authenticate with this session `token`]:' +} + +function _op_delete_trash { + _arguments \ + '(-h --help)'{-h,--help}'[get help with delete trash]' \ + '--account[use the account with this `shorthand`]:' \ + '--cache[store and use cached information]' \ + '--config[use this configuration `directory`]:' \ + '--session[authenticate with this session `token`]:' +} + +function _op_delete_user { + _arguments \ + '(-h --help)'{-h,--help}'[get help with delete user]' \ + '--account[use the account with this `shorthand`]:' \ + '--cache[store and use cached information]' \ + '--config[use this configuration `directory`]:' \ + '--session[authenticate with this session `token`]:' +} + +function _op_delete_vault { + _arguments \ + '(-h --help)'{-h,--help}'[get help with delete vault]' \ + '--account[use the account with this `shorthand`]:' \ + '--cache[store and use cached information]' \ + '--config[use this configuration `directory`]:' \ + '--session[authenticate with this session `token`]:' +} + + +function _op_edit { + local -a commands + + _arguments -C \ + '(-h --help)'{-h,--help}'[get help with edit]' \ + '--account[use the account with this `shorthand`]:' \ + '--cache[store and use cached information]' \ + '--config[use this configuration `directory`]:' \ + '--session[authenticate with this session `token`]:' \ + "1: :->cmnds" \ + "*::arg:->args" + + case $state in + cmnds) + commands=( + "document:Edit a document" + "group:Edit a group's name or description" + "item:Edit an item's details" + "user:Edit a user's name or Travel Mode status" + "vault:Edit a vault's name" + ) + _describe "command" commands + ;; + esac + + case "$words[1]" in + document) + _op_edit_document + ;; + group) + _op_edit_group + ;; + item) + _op_edit_item + ;; + user) + _op_edit_user + ;; + vault) + _op_edit_vault + ;; + esac +} + +function _op_edit_document { + _arguments \ + '--filename[set the file'\''s `name`]:' \ + '(-h --help)'{-h,--help}'[get help with edit document]' \ + '--tags[add one or more `tags` (comma-separated) to the item]:' \ + '--title[set the item'\''s `title`]:' \ + '--vault[look up document in this `vault`]:' \ + '--account[use the account with this `shorthand`]:' \ + '--cache[store and use cached information]' \ + '--config[use this configuration `directory`]:' \ + '--session[authenticate with this session `token`]:' +} + +function _op_edit_group { + _arguments \ + '--description[change the group'\''s `description`]:' \ + '(-h --help)'{-h,--help}'[get help with edit group]' \ + '--name[change the group'\''s `name`]:' \ + '--account[use the account with this `shorthand`]:' \ + '--cache[store and use cached information]' \ + '--config[use this configuration `directory`]:' \ + '--session[authenticate with this session `token`]:' +} + +function _op_edit_item { + _arguments \ + '--generate-password[give the item a randomly generated password]' \ + '(-h --help)'{-h,--help}'[get help with edit item]' \ + '--vault[look for the item in this `vault`]:' \ + '--account[use the account with this `shorthand`]:' \ + '--cache[store and use cached information]' \ + '--config[use this configuration `directory`]:' \ + '--session[authenticate with this session `token`]:' +} + +function _op_edit_user { + _arguments \ + '(-h --help)'{-h,--help}'[get help with edit user]' \ + '--name[set the user'\''s `name`]:' \ + '--travelmode[turn Travel Mode on or off for the user]:' \ + '--account[use the account with this `shorthand`]:' \ + '--cache[store and use cached information]' \ + '--config[use this configuration `directory`]:' \ + '--session[authenticate with this session `token`]:' +} + +function _op_edit_vault { + _arguments \ + '(-h --help)'{-h,--help}'[get help with edit vault]' \ + '--name[change the vault'\''s `name`]:' \ + '--account[use the account with this `shorthand`]:' \ + '--cache[store and use cached information]' \ + '--config[use this configuration `directory`]:' \ + '--session[authenticate with this session `token`]:' +} + +function _op_encode { + _arguments \ + '(-h --help)'{-h,--help}'[get help with encode]' \ + '--account[use the account with this `shorthand`]:' \ + '--cache[store and use cached information]' \ + '--config[use this configuration `directory`]:' \ + '--session[authenticate with this session `token`]:' +} + +function _op_forget { + _arguments \ + '(-h --help)'{-h,--help}'[get help with forget]' \ + '--account[use the account with this `shorthand`]:' \ + '--cache[store and use cached information]' \ + '--config[use this configuration `directory`]:' \ + '--session[authenticate with this session `token`]:' +} + + +function _op_get { + local -a commands + + _arguments -C \ + '(-h --help)'{-h,--help}'[get help with get]' \ + '--account[use the account with this `shorthand`]:' \ + '--cache[store and use cached information]' \ + '--config[use this configuration `directory`]:' \ + '--session[authenticate with this session `token`]:' \ + "1: :->cmnds" \ + "*::arg:->args" + + case $state in + cmnds) + commands=( + "account:Get details about your account" + "document:Download a document" + "group:Get details about a group" + "item:Get item details" + "template:Get an item template" + "totp:Get the one-time password for an item" + "user:Get details about a user" + "vault:Get details about a vault" + ) + _describe "command" commands + ;; + esac + + case "$words[1]" in + account) + _op_get_account + ;; + document) + _op_get_document + ;; + group) + _op_get_group + ;; + item) + _op_get_item + ;; + template) + _op_get_template + ;; + totp) + _op_get_totp + ;; + user) + _op_get_user + ;; + vault) + _op_get_vault + ;; + esac +} + +function _op_get_account { + _arguments \ + '(-h --help)'{-h,--help}'[get help with get account]' \ + '--account[use the account with this `shorthand`]:' \ + '--cache[store and use cached information]' \ + '--config[use this configuration `directory`]:' \ + '--session[authenticate with this session `token`]:' +} + +function _op_get_document { + _arguments \ + '(-h --help)'{-h,--help}'[get help with get document]' \ + '--include-trash[include items from the Trash]' \ + '--output[save the document to the file `path` instead of stdout]:' \ + '--vault[look for the document in this `vault`]:' \ + '--account[use the account with this `shorthand`]:' \ + '--cache[store and use cached information]' \ + '--config[use this configuration `directory`]:' \ + '--session[authenticate with this session `token`]:' +} + +function _op_get_group { + _arguments \ + '(-h --help)'{-h,--help}'[get help with get group]' \ + '--account[use the account with this `shorthand`]:' \ + '--cache[store and use cached information]' \ + '--config[use this configuration `directory`]:' \ + '--session[authenticate with this session `token`]:' +} + +function _op_get_item { + _arguments \ + '*--fields[only return data from these `fields`]:' \ + '--format[return data in this `format` (CSV or JSON) (use with --fields)]:' \ + '(-h --help)'{-h,--help}'[get help with get item]' \ + '--include-trash[include items in the Trash]' \ + '--share-link[get a shareable link for the item]' \ + '--vault[look for the item in this `vault`]:' \ + '--account[use the account with this `shorthand`]:' \ + '--cache[store and use cached information]' \ + '--config[use this configuration `directory`]:' \ + '--session[authenticate with this session `token`]:' +} + +function _op_get_template { + _arguments \ + '(-h --help)'{-h,--help}'[get help with get template]' \ + '--account[use the account with this `shorthand`]:' \ + '--cache[store and use cached information]' \ + '--config[use this configuration `directory`]:' \ + '--session[authenticate with this session `token`]:' +} + +function _op_get_totp { + _arguments \ + '(-h --help)'{-h,--help}'[get help with get totp]' \ + '--vault[look for the item in this `vault`]:' \ + '--account[use the account with this `shorthand`]:' \ + '--cache[store and use cached information]' \ + '--config[use this configuration `directory`]:' \ + '--session[authenticate with this session `token`]:' +} + +function _op_get_user { + _arguments \ + '--fingerprint[get the user'\''s public key fingerprint]' \ + '(-h --help)'{-h,--help}'[get help with get user]' \ + '--publickey[get the user'\''s public key]' \ + '--account[use the account with this `shorthand`]:' \ + '--cache[store and use cached information]' \ + '--config[use this configuration `directory`]:' \ + '--session[authenticate with this session `token`]:' +} + +function _op_get_vault { + _arguments \ + '(-h --help)'{-h,--help}'[get help with get vault]' \ + '--account[use the account with this `shorthand`]:' \ + '--cache[store and use cached information]' \ + '--config[use this configuration `directory`]:' \ + '--session[authenticate with this session `token`]:' +} + +function _op_help { + _arguments \ + '--account[use the account with this `shorthand`]:' \ + '--cache[store and use cached information]' \ + '--config[use this configuration `directory`]:' \ + '--session[authenticate with this session `token`]:' +} + + +function _op_list { + local -a commands + + _arguments -C \ + '(-h --help)'{-h,--help}'[get help with list]' \ + '--account[use the account with this `shorthand`]:' \ + '--cache[store and use cached information]' \ + '--config[use this configuration `directory`]:' \ + '--session[authenticate with this session `token`]:' \ + "1: :->cmnds" \ + "*::arg:->args" + + case $state in + cmnds) + commands=( + "documents:Get a list of documents" + "events:Get a list of events from the Activity Log" + "groups:Get a list of groups" + "items:Get a list of items" + "templates:Get a list of templates" + "users:Get the list of users" + "vaults:Get a list of vaults" + ) + _describe "command" commands + ;; + esac + + case "$words[1]" in + documents) + _op_list_documents + ;; + events) + _op_list_events + ;; + groups) + _op_list_groups + ;; + items) + _op_list_items + ;; + templates) + _op_list_templates + ;; + users) + _op_list_users + ;; + vaults) + _op_list_vaults + ;; + esac +} + +function _op_list_documents { + _arguments \ + '(-h --help)'{-h,--help}'[get help with list documents]' \ + '--include-trash[include documents in the Trash]' \ + '--vault[only list documents in this `vault`]:' \ + '--account[use the account with this `shorthand`]:' \ + '--cache[store and use cached information]' \ + '--config[use this configuration `directory`]:' \ + '--session[authenticate with this session `token`]:' +} + +function _op_list_events { + _arguments \ + '--eventid[start listing from event with ID `eid`]:' \ + '(-h --help)'{-h,--help}'[get help with list events]' \ + '--older[list events from before the specified event]' \ + '--account[use the account with this `shorthand`]:' \ + '--cache[store and use cached information]' \ + '--config[use this configuration `directory`]:' \ + '--session[authenticate with this session `token`]:' +} + +function _op_list_groups { + _arguments \ + '(-h --help)'{-h,--help}'[get help with list groups]' \ + '--user[list groups that a `user` belongs to]:' \ + '--vault[list groups that have direct access to a `vault`]:' \ + '--account[use the account with this `shorthand`]:' \ + '--cache[store and use cached information]' \ + '--config[use this configuration `directory`]:' \ + '--session[authenticate with this session `token`]:' +} + +function _op_list_items { + _arguments \ + '*--categories[only list items in these `categories` (comma-separated)]:' \ + '(-h --help)'{-h,--help}'[get help with list items]' \ + '--include-trash[include items in the Trash]' \ + '*--tags[only list items with these `tags` (comma-separated)]:' \ + '--vault[only list items in this `vault`]:' \ + '--account[use the account with this `shorthand`]:' \ + '--cache[store and use cached information]' \ + '--config[use this configuration `directory`]:' \ + '--session[authenticate with this session `token`]:' +} + +function _op_list_templates { + _arguments \ + '(-h --help)'{-h,--help}'[get help with list templates]' \ + '--account[use the account with this `shorthand`]:' \ + '--cache[store and use cached information]' \ + '--config[use this configuration `directory`]:' \ + '--session[authenticate with this session `token`]:' +} + +function _op_list_users { + _arguments \ + '--group[list users who belong to a `group`]:' \ + '(-h --help)'{-h,--help}'[get help with list users]' \ + '--vault[list users who have direct access to `vault`]:' \ + '--account[use the account with this `shorthand`]:' \ + '--cache[store and use cached information]' \ + '--config[use this configuration `directory`]:' \ + '--session[authenticate with this session `token`]:' +} + +function _op_list_vaults { + _arguments \ + '--group[list vaults a `group` has access to]:' \ + '(-h --help)'{-h,--help}'[get help with list vaults]' \ + '--user[list vaults a `user` has access to]:' \ + '--account[use the account with this `shorthand`]:' \ + '--cache[store and use cached information]' \ + '--config[use this configuration `directory`]:' \ + '--session[authenticate with this session `token`]:' +} + +function _op_reactivate { + _arguments \ + '(-h --help)'{-h,--help}'[get help with reactivate]' \ + '--account[use the account with this `shorthand`]:' \ + '--cache[store and use cached information]' \ + '--config[use this configuration `directory`]:' \ + '--session[authenticate with this session `token`]:' +} + + +function _op_remove { + local -a commands + + _arguments -C \ + '(-h --help)'{-h,--help}'[get help with remove]' \ + '--account[use the account with this `shorthand`]:' \ + '--cache[store and use cached information]' \ + '--config[use this configuration `directory`]:' \ + '--session[authenticate with this session `token`]:' \ + "1: :->cmnds" \ + "*::arg:->args" + + case $state in + cmnds) + commands=( + "group:Revoke a group's access to a vault" + "user:Revoke a user's access to a vault or group" + ) + _describe "command" commands + ;; + esac + + case "$words[1]" in + group) + _op_remove_group + ;; + user) + _op_remove_user + ;; + esac +} + +function _op_remove_group { + _arguments \ + '(-h --help)'{-h,--help}'[get help with remove group]' \ + '--account[use the account with this `shorthand`]:' \ + '--cache[store and use cached information]' \ + '--config[use this configuration `directory`]:' \ + '--session[authenticate with this session `token`]:' +} + +function _op_remove_user { + _arguments \ + '(-h --help)'{-h,--help}'[get help with remove user]' \ + '--account[use the account with this `shorthand`]:' \ + '--cache[store and use cached information]' \ + '--config[use this configuration `directory`]:' \ + '--session[authenticate with this session `token`]:' +} + +function _op_signin { + _arguments \ + '(-h --help)'{-h,--help}'[get help with signin]' \ + '(-r --raw)'{-r,--raw}'[only return the session token]' \ + '--shorthand[set the short account `name`]:' \ + '--account[use the account with this `shorthand`]:' \ + '--cache[store and use cached information]' \ + '--config[use this configuration `directory`]:' \ + '--session[authenticate with this session `token`]:' +} + +function _op_signout { + _arguments \ + '--forget[remove the details for a 1Password account from this device]' \ + '(-h --help)'{-h,--help}'[get help with signout]' \ + '--account[use the account with this `shorthand`]:' \ + '--cache[store and use cached information]' \ + '--config[use this configuration `directory`]:' \ + '--session[authenticate with this session `token`]:' +} + +function _op_suspend { + _arguments \ + '(-h --help)'{-h,--help}'[get help with suspend]' \ + '--account[use the account with this `shorthand`]:' \ + '--cache[store and use cached information]' \ + '--config[use this configuration `directory`]:' \ + '--session[authenticate with this session `token`]:' +} + +function _op_update { + _arguments \ + '--directory[download the update to this `path`]:' \ + '(-h --help)'{-h,--help}'[get help with update]' \ + '--account[use the account with this `shorthand`]:' \ + '--cache[store and use cached information]' \ + '--config[use this configuration `directory`]:' \ + '--session[authenticate with this session `token`]:' +} + diff --git a/zsh/.local/share/zsh/functions/_trust b/zsh/.local/share/zsh/functions/_trust new file mode 100644 index 0000000..e140703 --- /dev/null +++ b/zsh/.local/share/zsh/functions/_trust @@ -0,0 +1,30 @@ +#compdef _trust trust + +typeset -A opt_args + +function _trust { + local state + + _arguments -C \ + '1:cmd:->cmds' \ + '*:: :->cmd' + + case "$state" in + (cmds) + local commands; + commands=( + 'list:List trust or certificates' + 'extract:Extract certificates and trust' + 'extract-compat:Extract trust compatibility bundles' + 'anchor:Add, remove, change trust anchors' + 'dump:Dump trust objects in internal format' + '-h:List help information' + '--help:List help information' + ) + + _describe -t commands 'command' commands + esac +} + +function _trust_list { +} |