diff options
106 files changed, 2237 insertions, 4217 deletions
diff --git a/.bin/ag-audio b/.bin/ag-audio index c39fd61..31b0fc3 100755 --- a/.bin/ag-audio +++ b/.bin/ag-audio @@ -10,14 +10,10 @@ __decrease() { __mic_toggle() { pactl set-source-mute @DEFAULT_SOURCE@ toggle - pactl get-source-mute @DEFAULT_SOURCE@ | grep no >/dev/null 2>&1 - echo "${?}" > /sys/class/leds/platform::micmute/brightness } __toggle() { pactl set-sink-mute @DEFAULT_SINK@ toggle - pactl get-sink-mute @DEFAULT_SINK@ | grep no >/dev/null 2>&1 - echo "${?}" > /sys/class/leds/platform::mute/brightness } __next() { @@ -56,4 +52,10 @@ case "${1}" in ;; esac +pactl get-source-mute @DEFAULT_SOURCE@ | grep no >/dev/null 2>&1 +echo "${?}" > /sys/class/leds/platform::micmute/brightness + +pactl get-sink-mute @DEFAULT_SINK@ | grep no >/dev/null 2>&1 +echo "${?}" > /sys/class/leds/platform::mute/brightness + ag-status &>/dev/null diff --git a/.bin/ag-status b/.bin/ag-status index 3970e54..abd2fff 100755 --- a/.bin/ag-status +++ b/.bin/ag-status @@ -6,10 +6,13 @@ __cleanup_value() { uname=$(uname) +status="" + battery="" battery_status="" time="" volume="" +vpn="" while true; do case "${uname}" in @@ -24,8 +27,9 @@ while true; do ;; Linux) battery=$(acpi -b | - cut -d " " -f 4 | - cut -d "%" -f 1) + tr -s " " "\n" | + grep "%" | + sed 's/[%,]//g') battery_status=$(acpi -a | tr -s " " | cut -d " " -f 3) @@ -33,18 +37,25 @@ while true; do __cleanup_value) if $(pamixer --get-mute); then - volume_status="__mute__" + volume="%mute" fi ;; esac - time=$(date +%Y-%m-%dT%H:%M:%S) status="VOL: ${volume}%" + vpn="" + ! wg && vpn="wireguard" + pgrep openvpn && vpn="openvpn" + if [ -n "${vpn}" ]; then + status="${status} | VPN: ${vpn}" + fi + if [ -n "${battery}" ]; then status="${status} | BATTERY ${battery}%" fi + time=$(date +%Y-%m-%dT%H:%M:%S) status="${status} | DATE: ${time}" echo "${status}" diff --git a/.bin/bck-create b/.bin/bck-create new file mode 100755 index 0000000..9714af6 --- /dev/null +++ b/.bin/bck-create @@ -0,0 +1,21 @@ +#!/bin/sh + +set -xe + +directories="${HOME}/docs + ${HOME}/git.rgoncalves.se + ${HOME}/.local/share/gopass + ${HOME}/.local/share/mail + ${HOME}/.local/share/yadm + ${HOME}/.local/share/zk" + +pgp_id=$(gpg --list-secret-keys | grep -A 1 sec | tail -n 1 | tr -d " ") +output_name="$(date -u +"%Y-%m-%dT%H_%M_%S%Z").tar.pgp" + +if [ -d "${1}" ]; then + output_name="${1}/${output_name}" +elif [ -f "${1}" ] || [ "${1}" ]; then + output_name="${1}" +fi + +tar cvf - ${directories} | lz4 | gpg -e -z 0 -r "${pgp_id}" > "${output_name}" diff --git a/.bin/books b/.bin/books new file mode 100755 index 0000000..1eccb57 --- /dev/null +++ b/.bin/books @@ -0,0 +1,10 @@ +#!/bin/sh + +set -xe + +command -v fzf zathura + +while true; do + file=$(find books docs -iname "*.pdf" -o -iname "*.epub" | fzf) + zathura "${file}" +done diff --git a/.bin/ccurse b/.bin/ccurse deleted file mode 100755 index 6377bb0..0000000 --- a/.bin/ccurse +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -default_calendar="personal" -data_dir="${HOME}/docs/calendar" - -for calendar; do true; done -args=$(echo ${@} | rev | cut -d " " -f 2- | rev) - -exec calcurse -C "${HOME}/.config/calcurse" \ - -D "${data_dir}/${last:-${default_calendar}}" \ - ${args} diff --git a/.bin/ccurse-ical b/.bin/ccurse-ical deleted file mode 100755 index d5c6e90..0000000 --- a/.bin/ccurse-ical +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -set -xe - -[ "${1}" ] -[ "${2}" ] - -ccurse diff --git a/.bin/cmus-to-m3u b/.bin/cmus-to-m3u new file mode 100755 index 0000000..0eaf4a3 --- /dev/null +++ b/.bin/cmus-to-m3u @@ -0,0 +1,14 @@ +#!/bin/sh + +set -xe + +root_dir="/home/qwd/music" + +test -f "${1}" +test ! -d "${2}" + +echo "#EXTM3U" > "${2}" + +while read -r line; do + echo "${line}" | sed "s@${root_dir}/@@g" >> "${2}" +done < "${1}" diff --git a/.bin/create-local-backup b/.bin/create-local-backup deleted file mode 100755 index 4e4cb1b..0000000 --- a/.bin/create-local-backup +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -set -xe - -source_directories="./git.rgoncalves.se/ - ./ - " - -out_dir=$(readlink -f "${1}") - -[ -d "${out_dir}" ] - -exit -rsync -hvrPt \ - --delete-after \ - --fuzzy \ - --prune-empty-dirs \ - --include "*.pdf" \ - --include "*.epub" \ - --include "*.png" \ - --include "*.jpg" \ - --include "*/" \ - --exclude "*" \ - "${src_dir}/" "${out_dir}/" diff --git a/.bin/dot-bootstrap b/.bin/dot-bootstrap index 766eaf1..0da52d0 100755 --- a/.bin/dot-bootstrap +++ b/.bin/dot-bootstrap @@ -2,17 +2,27 @@ set -x -e -directories="git \ - downloads \ - .cache/dot \ - .cache/neomutt \ - .local/bin \ - .local/share/dot \ - .mail" - +# dotfiles setup remote=$(yadm remote | head -n 1) yadm branch --set-upstream-to="${remote}/trunk" trunk -for directory in ${directories}; do mkdir -p "${HOME}/${directory}"; done +# directory structure +for directory in "${HOME}/.cache/dot \ + ${HOME}/.cache/neomutt \ + ${HOME}/.local/bin \ + ${HOME}/.local/share/dot \ + ${HOME}/.mail + ${HOME}/downloads \ + ${HOME}/git \ + ${HOME}/mnt \ + ${HOME}/tmp \ + ${ZK_NOTEBOOK_DIR}"; do + mkdir -p "${directory}" +done + +# default venvs +venv_root_dir="${HOME}/.local/venv" +mkdir -p "${venv_root_dir}" -notmuch new +python -m venv "${venv_root_dir}/weechat" +"${venv_root_dir}/weechat/bin/pip" install websocket-client diff --git a/.bin/dot-sync b/.bin/dot-sync index 7f4d490..f12f878 100755 --- a/.bin/dot-sync +++ b/.bin/dot-sync @@ -1,25 +1,38 @@ #!/bin/sh -set -x -e +set -xe export GIT_SSH_COMMAND="ssh -o ConnectTimeout=1 -o ConnectionAttempts=1" -yadm pull +yadm stash +yadm pull --rebase +yadm stash pop yadm add -u yadm add \ - $HOME/.bin \ - $HOME/.config/i3 \ - $HOME/.config/neomutt \ - $HOME/.config/newsboat \ - $HOME/.config/nvim \ - $HOME/.config/qutebrowser/{*.py,greasemonkey} \ - $HOME/.config/sway \ - $HOME/.config/yadm \ - $HOME/.config/waybar \ - $HOME/.public-keys + "${HOME}/.bin" \ + "${HOME}/.config/cmus/playlists" \ + "${HOME}/.config/i3" \ + "${HOME}/.config/mpv/mpv.conf" \ + "${HOME}/.config/mpv/scripts" \ + "${HOME}/.config/neomutt" \ + "${HOME}/.config/newsboat" \ + "${HOME}/.config/nvim" \ + "${HOME}/.config/qutebrowser/*.py" \ + "${HOME}/.config/qutebrowser/bookmarks" \ + "${HOME}/.config/qutebrowser/greasemonkey" \ + "${HOME}/.config/qutebrowser/quickmarks" \ + "${HOME}/.config/qutebrowser/userscripts/*.py" \ + "${HOME}/.config/sway" \ + "${HOME}/.config/task" \ + "${HOME}/.config/yadm" \ + "${HOME}/.config/waybar" \ + "${HOME}/.config/zk" \ + "${HOME}/.public-keys" yadm push +nvim --headless -c "PaqSync" -c "TSInstall all" -c "TSUpdate" -c "qa" + yadm commit -m "$(date +%Y-%m-%dT%H:%M:%S)" yadm push diff --git a/.bin/dwm-start b/.bin/dwm-start index e411db5..b42252a 100755 --- a/.bin/dwm-start +++ b/.bin/dwm-start @@ -1,13 +1,25 @@ #!/bin/sh -kill -9 xidle -xidle & +__xidle() { + kill -9 xidle + xidle & +} + +__xsuspender() { + pkill -9 xsuspender + nohup xsuspender >/dev/null & disown +} + +command -v xidle && __xidle while true; do # status pkill -9 -f "ag-status" ag-status -l >/dev/null & + # xsuspender + command -v xsuspender && __xsuspender + # x11 configuration x11-config . ~/.bin/x11-screen diff --git a/.bin/get-mailbox-imap b/.bin/get-mailbox-imap deleted file mode 100755 index b78752d..0000000 --- a/.bin/get-mailbox-imap +++ /dev/null @@ -1,69 +0,0 @@ -#!/usr/bin/env python3 - -import imaplib -import sys - - -def get_boxes(list): - """ Retrieve and decode all mailboxes. """ - return [box.decode('utf-8').rsplit(' ')[-1] for box in list] - - -def flatten_output(list): - """ Print all boxes with a flattened output. """ - return ''.join([f"+'{box}' " for box in list]) - - -def sort_mailboxes(mailboxes): - """ Sort boxes list according to a predefined order. """ - - order = [ - "INBOX", - "Unread", - "Drafts", - "Sent", - "Spam", - "Trash", - "Junk", - "Archive" - ] - - mailboxes = sorted(mailboxes) - - # sort based on predefined order - output = [] - for exp in order: - matching = [s for s in mailboxes if exp in s] - output.extend(matching) - - # ensure all retrieved boxes are present - for box in mailboxes: - if box not in output: - output.append(box) - - return output - - -def main(): - """ - Retrieve, sort, and pretty print for neomutt - """ - - # user information - remote = sys.argv[1] - username = sys.argv[2] - password = sys.argv[3] - - # connection - mail = imaplib.IMAP4_SSL(remote) - mail.login(username, password) - - # parse folders output - bxs = sort_mailboxes(get_boxes(mail.list()[1])) - - # oneline pretty-print for neomutt - print(flatten_output(bxs), end=' ') - - -if __name__ == "__main__": - main() diff --git a/.bin/get-mailbox-local b/.bin/get-mailbox-local deleted file mode 100755 index b579016..0000000 --- a/.bin/get-mailbox-local +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -root_dir=$(readlink -f ${1}) - -mailboxes=$(find "${1}" -name "cur" | - xargs dirname | - sed "s@$root_dir/@+@g" | - grep "${2:-.*}" | - sort) - -echo ${mailboxes} @@ -1,70 +1,104 @@ -#!/bin/sh - - -MUSIC_DIR="${HOME}/music" -MUSIC_LIST= -MUSIC_FILE= -MUSIC_YT_OPTIONS= - -log() { - echo "[${0} ] ${@}" -} - -main() { - # arguments - while getopts "c:" arg; do - case "${arg}" in - c) - MUSIC_FILE="${OPTARG}" - ;; - h) - exit 0 - ;; - esac - done - - # ensure parameters are correct - [ ! -f "${MUSIC_FILE}" ] && exit 1 - - - while read -r line; do - - # skip comments - line=$(echo ${line} | grep -v -e "^$" -e "^#") - [ -z "${line}" ] && continue - - # retrieve playlist params - url=$(echo "${line}" | cut -d " " -f 1) - dir=$(echo "${line}" | cut -d " " -f 2) - - dir="${MUSIC_DIR}/${dir}" - - [ -d "${dir}" ] && - log "${dir}: directory already exists" && - continue - - mkdir "${dir}" - log "${dir} ${url}: download" - - yt-dlp --rm-cache-dir >/dev/null - yt-dlp \ - --extract-audio \ - --audio-format mp3 \ - --prefer-ffmpeg \ - --audio-quality 0 \ - --embed-thumbnail \ - --metadata-from-title "%(artist)s - %(title)s" \ - --no-warnings \ - --ignore-errors \ - --no-overwrites \ - --continue \ - --add-metadata \ - --user-agent "Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)" \ - --output "${dir}/'%(title)s.%(ext)s'" \ - "${url}" - - - done < "${MUSIC_FILE}" -} - -main ${@} +#!/usr/bin/python3 + +import os +import sys +import yt_dlp +from dataclasses import dataclass + + +def _match_filter(info: dict, *, incomplete) -> str | None: + _duration = info.get("duration") + _duration_min = 60 + + if _duration and int(_duration) < _duration_min: + return "Duration too short: < _duration_min" + + return None + + +@dataclass(frozen=True) +class Collection: + """A music collection.""" + + title: str + links: frozenset[str] + + def __eq__(self, other) -> bool: + if isinstance(other, Collection): + return self.title == other.title + raise NotImplementedError + + +def parse_raw_to_collections(raw_data: list[str]) -> frozenset[Collection]: + collections: set[Collection] = set() + _collection_data: list[str] = [] + + for index, line in enumerate(raw_data): + if line.startswith("#"): + continue + elif line == "" or index + 1 == len(raw_data): + if len(_collection_data) == 0: + continue + + collections.add( + Collection(_collection_data[0], frozenset(_collection_data[1:])) + ) + _collection_data.clear() + else: + _collection_data.append(line) + + return frozenset(collections) + + +def get_ytdlp_options(output_dir: str) -> dict: + return { + "format": "bestaudio/best", + "match_filter": _match_filter, + "postprocessors": [ + { + "key": "FFmpegExtractAudio", + #"preferredcodec": "m4a", + }, + { + "key": "FFmpegMetadata", + "add_metadata": True, + }, + { + "key": "EmbedThumbnail", + "already_have_thumbnail": False, + }, + ], + "outtmpl": f"{output_dir}/%(title)s.%(ext)s", + "restrictfilenames": True, + "ignoreerrors": True, + } + + +def download_collection(collection: Collection, parent_dir: str) -> None: + output_dir = os.path.join(parent_dir, collection.title) + + if os.path.isdir(output_dir): + return + + os.makedirs(output_dir, exist_ok=True) + + with yt_dlp.YoutubeDL(get_ytdlp_options(output_dir)) as downloader: + downloader.download(collection.links) + + +def main() -> int: + # input handling + if len(sys.argv) != 2: + return 1 + + with open(sys.argv[1], "r") as file: + filedata = file.read().splitlines() + + for collection in parse_raw_to_collections(filedata): + download_collection(collection, os.getcwd()) + + return 0 + + +if __name__ == "__main__": + exit(main()) @@ -1,6 +1,6 @@ #!/bin/sh -NMUTT_CONFIGURATION_FILE="${HOME}/.config/neomutt/personal" +NMUTT_CONFIGURATION_FILE="${HOME}/.config/neomutt/credentials-personal" get_param() { grep "${2}" "${1}" | @@ -15,5 +15,7 @@ export MAIL_SERVER=$(get_param "${NMUTT_CONFIGURATION_FILE}" "my_server") export MAIL_USERNAME=$(get_param "${NMUTT_CONFIGURATION_FILE}" "my_user") export MAIL_PASSWORD=$(get-pass "mailbox") -#notmuch new -exec neomutt ${@} +notmuch new >/dev/null 2>&1 & +neomutt ${@} + +notmuch new >/dev/null 2>&1 & diff --git a/.bin/pipx-sync b/.bin/pipx-sync deleted file mode 100755 index 181768e..0000000 --- a/.bin/pipx-sync +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -set -x -e - -packages="pywal - ipython" - -pipx upgrade-all - -for package in ${packages}; do - pipx install "${package}" || true -done diff --git a/.bin/poetry-clean-init b/.bin/poetry-clean-init new file mode 100755 index 0000000..ad7da81 --- /dev/null +++ b/.bin/poetry-clean-init @@ -0,0 +1,12 @@ +#!/bin/sh + +set -xe + + +poetry env info -p +test -x "${1}" + +rm -r $(poetry env info -p) poetry.lock +poetry env use "${1}" +poetry update --dry-run +poetry install @@ -109,11 +109,11 @@ def main(): QB_PROFILE_TAG = QB_PROFILE[0].lower() # Ensure directory existence - for dir in [QB_PROFILES_DIR, QB_PROFILE_DIR, QB_PROFILE_DIR_CONFIG]: + for dir in (QB_PROFILES_DIR, QB_PROFILE_DIR, QB_PROFILE_DIR_CONFIG): bypass_file_exists(os.mkdir, dir) # Ensure common files are shared with other profiles - for file in ['config.py', 'bookmarks', 'greasemonkey']: + for file in ('config.py', 'bookmarks', 'greasemonkey', 'userscripts'): bypass_file_exists(os.symlink, f'{QB_DIR}/{file}', f'{QB_PROFILE_DIR_CONFIG}/{file}') diff --git a/.bin/se-plan b/.bin/se-plan new file mode 100755 index 0000000..f16a2f7 --- /dev/null +++ b/.bin/se-plan @@ -0,0 +1,6 @@ +#!/bin/sh + +T=$(mktemp) +curl -so $T https://plan.cat/~rgoncalves +$EDITOR $T +curl -su "rgoncalves:$(get-pass plan.cat)" -F "plan=<$T" https://plan.cat/stdin diff --git a/.bin/start-org b/.bin/start-org deleted file mode 100755 index c32b99e..0000000 --- a/.bin/start-org +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -set -xe - -session_name="org" -windows="wchat:weechat - nmutt:neomutt - calcurse:calcurse" - -if [ "${1}" = "-f" ]; then - tmux kill-session -t "${session_name}" -fi - -tmux new-session -s "${session_name}" -d - -for window in ${windows}; do - window_cmd=$(echo "${window}" | cut -d ":" -f 1) - window_name=$(echo "${window}" | cut -d ":" -f 2) - - tmux new-window -n "${window_name}" - tmux send-keys -t "${session_name}:${window_name}" \ - "${window_cmd} " -done - -tmux a -t "${session_name}" diff --git a/.bin/switch-gpg-key b/.bin/switch-gpg-key new file mode 100755 index 0000000..896d155 --- /dev/null +++ b/.bin/switch-gpg-key @@ -0,0 +1,3 @@ +#!/bin/sh + +gpg-connect-agent "scd serialno" "learn --force" /bye diff --git a/.bin/synchronize-pub-dots b/.bin/synchronize-pub-dots index 5a6e795..8c7a9c4 100755 --- a/.bin/synchronize-pub-dots +++ b/.bin/synchronize-pub-dots @@ -3,6 +3,7 @@ set -e command -v yadm git +git rev-parse --is-inside-work-tree allowed_patterns="-e ^.bin -e ^.config/alacritty/ @@ -12,25 +13,28 @@ allowed_patterns="-e ^.bin -e ^.config/dot/term-color-* -e ^.config/gopass/config.yml -e ^.config/i3*/config - -e ^.config/tmux/ -e ^.config/mimeapps.list -e ^.config/neomutt/neomuttrc -e ^.config/newsboat/config -e ^.config/nvim/ + -e ^.config/pipewire/ -e ^.config/qutebrowser/config.py -e ^.config/qutebrowser/greasemonkey/ - -e ^.config/pipewire/ -e ^.config/sway/config -e ^.config/systemd/*.service + -e ^.config/tmux/ -e ^.config/user-dirs.dir -e ^.config/user-dirs.locale + -e ^.config/virt-lightning/ + -e ^.config/xsuspender.conf -e ^.gnupg/gpg-agent.conf - -e ^.public-keys/ -e ^.kshrc + -e ^.mbsyncrc + -e ^.npmrc + -e ^.public-keys/ -e ^.weechat/buflist.conf -e ^.weechat/fset.conf -e ^.weechat/logger.conf - -e ^.weechat/weechat.conf -e ^.xinitrc -e ^.zshrc " diff --git a/.bin/x11-config b/.bin/x11-config index 5230c13..554f00c 100755 --- a/.bin/x11-config +++ b/.bin/x11-config @@ -11,7 +11,8 @@ synclient_options="TapButton1=1 \ # synaptic if command -v syndaemon; then - pkill syndaemon && syndaemon -RKd -i 0.2 + pkill syndaemon && true + syndaemon -RKd -i 0.1 synclient ${synclient_options} fi @@ -24,7 +25,7 @@ xset s off xset s noblank xset -dpms -if [ $(uname -s) = "OpenBSD" ]; then +if [ "$(uname -s)" = "OpenBSD" ]; then xinput set-prop "/dev/wsmouse" "WS Pointer Wheel Emulation" 1 xinput set-prop "/dev/wsmouse" "WS Pointer Wheel Emulation Button" 2 xinput set-prop "/dev/wsmouse" "WS Pointer Wheel Emulation Axes" 6 7 4 5 @@ -34,6 +35,15 @@ fi xsetroot -mod 2 2 -fg white -bg black xsetroot -grey -if [ -f "${wallpaper_file}" ]; then - feh --bg-scale "${wallpaper_file}" +monitors="$(xrandr --listactivemonitors | tail -n +2)" +feh_args="" +for i in seq $(echo monitors | wc -l); do + wallpaper=$(find .local/share/dot -iname "wallpaper*" | shuf -n 1) + if [ "${wallaper}" ]; then + feh_args="${feh_args} --bg-fill ${wallpaper} " + fi +done + +if [ "${feh_args}" ]; then + feh ${feh_args} fi diff --git a/.bin/x11-screen b/.bin/x11-screen index ccccda7..38ee006 100755 --- a/.bin/x11-screen +++ b/.bin/x11-screen @@ -22,6 +22,18 @@ fi if [ "${hostname}" = "ws-xps01" ]; then xrandr --output eDP1 --mode 3200x1800 - echo a __hidpi fi + +if [ "${hostname}" = "work-01" ]; then + xrandr --output eDP1 --mode 1920x1080 + xrandr --output DP3 --off + xrandr --addmode DP3 1920x1080 + xrandr --output DP3 --mode 1920x1080 --same-as eDP1 + + case "${1}" in + vertical*) + xrandr --output DP3 --scale 1x1 --rotate left --right-of eDP1 + ;; + esac +fi diff --git a/.bin/yubikey-reset b/.bin/yubikey-reset deleted file mode 100755 index 4824bc8..0000000 --- a/.bin/yubikey-reset +++ /dev/null @@ -1,20 +0,0 @@ -echo "DESTRUCTIVE !!!" - -sleep 60 - -gpg-connect-agent <<EOF -/hex -scd serialno -scd apdu 00 20 00 81 08 40 40 40 40 40 40 40 40 -scd apdu 00 20 00 81 08 40 40 40 40 40 40 40 40 -scd apdu 00 20 00 81 08 40 40 40 40 40 40 40 40 -scd apdu 00 20 00 81 08 40 40 40 40 40 40 40 40 -scd apdu 00 20 00 83 08 40 40 40 40 40 40 40 40 -scd apdu 00 20 00 83 08 40 40 40 40 40 40 40 40 -scd apdu 00 20 00 83 08 40 40 40 40 40 40 40 40 -scd apdu 00 20 00 83 08 40 40 40 40 40 40 40 40 -scd apdu 00 e6 00 00 -scd apdu 00 44 00 00 -/echo Yubikey has been successfully reset. -/echo The factory default PINs are 123456 (user) and 12345678 (admin). -EOF diff --git a/.config/calcurse/keys b/.config/calcurse/keys index 0f5ee8d..3304bbb 100755 --- a/.config/calcurse/keys +++ b/.config/calcurse/keys @@ -16,6 +16,7 @@ generic-reload R generic-copy c generic-paste p ^V generic-change-view TAB +generic-prev-view KEY_BTAB generic-import i I generic-export x X generic-goto g G diff --git a/.config/cmus/rc b/.config/cmus/rc index 5654b7a..360710f 100755 --- a/.config/cmus/rc +++ b/.config/cmus/rc @@ -43,7 +43,7 @@ set lib_add_filter= set lib_sort=albumartist date album discnumber tracknumber title filename play_count set mouse=true -set mpris=true +set mpris=false set pl_sort= set play_library=true diff --git a/.config/dot/term-color-dark b/.config/dot/term-color-dark index 3f1a1d2..45b631b 100755 --- a/.config/dot/term-color-dark +++ b/.config/dot/term-color-dark @@ -1 +1 @@ -]4;0;#000000\]4;1;#af0000\]4;2;#00af00\]4;3;#afd700\]4;4;#005fff\]4;5;#af00af\]4;6;#00d7af\]4;7;#c0c0c0\]4;8;#808080\]4;9;#ff0000\]4;10;#00ff00\]4;11;#ffff00\]4;12;#0000ff\]4;13;#ff00ff\]4;14;#00ffff\]4;15;#ffffff\]10;#ffffff\]11;#000000\]12;#ffffff\]13;#ffffff\]17;#ffffff\]19;#000000\]4;232;#000000\]4;256;#ffffff\]708;#000000\
\ No newline at end of file +]4;0;#000000\]4;1;#af0000\]4;2;#00af00\]4;3;#afd700\]4;4;#005fff\]4;5;#af00af\]4;6;#00d7af\]4;7;#c0c0c0\]4;8;#808080\]4;9;#ff0000\]4;10;#00ff00\]4;11;#ffff00\]4;12;#0000ff\]4;13;#ff00ff\]4;14;#00ffff\]4;15;#ffffff\]10;#ffffff\]11;#000000\]12;#ffffff\]13;#ffffff\]17;#ffffff\]19;#000000\]4;232;#000000\]4;256;#ffffff\]708;#000000\ diff --git a/.config/dot/term-color-light b/.config/dot/term-color-light index 96ad2e1..b6f8678 100755 --- a/.config/dot/term-color-light +++ b/.config/dot/term-color-light @@ -1 +1 @@ -]4;0;#eeeeee\]4;1;#ff0000\]4;2;#00dd00\]4;3;#dddd00\]4;4;#0000ff\]4;5;#dd00dd\]4;6;#00dddd\]4;7;#808080\]4;8;#c0c0c0\]4;9;#af0000\]4;10;#00af00\]4;11;#afd700\]4;12;#005fff\]4;13;#af00af\]4;14;#00d7af\]4;15;#000000\]10;#000000\]11;#eeeeee\]12;#eeeeee\]13;#000000\]17;#000000\]19;#eeeeee\]4;232;#eeeeee\]4;256;#000000\]708;#eeeeee\ +]4;0;#eeeeee\]4;1;#ff0000\]4;2;#00dd00\]4;3;#dddd00\]4;4;#0000ff\]4;5;#dd00dd\]4;6;#00dddd\]4;7;#808080\]4;8;#c0c0c0\]4;9;#af0000\]4;10;#00af00\]4;11;#ccaa00\]4;12;#005fff\]4;13;#af00af\]4;14;#00d7bc\]4;15;#000000\]10;#000000\]11;#eeeeee\]12;#eeeeee\]13;#000000\]17;#000000\]19;#eeeeee\]4;232;#eeeeee\]4;256;#000000\]708;#eeeeee\ diff --git a/.config/gopass/config.yml b/.config/gopass/config.yml index dea9ee4..7046a1b 100755 --- a/.config/gopass/config.yml +++ b/.config/gopass/config.yml @@ -5,6 +5,6 @@ exportkeys: true nopager: false notifications: false parsing: true -path: /home/qwd/.password-store +path: /home/qwd/.local/share/gopass safecontent: false mounts: {} diff --git a/.config/i3/config b/.config/i3/config index dbdb03f..362d057 100755 --- a/.config/i3/config +++ b/.config/i3/config @@ -18,7 +18,7 @@ set $ws5 "5: five " set $wss1 "11: one " set $wss2 "12: two " set $wss3 "13: three " -set $wss4 "14: four " +set $wss4 "14: four " set $wss5 "15: five " # keybinds diff --git a/.config/neomutt/neomuttrc b/.config/neomutt/neomuttrc index d1a8634..386b7fd 100755 --- a/.config/neomutt/neomuttrc +++ b/.config/neomutt/neomuttrc @@ -1,38 +1,13 @@ -#set folder = "~/.mail" -set my_password = "" -set my_server = "" -set my_user = "" -source "~/.config/neomutt/personal" +source "~/.config/neomutt/mail-personal" -# IMAP -set imap_user = "$my_user@$my_server" -set imap_pass = "$my_password" -set hostname = "imap.$my_server" -set folder = "imaps://imap.$my_server:993" -#set folder = "~/.mail/personal" - -# SMTP -set smtp_pass = "$my_password" -set smtp_url = "smtps://$my_user@$my_server:$my_password@smtp.$my_server" - -# force tls +#force tls set ssl_verify_host = yes set ssl_force_tls = yes # notmuch -#set virtual_spoolfile = yes -#set nm_query_type = threads -#set nm_default_url = "notmuch:///home/qwd/.mail" - -# mailboxes -mailboxes `python3 ~/.bin/get-mailbox-imap \ -imap.$MAIL_SERVER \ -$MAIL_USERNAME@$MAIL_SERVER \ -$MAIL_PASSWORD` - -#mailboxes `get-mailbox-local ~/.mail INBOX` -#mailboxes `get-mailbox-local ~/.mail` -#virtual-mailboxes "Threads" "notmuch://?query=tag:f-sent" +set virtual_spoolfile = yes +set nm_query_type = threads +set nm_default_url = "notmuch:///home/qwd/.mail" set spoolfile = "+INBOX" set mbox = "+INBOX" @@ -45,7 +20,7 @@ set imap_delim_chars = "aa" # dl set mail_check = 90 set sleep_time = 0 -set timeout = 15 +set timeout = 300 set beep = no set edit_headers = yes set fast_reply = yes @@ -62,8 +37,8 @@ set sig_dashes = no set sort_re = yes set charset = "utf-8" -set date_format = "%d.%m.%Y-%H:%M" -set index_format = "%4C %Z %{$date_format} %-15.15L (%?l?%4l&%4c?) %s" +set date_format = "%d %b %Y, %H:%M" +set index_format = "%4C %Z %{$date_format} %-25.25L (%?l?%4l&%4c?) %s" set quote_regex = "^( {0,4}[>|:#%]| {0,4}[a-z0-9]+[>|]+)+" set reply_regex = "^(([Rr][Ee]?(\[[0-9]+\])?: *)?(\[[^]]+\] *)?)*" set send_charset = "utf-8:iso-8859-1:us-ascii" @@ -72,10 +47,15 @@ set header_cache = "~/.cache/neomutt" set message_cachedir = "$header_cache" set mail_check_stats +# forgotten attachment +set abort_noattach_regex = "\\<(attach|attached|attachments?|attaché|attachés|attache|attachons|joint|jointe|joints|jointes|joins|joignons)\\>" +set abort_noattach = ask-yes + # headers ignore * unignore from date subject to cc -unignore organization organisation x-mailer: x-newsreader: x-mailing-list: +unignore organization organisation +unignore x-mailer: x-newsreader: x-mailing-list: unignore posted-to: list-id: # threads @@ -97,13 +77,15 @@ set sidebar_indent_string = "> " # keybinds bind editor <space> noop bind editor "> " quote-char -bind pager c imap-fetch-mail +bind editor ^T complete-query +bind editor <Tab> complete bind index G last-entry bind index \CR imap-fetch-mail bind index g noop bind index gg first-entry bind index - collapse-thread bind index _ collapse-all +bind pager c imap-fetch-mail bind pager,attach h exit bind attach <return> view-mailcap bind attach l view-mailcap @@ -120,11 +102,20 @@ bind index \CL limit bind pager,browser gg top-page bind pager,browser G bottom-page bind index,pager R group-reply +bind index,pager g group-chat-reply bind index,pager K sidebar-prev bind index,pager J sidebar-next bind index,pager O sidebar-open bind index,pager,browser d half-down bind index,pager,browser u half-up +bind index,pager @ compose-to-sender + +# macro +macro index S "<shell-escape>notmuch new<enter>" "sync email" # colors color hdrdefault color07 default + +# hooks +account-hook . 'echo `notmuch new >/dev/null 2>&1`' +timeout-hook 'echo "`notmuch new >/dev/null 2>&1`"' diff --git a/.config/neomutt/neomuttrc.back b/.config/neomutt/neomuttrc.back deleted file mode 100755 index 1f85eb8..0000000 --- a/.config/neomutt/neomuttrc.back +++ /dev/null @@ -1,132 +0,0 @@ - -# rgoncalves.se - -# personal informations -set my_password = "" -set my_server = "" -set my_user = "" -source "~/.config/neomutt/personal" - -# IMAP -set imap_user = "$my_user@$my_server" -set imap_pass = "$my_password" -set hostname = "imap.$my_server" -set folder = "imaps://imap.$my_server:993" -#set folder = "~/.mail/personal" - -# SMTP -set smtp_pass = "$my_password" -set smtp_url = "smtps://$my_user@$my_server:$my_password@smtp.$my_server" - -# force tls -set ssl_verify_host = yes -set ssl_force_tls = yes - -# mailboxes -set spoolfile = "+INBOX" -set mbox = "+INBOX" -set postponed = "+Drafts" -set record = "+Sent" -set trash = "+Trash" -set mail_check_stats = yes -set imap_delim_chars = "aa" - -mailboxes `python3 ~/.bin/get-mailbox-imap \ -imap.$MAIL_SERVER \ -$MAIL_USERNAME@$MAIL_SERVER \ -$MAIL_PASSWORD` - -# dl -set mail_check = 90 -set sleep_time = 0 -set timeout = 15 -set beep = no -set edit_headers = yes -set fast_reply = yes -set forward_quote = yes -set include = yes -set pipe_decode = yes -set postpone = no -set recall = no -set reflow_space_quotes = yes -set reply_to = yes -set reverse_name = yes -set reverse_name = yes -set sig_dashes = no -set sort_re = yes - -set charset = "utf-8" -set date_format = "%d.%m.%Y-%H:%M" -set index_format = "%4C %Z %{$date_format} %-15.15L (%?l?%4l&%4c?) %s" -set quote_regex = "^( {0,4}[>|:#%]| {0,4}[a-z0-9]+[>|]+)+" -set reply_regex = "^(([Rr][Ee]?(\[[0-9]+\])?: *)?(\[[^]]+\] *)?)*" -set send_charset = "utf-8:iso-8859-1:us-ascii" - -set signature = "~/.signature" -set header_cache = "~/.cache/neomutt" -set message_cachedir = "$header_cache" - -# auto_view text/html -# alternative_order text/plain text/html - -# headers -ignore * -unignore from date subject to cc -unignore organization organisation x-mailer: x-newsreader: x-mailing-list: -unignore posted-to: list-id: - -# threads -set sort ="threads" -set sort_aux = "reverse-last-date-received" -set strict_threads ="yes" -set collapse_unread = no - -# sidebar -set sidebar_visible = yes -set sidebar_short_path = yes -set sidebar_sort_method = "unsorted" -set sidebar_delim_chars = "/" -set sidebar_format = "%D %?F?[%F]?%* %4N|%4S" -set sidebar_folder_indent = yes -set sidebar_indent_string = "> " - -# keybinds -bind editor <space> noop -bind editor "> " quote-char -bind pager c imap-fetch-mail -bind index G last-entry -bind index \CR imap-fetch-mail -bind index g noop -bind index gg first-entry -bind index - collapse-thread -bind index _ collapse-all -bind pager,attach h exit -bind attach <return> view-mailcap -bind attach l view-mailcap -bind pager j next-line -bind pager k previous-line -bind pager l view-attachments -bind index D delete-message -bind index U undelete-message -bind index h noop -bind index l display-message -bind browser h goto-parent -bind browser l select-entry -bind index \CL limit -bind pager,browser gg top-page -bind pager,browser G bottom-page -bind index,pager R group-reply -bind index,pager K sidebar-prev -bind index,pager J sidebar-next -bind index,pager O sidebar-open -bind index,pager,browser d half-down -bind index,pager,browser u half-up - -# colors -color hdrdefault color07 default -#color quoted color08 default - -# notmuch -#set virtual_spoolfile = yes -#set nm_query_type = threads -#virtual-mailboxes "INBOX" "notmuch://?query=tag:inbox" diff --git a/.config/newsboat/config b/.config/newsboat/config index c9d9fcd..52d7d61 100755 --- a/.config/newsboat/config +++ b/.config/newsboat/config @@ -28,8 +28,17 @@ color info color0 color15 color article color15 color0 # multimedia +player "mpv" browser "qutebrowser %u" -macro y set browser "mpv %u" ; open-in-browser ; set browser "qutebrowser %u" +macro m set browser "mpv %u" ; open-in-browser-and-mark-read ; set browser "qutebrowser %u" +macro f set browser "echo %u" ; open-in-browser-and-mark-read ; set browser "qutebrowser %u" + # format feedlist-format "%4i %n %8u %24T | %t" +articlelist-format "%4i %f %D %6L %?T?|%-32T| ?%t" +datetime-format "%b %d" + +# killfile +ignore-mode "display" +ignore-article "*" "( feedlink =~ \"yewtu.be\" and ( title =~ \"#shorts\" or content =~ \"#shorts\" ) )" diff --git a/.config/nvim/.netrwhist b/.config/nvim/.netrwhist deleted file mode 100755 index 038dc78..0000000 --- a/.config/nvim/.netrwhist +++ /dev/null @@ -1,12 +0,0 @@ -let g:netrw_dirhistmax =10 -let g:netrw_dirhistcnt =5 -let g:netrw_dirhist_5='/home/qwd/.config/nvim/after' -let g:netrw_dirhist_4='/home/qwd/.config/nvim/colors' -let g:netrw_dirhist_3='/home/qwd/.config/nvim' -let g:netrw_dirhist_2='/home/qwd/gitlab.viperdev.io/mcanism/backend' -let g:netrw_dirhist_1='/home/qwd/gitlab.viperdev.io/mcanism/backend/mcanism_finance/management/commands' -let g:netrw_dirhist_0='/home/qwd/gitlab.viperdev.io/mcanism/backend/mcanism_finance/management' -let g:netrw_dirhist_9='/home/qwd/gitlab.viperdev.io/mcanism/backend/mcanism_finance' -let g:netrw_dirhist_8='/home/qwd/gitlab.viperdev.io/mcanism/backend' -let g:netrw_dirhist_7='/home/qwd/gitlab.viperdev.io/mcanism/backend/mcanism_finance' -let g:netrw_dirhist_6='/home/qwd/.config/nvim/after/indent' diff --git a/.config/nvim/.nvim/autoload/plug.vim b/.config/nvim/.nvim/autoload/plug.vim deleted file mode 100755 index bfafbfb..0000000 --- a/.config/nvim/.nvim/autoload/plug.vim +++ /dev/null @@ -1,2526 +0,0 @@ -" 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') -let s:me = resolve(expand('<sfile>:p')) -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', {}) - -function! plug#begin(...) - if a:0 > 0 - let s:plug_home_org = a:1 - let home = s:path(fnamemodify(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 fnamemodify(home, ':t') ==# 'plugin' && 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 - 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('Call 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 - -if s:is_win - function! s:rtp(spec) - return s:path(a:spec.dir . get(a:spec, 'rtp', '')) - endfunction - - 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 -else - function! s:rtp(spec) - return s:dirpath(a:spec.dir . get(a:spec, 'rtp', '')) - endfunction - - 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', 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(v:exception) - endtry -endfunction - -function! s:parse_options(arg) - let opts = copy(s:base_spec) - let type = type(a:arg) - if type == s:TYPE.string - let opts.tag = a:arg - elseif type == s:TYPE.dict - call extend(opts, a:arg) - if has_key(opts, 'dir') - let opts.dir = s:dirpath(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(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(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=cmd.exe shellcmdflag=/c shellredir=>%s\ 2>&1 - elseif a:swap - set shell=sh shellredir=>%s\ 2>&1 - endif - return prev -endfunction - -function! s:bang(cmd, ...) - 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 = tempname().'.bat' - call writefile(["@echo off\r", cmd . "\r"], batchfile) - let cmd = s:shellesc(batchfile) - 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 - 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 - 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 '.s:esc(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 = get(g:, 'plug_shallow', 1) ? - \ '--depth 1' . (s:git_version_requirement(1, 7, 10) ? ' --no-single-branch' : '') : '' - - if has('win32unix') - let 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 '.s:shellesc(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 '.s:esc(tag).' -- 2>&1', spec.dir) - else - let branch = s:esc(get(spec, 'branch', 'master')) - call s:log4(name, 'Merging origin/'.branch) - let out = s:system('git checkout -q '.branch.' -- 2>&1' - \. (has_key(s:update.new, name) ? '' : ('&& git merge --ff-only 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:system('rm -rf ' . s:shellesc(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' ? - \ 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': [''], - \ 'batchfile': (s:is_win && (s:nvim || s:vim8)) ? tempname().'.bat' : '', - \ 'new': get(a:opts, 'new', 0) } - let s:jobs[a:name] = job - let cmd = has_key(a:opts, 'dir') ? s:with_cd(a:cmd, a:opts.dir) : a:cmd - if !empty(job.batchfile) - call writefile(["@echo off\r", cmd . "\r"], job.batchfile) - let cmd = s:shellesc(job.batchfile) - endif - let argv = add(s:is_win ? ['cmd', '/c'] : ['sh', '-c'], cmd) - - if s:nvim - call extend(job, { - \ 'on_stdout': function('s:nvim_cb'), - \ 'on_exit': function('s:nvim_cb'), - \ }) - let jid = 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 jid = job_start(s:is_win ? join(argv, ' ') : argv, { - \ 'out_cb': function('s:job_cb', ['s:job_out_cb', job]), - \ 'exit_cb': function('s:job_cb', ['s:job_exit_cb', job]), - \ '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', [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() - - if has_key(job, 'batchfile') && !empty(job.batchfile) - call delete(job.batchfile) - endif - 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) - for i in range(4, line('$')) - if getline(i) =~# '^[-+x*] '.a:name.':' - for j in range(i + 1, line('$')) - 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 fetch_opt = (has_tag && !empty(globpath(spec.dir, '.git/shallow'))) ? '--depth 99999999' : '' - call s:spawn(name, printf('git fetch %s %s 2>&1', fetch_opt, prog), { '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 - call s:spawn(name, - \ printf('git clone %s %s %s %s 2>&1', - \ has_tag ? '' : s:clone_opt, - \ prog, - \ s:shellesc(spec.uri), - \ s:shellesc(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 = 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') - 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) - let escaped = substitute(a:arg, '[&|<>()@^]', '^&', 'g') - let escaped = substitute(escaped, '%', '%%', 'g') - let escaped = substitute(escaped, '"', '\\^&', 'g') - let escaped = substitute(escaped, '\(\\\+\)\(\\^\)', '\1\1\2', 'g') - return '^"'.substitute(escaped, '\(\\\+\)$', '\1\1', '').'^"' -endfunction - -function! s:shellesc(arg) - if &shell =~# 'cmd.exe$' - return s:shellesc_cmd(a:arg) - endif - return shellescape(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) - return printf('cd%s %s && %s', s:is_win ? ' /d' : '', s:shellesc(a:dir), a:cmd) -endfunction - -function! s:system(cmd, ...) - try - let [sh, shellcmdflag, shrd] = s:chsh(1) - let cmd = a:0 > 0 ? s:with_cd(a:cmd, a:1) : a:cmd - if s:is_win - let batchfile = tempname().'.bat' - call writefile(["@echo off\r", cmd . "\r"], batchfile) - let cmd = s:shellesc(batchfile) - endif - return system(cmd) - finally - let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd] - if s:is_win - 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(printf( - \ 'git rev-list --count --left-right 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) - call s:system((s:is_win ? 'rmdir /S /Q ' : 'rm -rf ') . s:shellesc(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(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 - 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 - call s:rm_rf(line[2:]) - setlocal modifiable - call setline(l1, '~'.line[1:]) - let s:clean_count += 1 - call setline(4, printf('Removed %d directories.', s:clean_count)) - setlocal nomodifiable - endif - endif - let l1 += 1 - endwhile -endfunction - -function! s:upgrade() - echo 'Downloading the latest version of vim-plug' - redraw - let tmp = tempname() - let new = tmp . '/plug.vim' - - try - let out = s:system(printf('git clone --depth 1 %s %s', s:shellesc(s:plug_src), s:shellesc(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 - try - let [sh, shellcmdflag, shrd] = s:chsh(1) - let cmd = 'cd '.s:shellesc(g:plugs[name].dir).' && git show --no-color --pretty=medium '.sha - if s:is_win - let batchfile = tempname().'.bat' - call writefile(["@echo off\r", cmd . "\r"], batchfile) - let cmd = batchfile - endif - execute 'silent %!' cmd - finally - let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd] - if s:is_win - 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 '.join(map(['--pretty=format:%x01%h%x01%d%x01%s%x01%cr', range], 's:shellesc(v:val)')) - if has_key(v, 'rtp') - let cmd .= ' -- '.s:shellesc(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 '.s:esc(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 = 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/.config/nvim/after/ftplugin/dart.lua b/.config/nvim/after/ftplugin/dart.lua new file mode 100755 index 0000000..777faa6 --- /dev/null +++ b/.config/nvim/after/ftplugin/dart.lua @@ -0,0 +1,4 @@ +o.colorcolumn = '80' +bo.expandtab = true +bo.shiftwidth = 2 +bo.tabstop = 2 diff --git a/.config/nvim/after/ftplugin/elixir.lua b/.config/nvim/after/ftplugin/elixir.lua new file mode 100755 index 0000000..db9c53f --- /dev/null +++ b/.config/nvim/after/ftplugin/elixir.lua @@ -0,0 +1,4 @@ +bo.tabstop = 2 +bo.shiftwidth = 2 +bo.expandtab = true +o.colorcolumn = '98' diff --git a/.config/nvim/after/ftplugin/markdown.lua b/.config/nvim/after/ftplugin/markdown.lua index bfcca96..3c7e009 100755 --- a/.config/nvim/after/ftplugin/markdown.lua +++ b/.config/nvim/after/ftplugin/markdown.lua @@ -6,3 +6,33 @@ bo.shiftwidth = 2 bo.formatoptions = 'qc' bo.textwidth = 80 o.colorcolumn = '80' + +if require("zk.util").notebook_root(vim.fn.expand('%:p')) ~= nil then + local function map(...) vim.api.nvim_buf_set_keymap(0, ...) end + local opts = { noremap=true, silent=false } + + map("n", "<CR>", "<Cmd>lua vim.lsp.buf.definition()<CR>", opts) + map("n", "K", "<Cmd>lua vim.lsp.buf.hover()<CR>", opts) + + vim.api.nvim_exec([[ + syn region markdownWikiLink matchgroup=markdownLinkDelimiter + \ start="\[\[" end="\]\]" contains=markdownUrl keepend oneline concealends + syn region markdownLink matchgroup=markdownLinkDelimiter + \ start="\[" end="\]" contains=markdownUrl keepend oneline concealends + syn region markdownLink matchgroup=markdownLinkDelimiter + \ start="(" end=")" contains=markdownUrl keepend contained conceal + syn region markdownLinkText matchgroup=markdownLinkTextDelimiter + \ start="!\=\[\%(\%(\_[^][]\|\[\_[^][]*\]\)*]\%( \=[[(]\)\)\@=" + \ end="\]\%( \=[[(]\)\@=" nextgroup=markdownLink,markdownId + \ skipwhite contains=@markdownInline,markdownLineStart concealends + + " unlet b:current_syntax + syntax include @Yaml syntax/yaml.vim + syntax include @Toml syntax/toml.vim + syntax region yamlFrontmatter start=/\%^---$/ end=/^---$/ + \ keepend contains=@Yaml + syntax region tomlFrontmatter start=/\%^+++$/ end=/^+++$/ + \ keepend contains=@Toml + + ]], true) +end diff --git a/.config/nvim/after/ftplugin/python.lua b/.config/nvim/after/ftplugin/python.lua index b6c54ff..8fa85a6 100755 --- a/.config/nvim/after/ftplugin/python.lua +++ b/.config/nvim/after/ftplugin/python.lua @@ -1 +1,7 @@ o.colorcolumn = '80' + +-- require('nvim-treesitter.highlight').set_custom_captures { +-- ['docstring'] = 'Comment', +-- } + +vim.api.nvim_set_hl(0, '@docstring', { link = 'Comment' }) diff --git a/.config/nvim/after/ftplugin/tsplayground.lua b/.config/nvim/after/ftplugin/tsplayground.lua new file mode 100755 index 0000000..b300057 --- /dev/null +++ b/.config/nvim/after/ftplugin/tsplayground.lua @@ -0,0 +1,3 @@ +bo.tabstop = 2 +bo.shiftwidth = 2 +bo.expandtab = true diff --git a/.config/nvim/after/ftplugin/yaml.lua b/.config/nvim/after/ftplugin/yaml.lua index b89af72..4f9234b 100755 --- a/.config/nvim/after/ftplugin/yaml.lua +++ b/.config/nvim/after/ftplugin/yaml.lua @@ -4,3 +4,9 @@ o.colorcolumn = '80' bo.tabstop = 2 bo.softtabstop = 2 bo.shiftwidth = 2 + + +vim.api.nvim_exec([[ + set is hlsearch ai ic scs + nnoremap <esc><esc> :nohls +]], true) diff --git a/.config/nvim/colors/colorscheme.vim b/.config/nvim/colors/colorscheme.vim index 48df51c..e401231 100755 --- a/.config/nvim/colors/colorscheme.vim +++ b/.config/nvim/colors/colorscheme.vim @@ -209,3 +209,12 @@ sign define semshiError text=E> texthl=semshiErrorSign hi VirtColumn cterm=NONE ctermbg=0 ctermfg=2 hi IndentBlankLineChar cterm=NONE ctermbg=0 ctermfg=15 + + + + +" Highlight docstrings as comments, not string. +syn region pythonDocstring start=+^\s*[uU]\?[rR]\?"""+ end=+"""+ keepend excludenl contains=pythonEscape,@Spell,pythonDoctest,pythonDocTest2,pythonSpaceError +syn region pythonDocstring start=+^\s*[uU]\?[rR]\?'''+ end=+'''+ keepend excludenl contains=pythonEscape,@Spell,pythonDoctest,pythonDocTest2,pythonSpaceError + +hi def link pythonDocstring pythonComment diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index eda0497..5abff38 100755 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -5,6 +5,7 @@ cmd = vim.cmd require('settings') require('plugins') +require('diagnostic') require('lsp') require('statusline') require('keymaps') diff --git a/.config/nvim/init.old.vim b/.config/nvim/init.old.vim deleted file mode 100755 index 35630e8..0000000 --- a/.config/nvim/init.old.vim +++ /dev/null @@ -1,218 +0,0 @@ -" nvim configuration ~~ rgoncalves.se - -" vim-plug autoinstall -if empty(glob('~/.local/share/nvim/site/autoload/plug.vim')) - silent !curl -fLo ~/.local/share/nvim/site/autoload/plug.vim --create-dirs - \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim - autocmd VimEnter * PlugInstall --sync | source $MYVIMRC -endif - -" system agnostic detection -let uname = system('uname')[:-2] - -" global configuration -set encoding=utf-8 -set laststatus=2 -set scrolloff=3 -set viminfo= -set mouse=a -set title -set number -set noswapfile -set shell=/bin/sh -set updatetime=2500 -set synmaxcol=300 -set lazyredraw -set ttyfast -set wildoptions= -set autochdir -let sh_minlines=100 -let sh_maxlines=600 - -" filetypes and colorschemes -syntax on -filetype on -filetype plugin on -filetype indent on -colorscheme base - -" keybindings -noremap =j :%!python -m json.tool<CR> -noremap =k :%s/-\|-/-+-/g<CR> -noremap =l :%s/-+-/-\|-/g<CR> -noremap <F2> :NERDTreeToggle <CR> -noremap <F3> :GitGutterCustomToggle <CR> -inoremap <C-h> <Left> -inoremap <C-j> <Down> -inoremap <C-k> <Up> -inoremap <C-l> <Right> -" keybindings - omnifunc -inoremap <expr> <CR> pumvisible() ? "\<C-Y>" : "\<CR>" -inoremap <expr> <C-l> pumvisible() ? "\<CR>" : "\<CR>" -inoremap <expr> <C-n> pumvisible() ? '<C-n>' : - \ '<C-n><C-r>=pumvisible() ? "\<lt>Down>" : ""<CR>' -inoremap <expr> <M-,> pumvisible() ? '<C-n>' : - \ '<C-x><C-o><C-n><C-p><C-r>=pumvisible() ? "\<lt>Down>" : ""<CR>' -inoremap <expr> <C-Space> (pumvisible() ? (col('.') > 1 ? '<Esc>i<Right>' : '<Esc>i') : '') . - \ '<C-x><C-o><C-r>=pumvisible() ? "\<lt>C-n>\<lt>C-p>\<lt>Down>" : ""<CR>' -inoremap <expr> <S-Space> (pumvisible() ? (col('.') > 1 ? '<Esc>i<Right>' : '<Esc>i') : '') . - \ '<C-x><C-u><C-r>=pumvisible() ? "\<lt>C-n>\<lt>C-p>\<lt>Down>" : ""<CR>' - -let g:polyglot_disabled = ['autoindent', 'sensible'] - -" PLUGINS list -if !empty(glob('~/.local/share/nvim/site/autoload/plug.vim')) - call plug#begin('~/.nvim/plugged/') - " core - Plug 'scrooloose/nerdtree' - " completion - Plug 'w0rp/ale' - " Plug 'davidhalter/jedi-vim' - Plug 'maralla/completor.vim' - " fzf - Plug 'junegunn/fzf', { 'do': { -> fzf#install() } } - Plug 'junegunn/fzf.vim' - " indent - Plug 'nathanaelkane/vim-indent-guides' - Plug 'editorconfig/editorconfig-vim' - Plug 'pangloss/vim-javascript' - Plug 'pearofducks/ansible-vim' - Plug 'sheerun/vim-polyglot' - Plug 'dbeniamine/vim-mail' - Plug 'ap/vim-css-color' - " notes - Plug 'dhruvasagar/vim-table-mode' - Plug 'jceb/vim-orgmode' - " headers and source - Plug 'vim-scripts/a.vim' - Plug 'majutsushi/tagbar' - " git - Plug 'airblade/vim-gitgutter' - Plug 'tpope/vim-fugitive' - Plug 'jreybert/vimagit' - Plug 'junegunn/gv.vim' - " python - Plug 'petobens/poet-v' - call plug#end() -endif - -" indentation -set smarttab -set autoindent -set nocompatible -set tabstop=8 -set shiftwidth=8 -set softtabstop=8 -set noexpandtab -set list lcs=tab:\|\ ". -set fillchars+=vert:\ ". -set ve+=onemore -set list -set shortmess=atToOF - -" plugins settings -let g:ale_sign_error = '' -let g:ale_sign_warning = '' -let g:ale_c_clang_options='-std=gnu99 -Wall' -let g:ale_c_gcc_options='-std=gnu99 -Wall' -let g:ale_sh_shellcheck_options = '-e SC1090 SC2181 -e SC2155' -let g:ale_python_flake8_options = '--ignore=E501' -let g:ale_linters = { 'python': ['bandit', 'flake8'], } - -let g:gitgutter_max_signs = 500 -let g:gitgutter_sign_added = '+' -let g:gitgutter_sign_modified = '~' -let g:gitgutter_sign_removed = '-' -let g:gitgutter_sign_modified_removed = '-' - -let g:indent_guides_enable_on_vim_startup = 0 -let g:indent_guides_auto_colors = 0 -let g:indent_cuides_exclude_filetypes = [ - \'help', - \'terminal' - \] -let g:poetv_executables = ['poetry'] -let g:poetv_auto_activate = 1 - -let g:python_host_prog = system('which python2')[:-2] -let g:python3_host_prog = system('which python3')[:-2] -let g:jedi#auto_initialization = 1 -let g:jedi#popup_on_dot = 0 - -let g:NERDTreeAutoDeleteBuffer = 1 -let g:NERDTreeMinimalUI = 1 -let g:NERDTreeDirArrowExpandable = '+' -let g:NERDTreeDirArrowCollapsible = '-' - -let g:EditorConfig_exclude_patterns = ['fugitive://.*', 'scp://.*'] -let g:fzf_layout = { 'down': '40%'} -let g:magit_default_fold_level = 2 -let g:sql_type_default = 'pgsql' -let g:table_mode_always_active = 0 - -if uname == 'OpenBSD' - let g:ncm2_pyclang#library_path = '/usr/local/lib/libclang.so.8.1' - let g:completor_python_binary = '/usr/bin/python3' -endif - -" netrw -let g:netrw_banner = 0 -let g:netrw_browse_split = 4 -let g:netrw_liststyle = 3 -let g:netrw_altv = 1 -let g:netrw_winsize = 25 -let g:netrw_list_hide = '\(^\|\s\s\)\zs\.\S\+' - -autocmd BufNewFile,BufReadPost *.{yaml,yml} set filetype=yaml -autocmd BufNewFile,BufReadPost */*ssh/config.d/* set syntax=sshconfig -autocmd BufNewFile,BufReadPost */*ansible*/**/*.yml set filetype=yaml.ansible -autocmd BufNewFile,BufRead ~/.config/i3/config set filetype=i3config -autocmd BufNewFile,BufRead ~/.config/sway/config set filetype=i3config -autocmd BufNewFile,BufRead ~/.config/polybar/config set filetype=dosini -autocmd FileType conf let b:EditorConfig_disable = 1 -autocmd FileType gitcommit let b:EditorConfig_disable = 1 -autocmd FileType java setlocal omnifunc=javacomplete#Complete -autocmd FileType yaml let b:EditorConfig_disable = 1 - -" statusline -set statusline= -set statusline+=\ %f -set statusline+=%m -set statusline+=%= -set statusline+=\ %y -set statusline+=\ %{&fileencoding?&fileencoding:&encoding} -set statusline+=\ [%{&fileformat}\] -set statusline+=\ %p%% -set statusline+=\ %l:%c -set statusline+=\ - -" completion -set omnifunc=syntaxcomplete#Complete -set completeopt=longest,menuone - -" commands -command! PlugSync PlugClean | - \ PlugInstall | - \ UpdateRemotePlugins -command! GitGutterCustomToggle GitGutterLineHighlightsToggle | - \ GitGutterLineNrHighlightsToggle -command! Gblame Git blame - -" cnoremap <silent> <cr> <cr>:call <SID>CommandCallback()<cr> - -function! s:SyncColorcolumnColorscheme() - let l:length = '/\%' . string(&colorcolumn + 1) . 'v.\+/' - execute 'match' 'OverLength' l:length -endfunction - -function! s:CommandCallback() - let l:last_command = @: - - if l:last_command =~ 'set colorcolumn' - call s:SyncColorcolumnColorscheme() - endif -endfunction - -function! s:Init() - call s:SyncColorcolumnColorscheme() -endfunction diff --git a/.config/nvim/lua/diagnostic.lua b/.config/nvim/lua/diagnostic.lua new file mode 100755 index 0000000..0eb4e91 --- /dev/null +++ b/.config/nvim/lua/diagnostic.lua @@ -0,0 +1,45 @@ +local original_diagnostic_set = vim.diagnostic.set +local disabled_diagnostics_patterns = { + -- { 'mypy', 'Library stubs not installed' }, + -- { 'mypy', 'Cannot find implementation or library stub' }, + -- { 'mypy', 'Skipping analyzing' } +} + +local function is_diagnostic_disabled(diagnostic, disabled_diagnostic_patterns) + return string.find(diagnostic.source, disabled_diagnostic_patterns[1]) and + string.find(diagnostic.message, disabled_diagnostic_patterns[2]) +end + +local function is_diagnostic_enabled(diagnostic, disabled_diagnostic_patterns) + local found_diagnostic = true + for _, disabled_diagnostic_patterns in pairs(disabled_diagnostics_patterns) do + if is_diagnostic_disabled(diagnostic, disabled_diagnostic_patterns) then + found_diagnostic = false + end + end + return found_diagnostic +end + +vim.diagnostic.set = function(namespace, bufnr, diagnostics, opts) + local filtered_diagnostics = {} + for _, diagnostic in pairs(diagnostics) do + if is_diagnostic_enabled(diagnostic, disabled_diagnostics_patterns) then + table.insert(filtered_diagnostics, diagnostic) + end + end + original_diagnostic_set(namespace, bufnr, filtered_diagnostics, opts) +end + +vim.diagnostic.config{ + underline = false, + signs = true, + severity_sort = true, + update_in_insert = false, + float = { + source = 'always', + }, + virtual_text = { + prefix = '▒ ', + spacing = 8, + }, +} diff --git a/.config/nvim/lua/keymaps.lua b/.config/nvim/lua/keymaps.lua index 070ddc9..5243d8b 100755 --- a/.config/nvim/lua/keymaps.lua +++ b/.config/nvim/lua/keymaps.lua @@ -1,24 +1,9 @@ ---[[ --- Keymaps ---]] - local map = vim.api.nvim_set_keymap local cmd = vim.cmd - -options = {noremap=true} +local options = { noremap=true } map('i', '<C-h>', '<Left>', options) map('i', '<C-j>', '<Down>', options) map('i', '<C-k>', '<Up>', options) map('i', '<C-l>', '<Right>', options) -map('i', '<C-l>', '<Right>', options) - -map('', '<C-n>', ':NvimTreeToggle<CR>', options) - ---[[ -map('n', '<silent><expr>', '<C-Space>', 'compe#complete()', options) -map('n', '<silent><expr>', '<CR>', 'compe#confirm(\'<CR>\'', options) -map('n', '<silent><expr>', '<C-e>', 'compe#close(\'<C-e>\'', options) -map('n', '<silent><expr>', '<C-f>', 'compe#scroll({\'delta\': +4}', options) -map('n', '<silent><expr>', '<C-d>', 'compe#scroll({\'delta\': -4}', options) ---]] +map('i', '<C-L>', '<leader><space> :noh', options) diff --git a/.config/nvim/lua/lsp.lua b/.config/nvim/lua/lsp.lua index 95d9409..4e0624c 100755 --- a/.config/nvim/lua/lsp.lua +++ b/.config/nvim/lua/lsp.lua @@ -1,9 +1,6 @@ ---[[ --- lsp ---]] - local lsp = vim.lsp +--[[ lsp.handlers["textDocument/publishDiagnostics"] = lsp.with( lsp.diagnostic.on_publish_diagnostics, { @@ -15,3 +12,4 @@ lsp.handlers["textDocument/publishDiagnostics"] = lsp.with( signs = true, } ) +--]] diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua deleted file mode 100755 index 24736eb..0000000 --- a/.config/nvim/lua/plugins.lua +++ /dev/null @@ -1,145 +0,0 @@ ---[[ --- Plugins ---]] - --- Bootstrap for Paq -local install_path = vim.fn.stdpath('data')..'/site/pack/paqs/start/paq-nvim' -if vim.fn.empty(vim.fn.glob(install_path)) > 0 then - vim.fn.system({ - 'git', 'clone', '--depth=1', - 'https://github.com/savq/paq-nvim.git', - install_path - }) - vim.cmd 'packadd paq-nvim' -end - --- Enable Paq -vim.cmd 'packadd paq-nvim' - --- Plugin list -require('paq') { - {'savq/paq-nvim'}; - - -- lsp - { - 'nvim-treesitter/nvim-treesitter', - run=':TSUpdate' - }; - { - 'neovim/nvim-lspconfig', - run='python3 -m pipx install python-lsp-server[all]' - }; - { - 'numirias/semshi', - run=':UpdateRemotePlugins' - }; - - -- utils - {'folke/trouble.nvim'}; - {'hrsh7th/nvim-compe'}; - - -- org - {'TimUntersberger/neogit'}; - {'kyazdani42/nvim-tree.lua'}; - - -- indent - {'lewis6991/gitsigns.nvim'}; - {'glepnir/indent-guides.nvim'}; - {'darazaki/indent-o-matic'}; - - -- dep - {'nvim-lua/plenary.nvim'}; -} - --- Treesitter - -local parser_configs = require('nvim-treesitter.parsers').get_parser_configs() - -require('nvim-treesitter.configs').setup { - ensure_installed = 'maintained', - ignore_install = { - 'verilog', - 'kotlin' - }, - highlight = { - enable = true, - } -} - --- completion - -require('compe').setup { - enabled = true, - source = { - path = true; - buffer = true; - calc = true; - nvim_lsp = true; - nvim_lua = true; - vsnip = true; - ultisnips = true; - luasnip = true; - neorg = true; - }; -} - --- LSP configuration - -local lsputil = require('lspconfig/util') -local python_venv = require('utils').get_python_venv() -require('lspconfig').pylsp.setup{ - cmd = {'pylsp', '-v'}, - cmd_env = { - VIRTUAL_ENV = python_venv, - PATH = lsputil.path.join(python_venv, 'bin') .. ':' .. vim.env.PATH - }, -} - -require('lspconfig').clangd.setup{} -require('lspconfig').eslint.setup{} -require('lspconfig').terraformls.setup{} - --- org - -require('trouble').setup{} -require('neogit').setup{} - --- syntactic sugar - -require('indent_guides').setup{ - indent_enable=true; - exclude_filetypes={ - 'help', - 'calendar', - 'NvimTree' - }; -} - -require('indent-o-matic').setup { - max_lines = 0, - standard_widths = { 2, 4, 8 }, - - filetype_typescript = { - max_lines = 4096, - }, - - filetype_javascript = { - max_lines = 4096, - }, - - filetype_ = { - standard_widths = { 2, 4 }, - }, -} - -vim.g['semshi#update_delay_factor'] = 0.0001 - -require('gitsigns').setup{ - signs = { - add = {hl = 'GitSignsAdd' , text = '▍', numhl='GitSignsAddNr' , linehl='GitSignsAddLn'}, - change = {hl = 'GitSignsChange', text = '▍', numhl='GitSignsChangeNr', linehl='GitSignsChangeLn'}, - delete = {hl = 'GitSignsDelete', text = '▍', numhl='GitSignsDeleteNr', linehl='GitSignsDeleteLn'}, - topdelete = {hl = 'GitSignsDelete', text = '▍', numhl='GitSignsDeleteNr', linehl='GitSignsDeleteLn'}, - changedelete = {hl = 'GitSignsChange', text = '▍', numhl='GitSignsChangeNr', linehl='GitSignsChangeLn'}, - } -} diff --git a/.config/nvim/lua/plugins/aerial.lua b/.config/nvim/lua/plugins/aerial.lua new file mode 100755 index 0000000..2ae77bf --- /dev/null +++ b/.config/nvim/lua/plugins/aerial.lua @@ -0,0 +1,34 @@ +require("aerial").setup{ + highlight_on_jump = 800, + layout = { + min_width = 10, + }, + filter_kind = { + "Array", + "Boolean", + "Class", + "Constant", + "Constructor", + "Enum", + "EnumMember", + "Event", + "Field", + "File", + "Function", + "Interface", + "Key", + "Method", + "Module", + "Namespace", + "Null", + "Number", + "Object", + "Operator", + "Package", + "Property", + "String", + "Struct", + "TypeParameter", + "Variable" + }, +} diff --git a/.config/nvim/lua/plugins/bufresize.lua b/.config/nvim/lua/plugins/bufresize.lua new file mode 100755 index 0000000..c4212f8 --- /dev/null +++ b/.config/nvim/lua/plugins/bufresize.lua @@ -0,0 +1 @@ +require('bufresize').setup{} diff --git a/.config/nvim/lua/plugins/cmp.lua b/.config/nvim/lua/plugins/cmp.lua new file mode 100755 index 0000000..8f9dae2 --- /dev/null +++ b/.config/nvim/lua/plugins/cmp.lua @@ -0,0 +1,26 @@ +local cmp = require('cmp') + +cmp.setup({ + mapping = { + ['<C-j>'] = cmp.mapping(cmp.mapping.select_next_item(), { 'i', 'c' }), + ['<C-k>'] = cmp.mapping(cmp.mapping.select_prev_item(), { 'i', 'c' }), + ['<C-Space>'] = cmp.mapping(cmp.mapping.complete(), { 'i', 'c' }), + -- ['<C-l>'] = cmp.mapping(cmp.mapping.complete(), { 'i', 'c' }), + -- ['<CR>'] = cmp.mapping.confirm({ select = true }) + }, + sources = cmp.config.sources({ + { name = 'nvim_lsp' }, + -- { name = 'cmdline' }, + { name = 'path' }, + { name = 'calc' } + }, + { + { name = 'buffer' } + }) +}) + +cmp.setup.cmdline('/', { + sources = { + { name = 'buffer' } + } +}) diff --git a/.config/nvim/lua/plugins/dap.lua b/.config/nvim/lua/plugins/dap.lua new file mode 100755 index 0000000..b927ca6 --- /dev/null +++ b/.config/nvim/lua/plugins/dap.lua @@ -0,0 +1,21 @@ +local dap = require('dap') +local python_venv = require('utils').get_python_venv() + +dap.adapters.python = { + type = 'executable'; + command = 'python'; + args = { '-m', 'debugpy.adapter' }; +} + +dap.configurations.python = { + { + type = 'python'; + request = 'launch'; + name = "Launch file"; + + program = "${file}"; + pythonPath = python_venv .. '/bin/python'; + }, +} + +-- require("dapui").setup{} diff --git a/.config/nvim/lua/plugins/diffview.lua b/.config/nvim/lua/plugins/diffview.lua new file mode 100755 index 0000000..857b041 --- /dev/null +++ b/.config/nvim/lua/plugins/diffview.lua @@ -0,0 +1,4 @@ +require('diffview').setup{ + diff_binaries = false, + enhanced_diff_hl = false, +} diff --git a/.config/nvim/lua/plugins/gitsigns.lua b/.config/nvim/lua/plugins/gitsigns.lua new file mode 100755 index 0000000..7c4a92b --- /dev/null +++ b/.config/nvim/lua/plugins/gitsigns.lua @@ -0,0 +1,14 @@ +require('gitsigns').setup{ + signs = { + add = {hl = 'GitSignsAdd', text = '▍', + numhl='GitSignsAddNr', linehl='GitSignsAddLn'}, + change = {hl = 'GitSignsChange', text = '▍', + numhl='GitSignsChangeNr', linehl='GitSignsChangeLn'}, + delete = {hl = 'GitSignsDelete', text = '▍', + numhl='GitSignsDeleteNr', linehl='GitSignsDeleteLn'}, + topdelete = {hl = 'GitSignsDelete', text = '▍', + numhl='GitSignsDeleteNr', linehl='GitSignsDeleteLn'}, + changedelete = {hl = 'GitSignsChange', text = '▍', + numhl='GitSignsChangeNr', linehl='GitSignsChangeLn'}, + } +} diff --git a/.config/nvim/lua/plugins/indent-guides.lua b/.config/nvim/lua/plugins/indent-guides.lua new file mode 100755 index 0000000..c50f74d --- /dev/null +++ b/.config/nvim/lua/plugins/indent-guides.lua @@ -0,0 +1,11 @@ +require('indent_guides').setup{ + indent_enable=true; + exclude_filetypes={ + 'calendar', + 'gitcommit', + 'help', + 'lsp-installer', + 'man', + 'NvimTree', + }; +} diff --git a/.config/nvim/lua/plugins/indent-o-matic.lua b/.config/nvim/lua/plugins/indent-o-matic.lua new file mode 100755 index 0000000..517c3d8 --- /dev/null +++ b/.config/nvim/lua/plugins/indent-o-matic.lua @@ -0,0 +1,19 @@ +require('indent-o-matic').setup { + max_lines = 0, + standard_widths = { 2, 4, 8 }, + + filetype_ = { standard_widths = { 2, 4 } }, + + filetype_css = { max_lines = 4096 }, + filetype_django = { max_lines = 4096 }, + filetype_javascript = { max_lines = 4096 }, + filetype_json = { max_lines = 4096 }, + filetype_lua = { max_lines = 4096 }, + filetype_scss = { max_lines = 4096 }, + filetype_typescript = { max_lines = 4096 }, + filetype_xml = { max_lines = 4096 }, + filetype_django = { max_lines = 4096 }, + filetype_toml = { max_lines = 4096 }, + filetype_yaml = { max_lines = 4096 }, + filetype_jsonnet = { max_lines = 4096 }, +} diff --git a/.config/nvim/lua/plugins/init.lua b/.config/nvim/lua/plugins/init.lua new file mode 100755 index 0000000..9878222 --- /dev/null +++ b/.config/nvim/lua/plugins/init.lua @@ -0,0 +1,103 @@ +-- bootstrap +local install_path = vim.fn.stdpath('data')..'/site/pack/paqs/start/paq-nvim' +if vim.fn.empty(vim.fn.glob(install_path)) > 0 then + vim.fn.system({ + 'git', 'clone', '--depth=1', + 'https://github.com/savq/paq-nvim.git', + install_path + }) +end + +vim.cmd 'packadd paq-nvim' + +require('paq') { + {'savq/paq-nvim'}; + + -- treesiter + {'nvim-treesitter/playground'}; + {'nvim-treesitter/nvim-treesitter-textobjects'}; + { + 'nvim-treesitter/nvim-treesitter', + run=vim.api.nvim_command(':silent! TSUpdate') + }; + + -- lsp + { + 'neovim/nvim-lspconfig', + run = function() + vim.fn.system({'npm', 'install', '-g', '@ansible/ansible-language-server'}) + vim.fn.system({'npm', 'install', '-g', 'vscode-langservers-extracted'}) + vim.fn.system({'python3', '-m', 'pipx', 'install', '--force', 'python-lsp-server[all]'}) + vim.fn.system({'python3', '-m', 'pipx', 'inject', 'python-lsp-server', 'git+https://github.com/python/mypy'}) + vim.fn.system({'python3', '-m', 'pipx', 'inject', 'python-lsp-server', 'pylsp-mypy'}) + vim.fn.system({'python3', '-m', 'pipx', 'inject', 'python-lsp-server', 'types-all'}) + vim.fn.system({'python3', '-m', 'pipx', 'upgrade', '--include-injected', 'python-lsp-server'}) + -- vim.fn.system({'python3', '-m', 'pip', 'install', '--force', 'debugpy'}) + end + }; + -- {'mickael-menu/zk-nvim'}; + { + 'jose-elias-alvarez/null-ls.nvim', + run = function() + vim.fn.system({'npm', 'install', '-g', 'markdownlint'}) + vim.fn.system({'python3', '-m', 'pip', 'install', 'gitlint'}) + vim.fn.system({'python3', '-m', 'pipx', 'install', 'yamllint'}) + vim.fn.system({'luarocks', 'install', 'luacheck'}) + end +}; + + {'nvim-telescope/telescope.nvim'}; + {'stevearc/aerial.nvim'}; + {'sindrets/diffview.nvim'}; + {'folke/which-key.nvim'}; + { + 'michaelb/sniprun', + run = 'bash install.sh' + }; + + -- dap + {'mfussenegger/nvim-dap'}; + {'rcarriga/nvim-dap-ui'}; + + -- completion + {'hrsh7th/cmp-nvim-lsp'}; + {'hrsh7th/cmp-cmdline'}; + {'hrsh7th/cmp-buffer'}; + {'hrsh7th/cmp-path'}; + {'hrsh7th/cmp-calc'}; + {'hrsh7th/nvim-cmp'}; + + -- indentation + {'lewis6991/gitsigns.nvim'}; + {'glepnir/indent-guides.nvim'}; + {'darazaki/indent-o-matic'}; + { + 'stsewd/sphinx.nvim', + run=function() + vim.fn.system({'python3', '-m', 'pip', 'install', 'sphinx'}) + vim.api.nvim_command(':silent! UpdateRemotePlugins') + end + }; + + -- qol + {'kwkarlwang/bufresize.nvim'}; + + -- dependencies + {'nvim-lua/plenary.nvim'}; +} + +require('plugins.aerial') +require('plugins.bufresize') +require('plugins.cmp') +require('plugins.dap') +require('plugins.diffview') +require('plugins.gitsigns') +require('plugins.indent-guides') +require('plugins.indent-o-matic') +require('plugins.sniprun') +require('plugins.lspconfig') +require('plugins.null-ls') +require('plugins.telescope') +require('plugins.treesitter') +require('plugins.which-key') +-- require('plugins.zk') diff --git a/.config/nvim/lua/plugins/leap.lua b/.config/nvim/lua/plugins/leap.lua new file mode 100755 index 0000000..c0aeeef --- /dev/null +++ b/.config/nvim/lua/plugins/leap.lua @@ -0,0 +1 @@ +require('leap').add_default_mappings() diff --git a/.config/nvim/lua/plugins/lspconfig.lua b/.config/nvim/lua/plugins/lspconfig.lua new file mode 100755 index 0000000..6d37467 --- /dev/null +++ b/.config/nvim/lua/plugins/lspconfig.lua @@ -0,0 +1,83 @@ +local opts = { noremap=true, silent=true } + +local lsputil = require('lspconfig/util') +local python_venv = require('utils').get_python_venv() + +local on_attach = function(client, bufnr) + -- Enable completion triggered by <c-x><c-o> + vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc') + + -- Mappings. + -- See `:help vim.lsp.*` for documentation on any of the below functions + vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<CR>', opts) + vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', opts) + vim.api.nvim_buf_set_keymap(bufnr, 'n', 'K', '<cmd>lua vim.lsp.buf.hover()<CR>', opts) + vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts) + vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts) + vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>wa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>', opts) + vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>wr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>', opts) + vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>wl', '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>', opts) + vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts) + vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts) + vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>', opts) + vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>f', '<cmd>lua vim.lsp.buf.formatting()<CR>', opts) + vim.api.nvim_buf_set_keymap(bufnr, 'n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts) +end + +vim.api.nvim_set_keymap('n', '<space>d', '<cmd>lua vim.diagnostic.open_float()<CR>', opts) +vim.api.nvim_set_keymap('n', '[d', '<cmd>lua vim.diagnostic.goto_prev()<CR>', opts) +vim.api.nvim_set_keymap('n', ']d', '<cmd>lua vim.diagnostic.goto_next()<CR>', opts) +vim.api.nvim_set_keymap('n', '<space>q', '<cmd>lua vim.diagnostic.setloclist()<CR>', opts) + +-- require('lspconfig').ansiblels.setup{ on_attach = on_attach } +require('lspconfig').clangd.setup{ on_attach = on_attach } +require('lspconfig').eslint.setup{ on_attach = on_attach } +require('lspconfig').gopls.setup{ on_attach = on_attach } +require('lspconfig').terraformls.setup{ on_attach = on_attach } + +require('lspconfig').dartls.setup{ + on_attach = on_attach, + settings = { + dart = { + analysisExcludedFolders = { '.git' }, + completeFunctionCalls = true, + enableSdkFormatter = true, + showTodos = true + } + } +} + +require('lspconfig').pylsp.setup{ + cmd_env = { + VIRTUAL_ENV = python_venv, + PATH = lsputil.path.join(python_venv, 'bin') .. ':' .. vim.env.PATH, + MYPYPATH = lsputil.path.join(python_venv, 'bin') .. ':' .. (vim.env.MYPYPATH or "") + }, + on_attach = on_attach, + settings = { + pylsp = { + configurationSources = { + 'flake8', + 'pycodestyle' + }, + plugins = { + flake8 = { + enabled = true, + ignore = {}, + maxLineLength = 160 + }, + rope_completion = { + enabled = true, + }, + pyflakes = { + enabled = true + }, + } + } + } +} + +require('lspconfig').elixirls.setup{ + cmd = {'elixir-ls'}, + on_attach = on_attach +} diff --git a/.config/nvim/lua/plugins/null-ls.lua b/.config/nvim/lua/plugins/null-ls.lua new file mode 100755 index 0000000..3f84b26 --- /dev/null +++ b/.config/nvim/lua/plugins/null-ls.lua @@ -0,0 +1,12 @@ +require('null-ls').setup({ + sources = { + -- require('null-ls').builtins.diagnostics.ansiblelint, + -- require('null-ls').builtins.diagnostics.markdownlint, + require('null-ls').builtins.diagnostics.eslint, + require('null-ls').builtins.diagnostics.gitlint, + require('null-ls').builtins.diagnostics.luacheck, + require('null-ls').builtins.diagnostics.shellcheck, + require('null-ls').builtins.diagnostics.yamllint, + require('null-ls').builtins.formatting.stylua, + }, +}) diff --git a/.config/nvim/lua/plugins/sniprun.lua b/.config/nvim/lua/plugins/sniprun.lua new file mode 100755 index 0000000..d6d1265 --- /dev/null +++ b/.config/nvim/lua/plugins/sniprun.lua @@ -0,0 +1,3 @@ +require('sniprun').setup{ + display = { 'Terminal' }, +} diff --git a/.config/nvim/lua/plugins/telescope.lua b/.config/nvim/lua/plugins/telescope.lua new file mode 100755 index 0000000..69dcbfd --- /dev/null +++ b/.config/nvim/lua/plugins/telescope.lua @@ -0,0 +1,28 @@ +require('telescope').setup{ + defaults = { + borderchars = { '─', '│', '─', '│', '┌', '┐', '┘', '└'} + } +} + +require('telescope').load_extension('aerial') + +local opt = { noremap=true } +local keybinds = { + {'f/', 'current_buffer_fuzzy_find'}, + {'fa', 'aerial'}, + {'fb', 'buffers'}, + {'ff', 'find_files'}, + {'fgb', 'git_branches'}, + {'fgc', 'git_commits'}, + {'fgg', 'git_files'}, + {'fgs', 'git_status'}, + {'fh', 'help_tags'}, + {'fl', 'live_grep'}, + {'fm', 'man_pages'}, + {'fo', 'oldfiles'}, + {'fr', 'resume'}, +} + +for _, keybind in pairs(keybinds) do + vim.api.nvim_set_keymap('n', keybind[1], '<cmd>Telescope ' .. keybind[2] .. '<cr>', opt) +end diff --git a/.config/nvim/lua/plugins/treesitter.lua b/.config/nvim/lua/plugins/treesitter.lua new file mode 100755 index 0000000..7fb6d45 --- /dev/null +++ b/.config/nvim/lua/plugins/treesitter.lua @@ -0,0 +1,18 @@ +require('nvim-treesitter.configs').setup { + ensure_installed = 'all', + ignore_install = { + 'verilog', + 'kotlin' + }, + highlight = { + enable = true, + -- additional_vim_regex_highlighting = { "markdown" } + additional_vim_regex_highlighting = true, + set_custom_captures = { + ["type.string"] = "pythonFunction", + } + }, + incremental_selection = { enable = true }, + textobjects = { enable = true } +} + diff --git a/.config/nvim/lua/plugins/which-key.lua b/.config/nvim/lua/plugins/which-key.lua new file mode 100755 index 0000000..93e19f9 --- /dev/null +++ b/.config/nvim/lua/plugins/which-key.lua @@ -0,0 +1,13 @@ +require("which-key").setup{ + window = { + position = "bottom", -- bottom, top + margin = { 1, 40, 1, 0 }, -- extra window margin [top, right, bottom, left] + padding = { 0, 0, 0, 0 }, -- extra window padding [top, right, bottom, left] + winblend = 0 + }, + icons = { + breadcrumb = ">", -- symbol used in the command line area that shows your active key combo + separator = ":", -- symbol used between a key and it's label + group = "+", -- symbol prepended to a group + }, +} diff --git a/.config/nvim/lua/plugins/zk.lua b/.config/nvim/lua/plugins/zk.lua new file mode 100755 index 0000000..1a091b9 --- /dev/null +++ b/.config/nvim/lua/plugins/zk.lua @@ -0,0 +1,3 @@ +require('zk').setup{ + picker = 'telescope' +} diff --git a/.config/nvim/lua/settings.lua b/.config/nvim/lua/settings.lua index aa04dce..eaa5617 100755 --- a/.config/nvim/lua/settings.lua +++ b/.config/nvim/lua/settings.lua @@ -11,12 +11,23 @@ o.autochdir = false o.smarttab = true o.number = true o.list = true +o.mouse = '' +o.backspace = 'indent,eol,start' + o.swapfile = false -- o.foldmethod = 'expr' -- o.foldexpr = 'nvim_treesitter#foldexpr()' +local format = function(diagnostic) + if diagnostic.severity == vim.diagnostic.severity.ERROR then + -- return string.format("E: %s", diagnostic.message) + return diagnostic.message .. diagnostic.source + end + return diagnostic.message +end + cmd 'syntax enable' cmd 'filetype on' cmd 'filetype plugin on' @@ -24,7 +35,42 @@ cmd 'filetype indent on' cmd 'colorscheme colorscheme' vim.cmd([[ -au BufNewFile,BufRead *.Dockerfile,Dockerfile.* setlocal filetype=dockerfile -au BufNewFile,BufRead *.j2*,*.jinja* setlocal filetype=django -au BufNewFile,BufRead *.env* setlocal filetype=sh + au BufNewFile,BufRead *.j2*,*.jinja* setlocal filetype=django + + au BufNewFile,BufRead */.config/neomutt/* + \ if &filetype == "" | + \ setlocal filetype=neomuttrc | + \ endif ]]) + +vim.filetype.add({ + pattern = { + ['.*playbooks/.*%.yml'] = 'yaml.ansible', + ['.*roles/.*/tasks/.*%.yml'] = 'yaml.ansible', + ['.*roles/.*/defaults/.*%.yml'] = 'yaml.ansible', + ['.*roles/.*/vars/.*%.yml'] = 'yaml.ansible', + ['.*roles/.*/meta/.*%.yml'] = 'yaml.ansible', + ['.*roles/.*/templates/.*%.yml'] = 'yaml.ansible', + ['.*%.Dockerfile'] = 'dockerfile', + ['Dockerfile%..*'] = 'dockerfile', + ['.*%.env.*'] = 'sh', + ['.*/task/config'] = 'taskrc', + ['%.ansible%-lint'] = 'yaml', + ['%.yamllint'] = 'yaml', + } +}) + +--[[ +require'nvim-treesitter.configs'.setup { + textobjects = { + lsp_interop = { + enable = true, + border = 'none', + peek_definition_code = { + ["<space>k"] = "@function.outer", + ["<space>K"] = "@class.outer", + }, + }, + }, +} +]]-- diff --git a/.config/nvim/lua/statusline.lua b/.config/nvim/lua/statusline.lua index 099d930..c436a8e 100755 --- a/.config/nvim/lua/statusline.lua +++ b/.config/nvim/lua/statusline.lua @@ -1,7 +1,3 @@ ---[[ --- Statusline ---]] - local api = vim.api local cmd = vim.cmd local utils = require('utils') @@ -50,5 +46,5 @@ function get_statusline() end -- Enable statusline -utils.opt('o', 'laststatus', 2) -utils.opt('o', 'statusline', get_statusline()) +vim.o.lastatus = 2 +vim.o.statusline = get_statusline() diff --git a/.config/nvim/queries/python/highlights.scm b/.config/nvim/queries/python/highlights.scm new file mode 100755 index 0000000..2ea4847 --- /dev/null +++ b/.config/nvim/queries/python/highlights.scm @@ -0,0 +1,5 @@ +; extends + +(block (expression_statement (string)) @docstring) + +(type) @type diff --git a/.config/pipewire/pipewire-pulse.sh b/.config/pipewire/pipewire-pulse.sh index 4abff58..bbcfa48 100755 --- a/.config/pipewire/pipewire-pulse.sh +++ b/.config/pipewire/pipewire-pulse.sh @@ -3,27 +3,25 @@ sleep 3 source_name="master-mono" +source_position=1 + +if [ "$(cat /etc/hostname)" = "work-01" ]; then + source_position=2 +fi source_index=$(pactl list short sources | grep "input.*pci-" | head -n 1 | + head -n "${source_position}" | awk '{print $1;}') echo "${source_index}" -#pactl load-module module-remap-source \ -# "source_name=${source_name}" \ -# "master=${source_index}" \ -# use_master_format=1 \ -# master_channel_map=front-left \ -# channel_map=mono \ -# channels=1 - pactl load-module module-echo-cancel \ "source_name=${source_name}" \ "master=${source_index}" \ use_master_format=1 \ aec_method="webrtc" \ - aec_args='"beamforming=1 mic_geometry=-1,0,0,1,0,0"' + aec_args='"beamforming=1 mic_geometry=-0.04,0,0,0.04,0,0"' pactl set-default-source "${source_name}" diff --git a/.config/qutebrowser/config.py b/.config/qutebrowser/config.py index c86a473..e24591b 100755 --- a/.config/qutebrowser/config.py +++ b/.config/qutebrowser/config.py @@ -2,38 +2,78 @@ # ~/.config/qutebrowser/config.py # rgoncalves.se +import html import logging import os import re -import subprocess -import platform +import socket + +from PyQt5.QtCore import QUrl + +from qutebrowser.api import cmdutils +from qutebrowser.browser.urlmarks import ( + AlreadyExistsError as UrlAlreadyExistsError +) +from qutebrowser.browser.urlmarks import UrlMarkManager +from qutebrowser.config.config import ConfigContainer +from qutebrowser.config.configfiles import ConfigAPI +from qutebrowser.utils import message, objreg +from qutebrowser.utils.usertypes import PromptMode +from userscripts.urlmarks import urlmarkmanager_save + +config: ConfigAPI = config # noqa: F821 pylint: disable=E0602,C0103 +c: ConfigContainer = c # noqa: F821 pylint: disable=E0602,C0103 logging.basicConfig(level=logging.DEBUG) -""" -Bypass flake8 warnings. -""" -try: - config -except NameError: - config = None + +UrlMarkManager.save = ( + lambda manager: urlmarkmanager_save(manager, config.configdir) +) -def is_musl_system(): - return bool(re.search('musl', os.popen("ldd /bin/ls").read())) +def is_musl_system() -> bool: + return bool(re.search('musl', os.popen('ldd /bin/ls').read())) -def select_qt_arguments(): +def get_qt_arguments() -> list: """ Select best arguments for launching qutebrowser. Empty by default, it picks lag free options for musl systems. """ - args = [] + filters = { + 'disable-seccomp-filter-sandbox': is_musl_system() + } - if is_musl_system(): - args.append('disable-seccomp-filter-sandbox') + return list( + filter(lambda x: x, map(lambda x: x[1], list(filters.items()))) + ) - return args + +try: + @cmdutils.register() + def bookmark_save(url: QUrl): + """Save the current page as a bookmark.""" + manager = objreg.get('bookmark-manager') + tags = message.ask( + title="Add bookmark:", + mode=PromptMode.text, + url=url.toString(QUrl.RemovePassword | QUrl.FullyEncoded), + text=( + "Please enter bookmark tags for<br/><b>" + f"{html.escape(url.toDisplayString())}</b>" + ), + ) + + if not tags: + return + + try: + manager.add(url, tags) + except UrlAlreadyExistsError: + message.warning("Bookmark already exists.") +except ValueError: + pass config.load_autoconfig(False) @@ -41,9 +81,8 @@ config.set('auto_save.session', True) config.set('scrolling.smooth', False) config.set('qt.highdpi', False) config.set('qt.force_software_rendering', 'none') -config.set('qt.args', select_qt_arguments()) - -config.bind(',m', 'spawn mpv {url}') +config.set('qt.args', get_qt_arguments()) +config.set('messages.timeout', 2500) config.set('content.images', True, 'chrome-devtools://*') config.set('content.images', True, 'devtools://*') @@ -56,12 +95,17 @@ config.set('content.notifications.enabled', False) config.set('content.notifications.enabled', True, '*://*.zoho.eu/*') config.set('content.notifications.enabled', True, '*://*.viperdev.io/*') config.set('content.notifications.enabled', True, '*://*.rgoncalves.se/*') +config.set('content.notifications.enabled', True, '*://app.slack.com/*') +config.set('content.notifications.enabled', True, '*://mail.google.com/*') config.set('content.register_protocol_handler', False) config.set('content.geolocation', False) -config.set('content.media.audio_video_capture', True, '*://*.zoho.eu/*') -config.set('content.media.audio_capture', True, '*://*.zoho.eu/*') -config.set('content.media.video_capture', True, '*://*.zoho.eu/*') +# config.set('content.media.audio_video_capture', True, '*://*.zoho.eu/*') +# config.set('content.media.audio_capture', True, '*://*.zoho.eu/*') +# config.set('content.media.video_capture', True, '*://*.zoho.eu/*') +config.set('content.media.audio_video_capture', True, 'https://meet.google.com/*') +config.set('content.media.audio_capture', True, 'https://meet.google.com/*') +config.set('content.media.video_capture', True, 'https://meet.google.com/*') config.set('completion.web_history.max_items', 0) config.set('tabs.background', True) @@ -92,13 +136,26 @@ config.set('content.prefers_reduced_motion', True) config.set('content.headers.referer', 'same-domain') config.set('url.default_page', 'https://lite.duckduckgo.com/lite/') config.set('url.start_pages', 'https://lite.duckduckgo.com/lite/') -config.set('url.searchengines', - {'DEFAULT': 'https://lite.duckduckgo.com/lite/?q={}'}) +config.set( + 'url.searchengines', {'DEFAULT': 'https://lite.duckduckgo.com/lite/?q={}'} +) config.set('downloads.location.directory', f'{os.environ["HOME"]}/downloads') +config.set('downloads.prevent_mixed_content', False) config.set('content.autoplay', False) config.set('content.cookies.accept', 'no-3rdparty') +config.set('content.javascript.alert', False) config.set('content.headers.do_not_track', False, '*://*.thetrainline.com/*') config.set('content.blocking.enabled', False, '*://*.thetrainline.com/*') config.set('content.cookies.accept', 'all', '*://*.thetrainline.com/*') + +config.set( + 'editor.command', ["st", "nvim", "+normal {line}G{column0}l", "{file}"] +) + +config.bind(',m', 'spawn mpv --force-window=immediate {url}') +config.bind('M', 'bookmark-save {url}') + +if socket.gethostname() == 'ws-work01': + config.set('fonts.default_size', '14pt') diff --git a/.config/qutebrowser/greasemonkey/boursorama-css.js b/.config/qutebrowser/greasemonkey/boursorama.js index 771bc38..771bc38 100755 --- a/.config/qutebrowser/greasemonkey/boursorama-css.js +++ b/.config/qutebrowser/greasemonkey/boursorama.js diff --git a/.config/qutebrowser/greasemonkey/density-github.js b/.config/qutebrowser/greasemonkey/density-github.js new file mode 100755 index 0000000..38ead9e --- /dev/null +++ b/.config/qutebrowser/greasemonkey/density-github.js @@ -0,0 +1,274 @@ +// ==UserScript== +// @name density github +// @match https://github.com/* +// @grant none +// ==/UserScript== + +GM_addStyle(` + .container-xl { + max-width: unset; + } + .py-lg-3 { + padding: 0 !important; + } + .py-2 { + padding-top: 3px !important; + padding-bottom: 3px !important; + } + .py-4 { + padding-top: 6px !important; + padding-bottom: 6px !important; + } + .py-6 { + padding-top: 9px !important; + padding-bottom: 9px !important; + } + .pt-3 { + padding-top: 4px !important; + } + .p-4 { + padding: 6px !important; + } + .p-2 { + padding: 2px !important; + } + .pt-6 { + padding-top: 10px !important; + } + .pb-2 { + padding-bottom: 2px !important; + } + .mt-6 { + margin-top: 10px !important; + } + .mt-4 { + margin-top: 6px !important; + } + .btn-sm, + .social-count { + padding: 1px 4px; + } + .btn { + padding: 1px 8px; + } + .p-3 { + padding: 4px !important; + } + .mt-2 { + margin-top: 2px !important; + } + .py-md-3 { + padding-top: 0 !important; + padding-bottom: 0 !important; + } + .px-3 { + padding-right: 4px !important; + padding-left: 4px !important; + } + .px-5 { + padding-right: 8px !important; + padding-left: 8px !important; + } + .mb-2 { + margin-bottom: 2px !important; + } + .mb-4 { + margin-bottom: 6px !important; + } + .mb-md-3 { + margin-bottom: 4px !important; + } + .mt-1 { + margin-top: 1px !important; + } + .mb-5 { + margin-bottom: 8px !important; + } + .mb-3 { + margin-bottom: 4px !important; + } + .mt-3 { + margin-top: 4px !important; + } + .mt-md-2 { + margin-top: 2px !important; + } + .my-md-2 { + margin-top: 2px !important; + margin-bottom: 2px !important; + } + .my-2 { + margin-top: 2px !important; + margin-bottom: 2px !important; + } + .my-3 { + margin-top: 4px !important; + margin-bottom: 4px !important; + } + .my-5 { + margin-top: 5px !important; + margin-bottom: 5px !important; + } + .my-6 { + margin-top: 7px !important; + margin-bottom: 7px !important; + } + .UnderlineNav-item { + padding: 0 16px; + line-height: unset; + } + .UnderlineNav { + min-height: 30px; + } + p { + margin-bottom: 3px; + } + .Box-header, + .Box-body, + .Box-row, + .Box-footer { + padding: 4px; + } + .form-control, + .form-select { + padding: 1px 3px; + } + .subnav-search-input { + padding-left: 32px; + } + .subnav-search-icon { + top: 4px; + } + .subnav-item { + padding: 1px 4px; + } + .protip { + margin-top: 5px; + } + .paginate-container { + margin-top: 4px; + margin-bottom: 4px; + } + .f1, + h1 { + font-size: 22px !important; + font-weight: bold; + } + .gh-header-actions { + margin: 0 !important; + } + .gh-header.issue .gh-header-meta { + margin-bottom: 4px; + } + .gh-header-meta { + padding-bottom: 4px; + } + .state, + .State { + padding: 1px 6px; + } + .pl-lg-5, + .px-lg-5 { + padding-right: 8px !important; + padding-left: 8px !important; + } + .timeline-comment-header-text { + padding-top: 2px; + padding-bottom: 2px; + } + .timeline-comment-action { + padding: 0; + } + .comment-body { + padding: 4px 8px; + } + .TimelineItem { + margin-left: 4px; + } + .TimelineItem-avatar { + left: -56px; + } + .gutter-lg { + margin: 0 !important; + } + .gutter-lg>[class*=col-] { + padding-right: 4px !important; + padding-left: 4px !important; + } + .BorderGrid { + margin-top: -4px !important; + } + .BorderGrid-cell { + padding-top: 4px !important; + padding-bottom: 4px !important; + } + .discussion-sidebar-item { + padding-top: 4px; + } + .discussion-sidebar-item+.discussion-sidebar-item { + margin-top: 4px; + } + .TimelineItem { + padding: 4px 0; + } + .timeline-comment-wrapper { + margin-top: 4px; + } + .tabnav-tab { + padding: 2px 4px; + } + .toolbar-item { + padding: 2px 4px; + } + .markdown-body blockquote, + .markdown-body details, + .markdown-body dl, + .markdown-body ol, + .markdown-body p, + .markdown-body pre, + .markdown-body table, + .markdown-body ul { + margin-bottom: 8px; + } + .markdown-body .highlight pre, + .markdown-body pre { + padding: 4px; + } + .py-3 { + padding-top: 4px !important; + padding-bottom: 4px !important; + } + .merge-pr { + margin: 5px 0 0; + } + .branch-action-item { + padding: 4px 4px 4px 44px; + } + .markdown-body h1, + .markdown-body h2, + .markdown-body h3, + .markdown-body h4, + .markdown-body h5, + .markdown-body h6 { + margin-top: 8px; + margin-bottom: 4px; + } + .input-sm { + min-height: unset; + } + svg.octicon.octicon-mark-github { + height: 27px; + } + .avatar-user { + border-radius: unset !important; + } + .Header { + padding: 0; + } + body { + line-height: unset; + } + .f1-light { + font-size: unset !important; + } +`) diff --git a/.config/qutebrowser/greasemonkey/density-gitlab.js b/.config/qutebrowser/greasemonkey/density-gitlab.js new file mode 100755 index 0000000..73f7936 --- /dev/null +++ b/.config/qutebrowser/greasemonkey/density-gitlab.js @@ -0,0 +1,425 @@ +// ==UserScript== +// @name density gitlab +// @match https://gitlab.com/* +// @match https://gitlab.infra.online.net/* +// @grant none +// ==/UserScript== + +GM_addStyle(` + .sidebar-sub-level-items > li a { + padding: 2px 8px 2px 20px; + } + .nav-sidebar li a { + padding: 6px 8px; + } + .nav-sidebar { + width: 180px; + } + .toggle-sidebar-button, + .close-nav-button { + width: 180px; + } + .page-with-contextual-sidebar { + padding-left: 180px; + } + .content-wrapper .container-fluid, + .content-wrapper .container-sm, + .content-wrapper .container-md, + .content-wrapper .container-lg, + .content-wrapper .container-xl { + padding: 0 8px; + } + .navbar-gitlab { + height: 26px; + min-height: unset; + } + .content-wrapper { + margin-top: 26px; + } + body { + line-height: 1; + } + .breadcrumbs-container { + padding-top: 0; + padding-bottom: 0; + } + .breadcrumbs { + min-height: unset; + } + .nav-links:not(.quick-links) li:not(.md-header-toolbar) a, + .nav-links:not(.quick-links) li:not(.md-header-toolbar) button { + line-height: 1; + padding: 0 10px; + } + .btn, + .project-buttons .stat-text { + padding: 0 10px; + } + .row-content-block { + padding: 4px; + } + .form-control, + .search form { + padding: 0; + } + .filtered-search-box .form-control, + .filtered-search-box .search form, + .search .filtered-search-box form { + height: unset; + } + .board-labels-toggle-wrapper, + .board-swimlanes-toggle-wrapper { + height: unset; + } + .pt-3, + .py-3 { + padding: 0 !important; + } + .board-title { + padding: 0; + } + .gl-button.gl-button.btn-icon, + .gl-button.gl-button.btn-block.btn-icon, + .login-page input.gl-button.gl-button.btn-icon[type='submit'] { + padding: .5em; + } + .p-3 { + padding: 3px !important; + } + .gl-mt-2 { + margin-top: unset; + } + .gl-mr-3 { + margin-top: unset; + } + .board-card-title { + font-size: 12px; + } + .board-card-footer { + position: absolute; + top: 0; + right: 0; + background: rgba(255,255,255,0.8); + } + .boards-list { + height: unset; + } + .context-header>a, + .context-header>button { + padding: 0; + } + .identicon.s40 { + line-height: unset; + } + .avatar-container.s40 { + min-height: unset; + } + .s40.avatar, + .s40.avatar-container { + height: unset; + width: 30px; + } + .group-home-panel, + .project-home-panel { + padding: 0; + } + .gl-mb-3 { + margin-bottom: 0; + } + .gl-banner { + padding: 0; + height: 65px; + overflow: auto; + } + .gl-banner-content > * { + margin: 0; + } + .tree-holder .add-to-tree { + padding: 1px; + } + .breadcrumb.repo-breadcrumb { + line-height: unset; + } + .commit { + min-height: unset !important; + } + .clipboard-group .label, + .clipboard-group .btn, + .clipboard-group .project-buttons .stat-text, + .project-buttons .clipboard-group .stat-text, + .commit-sha-group .label, + .commit-sha-group .btn, + .commit-sha-group .project-buttons .stat-text, + .project-buttons .commit-sha-group .stat-text { + padding: 1px; + } + .info-well { + margin: 0; + } + .tree-holder .nav-block { + margin: 5px; + } + table.table tr td, + .md table:not(.code) tr td, + table.table tr th, + .md table:not(.code) tr th { + padding: 3px; + } + .container-limited.limit-container-width { + max-width: unset; + } + .limit-container-width .detail-page-header, + .limit-container-width .page-content-header, + .limit-container-width .commit-box, + .limit-container-width .info-well, + .limit-container-width .commit-ci-menu, + .limit-container-width .files-changed-inner, + .limit-container-width .limited-header-width, + .limit-container-width .limited-width-notes { + max-width: unset; + } + .container-limited { + max-width: unset; + } + .info-well .well-segment { + padding: 2px; + } + .blob-content-holder { + margin-top: unset; + } + .file-title-flex-parent, + .file-holder .file-title-flex-parent { + padding: 0; + } + ul.content-list>li { + padding: 3px 0; + } + .dropdown-toggle, + .dropdown-menu-toggle, + .confidential-merge-request-fork-group .dropdown-toggle, + .confidential-merge-request-fork-group .dropdown-menu-toggle { + padding: 2px; + } + .dropdown-menu-toggle .fa-chevron-down, + .dropdown-menu-toggle .fa-spinner { + top: 3px; + } + .form-control, + .search form { + height: unset; + } + .issues-list .issue { + padding: 3px 0 0 0; + } + .manage-labels-list>li:not(.empty-message):not(.no-border) { + padding: 1px; + } + .input-group-prepend .btn, + .input-group-prepend .project-buttons .stat-text, + .project-buttons .input-group-prepend .stat-text, + .input-group-append .btn, + .input-group-append .project-buttons .stat-text, + .project-buttons .input-group-append .stat-text { + padding: 0; + } + .labels-container { + padding: 0; + } + .prioritized-labels { + margin-bottom: 0; + } + .identicon.s64 { + font-size: unset; + line-height: unset; + } + .avatar-container.s64 { + min-height: unset; + } + .s64.avatar, + .s64.avatar-container { + height: unset; + max-height: 32px; + width: auto; + } + .group-home-panel .home-panel-avatar, + .project-home-panel .home-panel-avatar { + height: unset; + } + .project-repo-buttons .home-panel-action-button, + .project-repo-buttons .project-action-button { + margin: 0; + } + .project-repo-buttons .count-buttons { + margin: 0; + } + .home-panel-title-row > * { + flex-direction: row !important; + } + .home-panel-title { + margin: 0; + } + .project-stats .nav .stat-text, + .project-stats .nav .stat-link, + .project-buttons .nav .stat-text, + .project-buttons .nav .stat-link { + padding: 0; + } + .project-stats .nav .btn, + .project-stats .nav .project-buttons .stat-text, + .project-buttons .project-stats .nav .stat-text, + .project-buttons .nav .btn, + .project-buttons .nav .stat-text { + padding: 0; + margin-top: 0; + } + .event-item { + padding: 0 0 0 40px; + } + .limit-container-width .issuable-details .detail-page-description, + .limit-container-width .issuable-details .mr-source-target, + .limit-container-width .issuable-details .mr-state-widget, + .limit-container-width .issuable-details .merge-manually { + max-width: unset; + } + .right-sidebar .block { + padding: 3px; + } + .right-sidebar .title { + margin-bottom: 0; + } + .issuable-details .title { + margin-bottom: 0; + } + .gl-mb-6 { + margin-bottom: 0; + } + .detail-page-description { + padding: unset; + } + .card-header { + padding: 0 16px; + } + .gl-p-3-deprecated-no-really-do-not-use-me { + padding: 3px 16px; + } + h4, + .h4, + h5, + .h5, + h6, + .h6 { + margin-bottom: unset; + } + .pt-2, + .py-2 { + padding-top: 0 !important; + } + .pb-2, + .py-2 { + padding-bottom: 0 !important; + } + .note-wrapper { + padding: 4px; + } + .notes.timeline > .timeline-entry { + margin: 8px 0; + } + .md blockquote, + .md .blockquote { + padding: 2px 12px; + margin: 4px 0; + } + .md p { + margin: 0 0 6px; + } + p { + margin-bottom: 0.5rem; + } + .page-content-header { + padding: 0; + } + .commit-box { + padding: 4px 0; + } + .content-block { + padding: 0; + } + .content-block.oneline-block { + line-height: 20px; + } + .limit-container-width .issuable-details .detail-page-description, + .limit-container-width .issuable-details .mr-source-target, + .limit-container-width .issuable-details .mr-state-widget, + .limit-container-width .issuable-details .merge-manually { + max-width: unset; + } + .build-page .top-bar { + height: unset; + min-height: 21px; + padding: unset; + top: 26px; + } + .gl-filtered-search-scrollable { + padding: 0; + } + .gl-filtered-search-term-input, + .gl-filtered-search-token-segment { + height: unset; + } + .gl-toggle { + height: 1rem; + } + .gl-toggle .toggle-icon { + top: unset; + } + .gl-py-5 { + padding: 0; + } + .board-title { + height: unset; + } + .gl-p-5 { + padding: 4px; + } + .board-card:not(:last-child) { + margin-bottom: 2px; + } + .gl-px-3 { + padding: 0 2px; + } + .gl-tab-nav-item { + padding: 2px; + } + ul.content-list.issuable-list>li, + ul.content-list.todos-list>li, + .card>.content-list>li { + padding: 3px 0 0 0; + } + .md table:not(.code) tr td, + .md table:not(.code) tr th, + table.table:not(.gl-table) tr td, + table.table:not(.gl-table) tr th { + line-height: unset; + padding: 3px; + } + .project-last-commit { + min-height: unset; + } + + .merge-request-tabs-container .merge-request-tabs, + .limit-container-width .merge-request-tabs-container { + max-height: 2em; + } + .limit-container-width .merge-request-tabs-container { + margin-left: 0em; + margin-top: .5em; + margin-bottom: .5em; + } + .merge-request-tabs-holder { + padding-top: .5em; + top: var(--header-height, 26px); + } + .diff-file.has-body .file-title + --initial-top: calc(var(--header-height, 48px) + 28px) !important; + } +`) diff --git a/.config/qutebrowser/greasemonkey/density-stackexchange.js b/.config/qutebrowser/greasemonkey/density-stackexchange.js new file mode 100755 index 0000000..8ed5776 --- /dev/null +++ b/.config/qutebrowser/greasemonkey/density-stackexchange.js @@ -0,0 +1,147 @@ + +// ==UserScript== +// @name density-userstyle +// @match https://*.stackexchange.com/* +// @match https://*.stackoverflow.com/* +// @match https://*.askubuntu.com/* +// @match https://*.superuser.com/* +// @grant none +// ==/UserScript== + +GM_addStyle(` + #mainbar, + .mainbar { + width: calc(100% - 230px - var(--su-static24)); + } + #sidebar { + width: 230px !important; + } + .question table, + .answer table { + table-layout: fixed; + width: 100%; + } + .js-comment-form-layout td:last-child { + width: 115px; + } + .js-comment-form-layout textarea { + padding: 0; + width: 100% !important; + } + .comments > table > tfoot > tr:first-child > td:first-child, + .comments > table > tbody > tr:first-child > td:first-child { + width: 15px; + } + #content, + .inner-content, + .answer, + #answers, + .post-text, + .comments, + #answers-header, + .post-editor, + #wmd-preview, + #questions, + #header, + .container { + width: initial !important; + max-width: initial !important; + } + .wmd-ybutton-bar, + .wmd-input, + .grippie { + width: 100% !important; + } + .grippie { + background-position: 50% -364px !important; + } + .votecell { + width: 45px; + } + .page { + width: unset; + } + body { + --su24: 8px; + padding-top: 25px; + --lh-md: var(--lh-md); + --lh-lg: var(--lh-md); + --lh-xl: var(--lh-md); + --lh-xxl: var(--lh-md); + } + .s-navigation .s-navigation--item { + padding: 2px 8px; + } + .s-input, + .s-textarea { + padding: unset; + } + .s-topbar .s-topbar--content .s-topbar--item__unset, + .s-btn, + .s-btn.s-btn__xs { + padding: 2px 8px; + } + .s-topbar { + height: unset; + } + .mb8 { + margin-bottom: 2px !important; + } + .mb16 { + margin-bottom: 4px !important; + } + .mt16 { + margin-top: 4px !important; + } + #answers { + padding-top: unset; + } + .space { + padding-top: 4px; + } + .s-sidebarwidget--header { + padding: 2px; + } + .s-sidebarwidget--item { + margin: 2px; + padding: 0 !important; + } + .s-sidebarwidget--content, + .s-sidebarwidget--content.s-sidebarwidget__items { + padding: 4px; + } + .py16 { + padding-top: 2px !important; + padding-bottom: 2px !important; + } + #sidebar h4, + .sidebar h4 { + margin-bottom: unset; + } + .mb24, + .mb12 { + margin-bottom: 4px !important; + } + .mt8 { + margin-top: 2px !important; + } + .s-post-summary { + padding: 4px; + } + .s-card { + padding: 4px; + } + .subtabs a, + .filter a { + padding: 2px; + } + .user-info { + padding: 2px; + } + .p12 { + padding: 2px !important; + } + .g8 { + gap: 2px; + } +`) diff --git a/.config/qutebrowser/greasemonkey/fandom-to-breezewiki.js b/.config/qutebrowser/greasemonkey/fandom-to-breezewiki.js new file mode 100755 index 0000000..59369f5 --- /dev/null +++ b/.config/qutebrowser/greasemonkey/fandom-to-breezewiki.js @@ -0,0 +1,21 @@ +// ==UserScript== +// @name fandom to breezewiki +// @match *://*.fandom.com/* +// @grant none +// @run-at document-start +// ==/UserScript== + +BREEZEWIKI_INSTANCE = "breezewiki.pussthecat.org" + +url = location.href +url = url.replace(/\bwww\.\b/, "") +host = location.hostname +path = location.pathname +if (url.includes("/wiki/")) { + // this is bad + location.href = "https://" + BREEZEWIKI_INSTANCE + "/" + host.split(".")[0] + path +} +else { + url = url.replace("fandom.com", BREEZEWIKI_ISNTANCE) + location.href = url +} diff --git a/.config/qutebrowser/greasemonkey/gensdeconfiance.js b/.config/qutebrowser/greasemonkey/gensdeconfiance.js new file mode 100755 index 0000000..8e62a30 --- /dev/null +++ b/.config/qutebrowser/greasemonkey/gensdeconfiance.js @@ -0,0 +1,8 @@ +// ==UserScript== +// @name gensdeconfiance +// @match https://gensdeconfiance.com/* +// @run-at document-end +// @grant none +// ==/UserScript== + +document.getElementById('react-paywall').remove() diff --git a/.config/qutebrowser/greasemonkey/github-css.js b/.config/qutebrowser/greasemonkey/github-css.js deleted file mode 100755 index 3b954b2..0000000 --- a/.config/qutebrowser/greasemonkey/github-css.js +++ /dev/null @@ -1,14 +0,0 @@ -// ==UserScript== -// @name github css -// @match *://github.com/* -// @match *://gist.github.com/* -// @grant none -// ==/UserScript== - -/* -GM_addStyle(` - *, .BtnGroup-item { - border-radius: 0px !important; - } -`) -*/ diff --git a/.config/qutebrowser/greasemonkey/gitlab.js b/.config/qutebrowser/greasemonkey/gitlab.js new file mode 100755 index 0000000..5ebb8a3 --- /dev/null +++ b/.config/qutebrowser/greasemonkey/gitlab.js @@ -0,0 +1,18 @@ +// ==UserScript== +// @name gitlab +// @match *://*/* +// @run-at document-end +// @grant none +// ==/UserScript== + +(async function unwrap(subgroups) { + await new Promise(resolve => setTimeout(resolve, 600)); + for (subgroup of subgroups) { + if (! subgroup.classList.contains("has-children")) { + continue; + } + subgroup.click() + unwrap(subgroup.getElementsByClassName("group-row has-children")); + } + return +})(document.getElementsByClassName("group-row has-children")); diff --git a/.config/qutebrowser/greasemonkey/glassdoor-css.js b/.config/qutebrowser/greasemonkey/glassdoor.js index ad82b26..664448c 100755 --- a/.config/qutebrowser/greasemonkey/glassdoor-css.js +++ b/.config/qutebrowser/greasemonkey/glassdoor.js @@ -1,19 +1,23 @@ // ==UserScript== // @name glassdoor // @match https://*.glassdoor.com/* +// @match https://*.glassdoor.ch/* +// @match https://*.glassdoor.fr/* +// @run-at document-end // @grant none // ==/UserScript== window.addEventListener('load', function () { window.onscroll = null; + console.log('bbbbbbbbbbbbbb'); }) window.addEventListener('load', function() { let functions = [ - () => document.getElementById("ContentWallHardsell").remove(), - () => document.getElementsByTagName('body')[0].style.removeProperty("overflow"), - () => document.addEventListener("scroll", event => event.stopPropagation(), true), - () => document.addEventListener("mousemove", event => event.stopPropagation(), true), + () => document.getElementById('HardsellOverlay').remove(), + () => document.getElementsByTagName('body')[0].style.removeProperty('overflow'), + () => document.addEventListener('scroll', event => event.stopPropagation(), true), + () => document.addEventListener('mousemove', event => event.stopPropagation(), true), ]; functions.forEach(f => f()); }); diff --git a/.config/qutebrowser/greasemonkey/google.js b/.config/qutebrowser/greasemonkey/google.js new file mode 100755 index 0000000..44acf47 --- /dev/null +++ b/.config/qutebrowser/greasemonkey/google.js @@ -0,0 +1,20 @@ +// ==UserScript== +// @name custom google +// @match https://www.google.com/* +// @grant none +// ==/UserScript== + +(function() { + 'use strict'; + + document.querySelectorAll('.ads-ad').forEach(function(e){ + e.remove(); + }); +})(); + +GM_addStyle(` + * { + // font-size: .98em !important; + // font-family: monospace, monospace !important; + } +`) diff --git a/.config/qutebrowser/greasemonkey/imgur-to-imgin.js b/.config/qutebrowser/greasemonkey/imgur-to-imgin.js index d4ac434..1263eb5 100755 --- a/.config/qutebrowser/greasemonkey/imgur-to-imgin.js +++ b/.config/qutebrowser/greasemonkey/imgur-to-imgin.js @@ -5,4 +5,4 @@ // @run-at document-start // ==/UserScript== -top.location.hostname = "imgin.voidnet.tech"; +// top.location.hostname = "imgin.voidnet.tech"; diff --git a/.config/qutebrowser/greasemonkey/imgur-to-rimgo.js b/.config/qutebrowser/greasemonkey/imgur-to-rimgo.js new file mode 100755 index 0000000..d0735cb --- /dev/null +++ b/.config/qutebrowser/greasemonkey/imgur-to-rimgo.js @@ -0,0 +1,8 @@ +// ==UserScript== +// @name imgur to rimgo +// @match *://imgur.com/* +// @grant none +// @run-at document-start +// ==/UserScript== + +top.location.hostname = "rimgo.pussthecat.org"; diff --git a/.config/qutebrowser/greasemonkey/instagram-to-bibliogram.js b/.config/qutebrowser/greasemonkey/instagram-to-bibliogram.js deleted file mode 100755 index a608059..0000000 --- a/.config/qutebrowser/greasemonkey/instagram-to-bibliogram.js +++ /dev/null @@ -1,8 +0,0 @@ -// ==UserScript== -// @name instagram to biliogram -// @match *://*.instagram.com/* -// @grant none -// @run-at document-start -// ==/UserScript== - -top.location.hostname = "bibliogram.art"; diff --git a/.config/qutebrowser/greasemonkey/linkedin.js b/.config/qutebrowser/greasemonkey/linkedin.js new file mode 100755 index 0000000..d0eb289 --- /dev/null +++ b/.config/qutebrowser/greasemonkey/linkedin.js @@ -0,0 +1,64 @@ +// ==UserScript== +// @name linkedin css +// @match *://*.linkedin.com/* +// @grant none +// @inject-into content +// ==/UserScript== + +(function() { + 'use strict'; + + // Selectors + const storySelector = '.feed-shared-update-v2'; + const descriptionSelector = '.update-components-text-view'; + + // Search strings + const searchStrings = { + 'da': ['Promoveret'], + 'en': ['Promoted'], + 'es': ['Promocionado'], + 'fr': ['Post sponsorisé'] + }; + + const language = searchStrings.hasOwnProperty(document.documentElement.lang) ? document.documentElement.lang : 'en'; + + function blockSponsoredPosts() { + const stories = document.querySelectorAll(storySelector); + for (const story of stories) { + + // console.log('Handling story', story); + // if (story.style.display == 'none') { + // continue; + // } + + const descriptions = story.querySelectorAll(descriptionSelector); + console.debug('Found descriptions', descriptions); + + for (const description of descriptions) { + console.debug('Handling description', description); + + const descriptionContent = description.innerText.trim(); + if (searchStrings[language].find(searchString => searchString == descriptionContent)) { + + console.debug('Blocked sponsored story', story); + story.style.display = 'none'; + } + } + } + } + + const observer = new MutationObserver(blockSponsoredPosts); + observer.observe(document.body, { + 'childList': true, + 'subtree': true + }); + + blockSponsoredPosts(); + + GM_addStyle(` + .scaffold-layout__aside { + visibility: hidden; + } + `) + +})(); diff --git a/.config/qutebrowser/greasemonkey/minimal-css.js b/.config/qutebrowser/greasemonkey/minimal-css.js deleted file mode 100755 index 1fe1414..0000000 --- a/.config/qutebrowser/greasemonkey/minimal-css.js +++ /dev/null @@ -1,16 +0,0 @@ -// ==UserScript== -// @name minimal css -// @match *://www.google.com -// @match *://www.google.com/search* -// @match *://cliq.zoho.eu/chats/* -// @match *://www.pinterest.com/* -// @grant none -// ==/UserScript== - -GM_addStyle(` - * { - border-radius: 0px !important; - transition: none !important; - animation: none !important; - } -`) diff --git a/.config/qutebrowser/greasemonkey/no-sticky-headers.js b/.config/qutebrowser/greasemonkey/no-sticky-headers.js deleted file mode 100755 index e5eefa1..0000000 --- a/.config/qutebrowser/greasemonkey/no-sticky-headers.js +++ /dev/null @@ -1,15 +0,0 @@ -// ==UserScript== -// @name no sticky header -// @match *://*.substack.com/* -// @grant none -// ==/UserScript== - -(function () { - var i, elements = document.querySelectorAll('body *'); - - for (i = 0; i < elements.length; i++) { - if (getComputedStyle(elements[i]).position === 'fixed') { - elements[i].parentNode.removeChild(elements[i]); - } - } -})(); diff --git a/.config/qutebrowser/greasemonkey/rarbg.js b/.config/qutebrowser/greasemonkey/rarbg.js new file mode 100755 index 0000000..cb99969 --- /dev/null +++ b/.config/qutebrowser/greasemonkey/rarbg.js @@ -0,0 +1,12 @@ +// ==UserScript== +// @name rarbg css +// @match *://rarbg.to/* +// @match *://rarbgaccessed.org/* +// @grant none +// ==/UserScript== + +GM_addStyle(` + div:last-of-type { + z-index: -1 !important; + } +`) diff --git a/.config/qutebrowser/greasemonkey/scaleway-css.js b/.config/qutebrowser/greasemonkey/scaleway.js index 99955ca..99955ca 100755 --- a/.config/qutebrowser/greasemonkey/scaleway-css.js +++ b/.config/qutebrowser/greasemonkey/scaleway.js diff --git a/.config/qutebrowser/greasemonkey/scribe-css.js b/.config/qutebrowser/greasemonkey/scribe.js index 60fc0e2..60fc0e2 100755 --- a/.config/qutebrowser/greasemonkey/scribe-css.js +++ b/.config/qutebrowser/greasemonkey/scribe.js diff --git a/.config/qutebrowser/greasemonkey/stackoverflow-css.js b/.config/qutebrowser/greasemonkey/stackoverflow.js index 6c98466..6c98466 100755 --- a/.config/qutebrowser/greasemonkey/stackoverflow-css.js +++ b/.config/qutebrowser/greasemonkey/stackoverflow.js diff --git a/.config/qutebrowser/greasemonkey/teddit.js b/.config/qutebrowser/greasemonkey/teddit.js new file mode 100755 index 0000000..2e9c829 --- /dev/null +++ b/.config/qutebrowser/greasemonkey/teddit.js @@ -0,0 +1,23 @@ +// ==UserScript== +// @name yewtube +// @match *://*.teddit.net/* +// @match *://teddit.net/* +// @grant none +// @run-at document-start +// ==/UserScript== + +document.cookie = "post_media_max_height=medium"; +document.cookie = "flairs=true"; +document.cookie = "highlight_controversial=true"; +document.cookie = "show_upvotes=true"; +document.cookie = "collapse_child_comments=false"; +document.cookie = "nsfw_enabled=false"; +document.cookie = "show_upvoted_percentage=false"; +document.cookie = "videos_muted=true"; +document.cookie = "show_large_gallery_images=true"; +document.cookie = "domain_twitter="; +document.cookie = "domain_youtube="; +document.cookie = "domain_instagram="; +document.cookie = "prefer_frontpage=true"; +document.cookie = "default_comment_sort=best"; +document.cookie = "theme=white"; diff --git a/.config/qutebrowser/greasemonkey/unsplash.js b/.config/qutebrowser/greasemonkey/unsplash.js new file mode 100755 index 0000000..7d65781 --- /dev/null +++ b/.config/qutebrowser/greasemonkey/unsplash.js @@ -0,0 +1,23 @@ +// ==UserScript== +// @name custom unsplash +// @match https://unsplash.com/* +// @grant none +// @run-at document-end +// ==/UserScript== + +(function() { + 'use strict'; + + document.querySelectorAll('[data-ad="true"]').forEach(function(e){ + console.log("AAAAAAAA"); + e.remove(); + }); +})(); + +GM_addStyle(` + div[data-ad="true"], div[data-test="AffiliatesGrid-Content"] { + visibility: hidden; + width: 0; + height: 0; + } +`) diff --git a/.config/qutebrowser/greasemonkey/yewtube.js b/.config/qutebrowser/greasemonkey/yewtube.js new file mode 100755 index 0000000..c9f592b --- /dev/null +++ b/.config/qutebrowser/greasemonkey/yewtube.js @@ -0,0 +1,9 @@ +// ==UserScript== +// @name yewtube +// @match *://*.yewtu.be/* +// @match *://yewtu.be/* +// @grant none +// @run-at document-start +// ==/UserScript== + +document.cookie = "PREFS=%7B%22annotations%22%3Atrue%2C%22annotations_subscribed%22%3Afalse%2C%22autoplay%22%3Atrue%2C%22automatic_instance_redirect%22%3Atrue%2C%22captions%22%3A%5B%22%22%2C%22%22%2C%22%22%5D%2C%22comments%22%3A%5B%22youtube%22%2C%22reddit%22%5D%2C%22continue%22%3Afalse%2C%22continue_autoplay%22%3Atrue%2C%22dark_mode%22%3A%22light%22%2C%22latest_only%22%3Afalse%2C%22listen%22%3Afalse%2C%22local%22%3Atrue%2C%22watch_history%22%3Afalse%2C%22vr_mode%22%3Atrue%2C%22show_nick%22%3Afalse%2C%22locale%22%3A%22en-US%22%2C%22region%22%3A%22US%22%2C%22max_results%22%3A40%2C%22notifications_only%22%3Afalse%2C%22player_style%22%3A%22invidious%22%2C%22quality%22%3A%22dash%22%2C%22quality_dash%22%3A%221080p%22%2C%22default_home%22%3A%22%22%2C%22feed_menu%22%3A%5B%22Popular%22%2C%22Trending%22%5D%2C%22related_videos%22%3Atrue%2C%22sort%22%3A%22published%22%2C%22speed%22%3A1.0%2C%22thin_mode%22%3Afalse%2C%22unseen_only%22%3Afalse%2C%22video_loop%22%3Afalse%2C%22extend_desc%22%3Afalse%2C%22volume%22%3A50%2C%22save_player_pos%22%3Afalse%7D" diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf index 9e77b7c..f02e9ab 100755 --- a/.config/tmux/tmux.conf +++ b/.config/tmux/tmux.conf @@ -4,7 +4,9 @@ set-option -g mouse off set-option -g mode-keys vi set-option -g escape-time 0 set-option -g default-terminal "screen-256color" +set-option -g renumber-windows on set-option -g history-limit 5000 +set-option -g xterm-keys on set -s escape-time 0 # keybindings @@ -12,3 +14,5 @@ bind-key ` last-window bind-key j next-window bind-key k previous-window bind-key e send-prefix + +# bind -n DoubleClick1Pane run-shell "dragon-drop -x '#{pane_current_path}/#{mouse_word}'" diff --git a/.config/user-dirs.dirs b/.config/user-dirs.dirs index 0e54d8c..a529fd4 100755 --- a/.config/user-dirs.dirs +++ b/.config/user-dirs.dirs @@ -1,15 +1,8 @@ -# This file is written by xdg-user-dirs-update -# If you want to change or add directories, just edit the line you're -# interested in. All local changes will be retained on the next run. -# Format is XDG_xxx_DIR="$HOME/yyy", where yyy is a shell-escaped -# homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an -# absolute path. No other format is supported. -# XDG_DOWNLOAD_DIR="$HOME/downloads" -XDG_DOCUMENTS_DIR="$HOME/" -XDG_MUSIC_DIR="$HOME/" +XDG_DOCUMENTS_DIR="$HOME/docs" +XDG_MUSIC_DIR="$HOME/music" XDG_PICTURES_DIR="$HOME/pictures" XDG_DESKTOP_DIR="$HOME/" XDG_TEMPLATES_DIR="$HOME/" -XDG_PUBLICSHARE_DIR="$HOME/" +XDG_PUBLICSHARE_DIR="$HOME/mnt" XDG_VIDEOS_DIR="$HOME/" diff --git a/.config/virt-lightning/config.ini b/.config/virt-lightning/config.ini new file mode 100755 index 0000000..b6649cd --- /dev/null +++ b/.config/virt-lightning/config.ini @@ -0,0 +1,8 @@ +[main] +libvirt_uri = qemu:///system +root_password = root +storage_pool = virt-lightning +network_name = virt-lightning +network_cidr = 192.168.123.0/24 +network_auto_clean_up = True +ssh_key_file = ~/.ssh/id_ed25519.pub diff --git a/.config/xsuspender.conf b/.config/xsuspender.conf new file mode 100755 index 0000000..c514998 --- /dev/null +++ b/.config/xsuspender.conf @@ -0,0 +1,123 @@ +# Configuration file for xsuspender. +# +# Sections represent rules windows are matched with. +# Find full documentation in xsuspender(1) manual. +# +# [Example] +# # Window matching rules. Some can be left blank. +# # Intersection of non-blanks applies. +# match_wm_class_contains = SomeApplication +# match_wm_class_group_contains = ... +# match_wm_name_contains = Part of Some Window Title +# +# # Seconds to wait before suspending after window loses focus. +# suspend_delay = 10 +# +# # Resume suspended process every this many seconds … +# resume_every = 50 +# +# # … for this many seconds. +# resume_for = 5 +# +# # Before suspending, execute this shell script. If it fails, +# # abort suspension. +# exec_suspend = echo "suspending window $XID of process $PID" +# +# # Before resuming, execute this shell script. Resume the +# # process regardless script failure. +# exec_resume = echo resuming ... +# +# # Whether to send SIGSTOP / SIGCONT signals or not. If false, +# # just the exec_* scripts are run. +# send_signals = true +# +# # Also suspend descendant processes that match this regex. +# suspend_subtree_pattern = . +# +# # Whether to apply the rule only when on battery power. +# only_on_battery = true +# +# # Whether to auto-apply rules when switching to battery +# # power even if the window(s) didn't just lose focus. +# auto_suspend_on_battery = true +# +# # Limit CPU consumption for this factor when on battery power. +# # Value 1 means 50% decrease, 2 means 66%, 3 75% etc. +# downclock_on_battery = 0 +# +# +# Values set in the Default section are inherited and overridden +# by other sections below. + +[Default] +suspend_delay = 5 +resume_every = 50 +resume_for = 5 +send_signals = true +only_on_battery = true +auto_suspend_on_battery = true +downclock_on_battery = 0 + +# Preset configuration for some common software. + +[Chromium] +suspend_delay = 10 +match_wm_class_contains = chromium +suspend_subtree_pattern = chromium + +[Firefox] +suspend_delay = 10 +match_wm_class_contains = Navigator +match_wm_class_group_contains = Firefox +suspend_subtree_pattern = \/(firefox|plugin-container) + +[JetBrains IDEs] +match_wm_class_group_contains = jetbrains- +downclock_on_battery = 1 + +[VirtualBox] +match_wm_class_contains = VirtualBox +match_wm_name_contains = - Oracle VM +exec_suspend = VBoxManage controlvm "$(ps -o args= -q $PID | sed -E 's/.*--startvm ([^ ]+).*/\1/')" pause +exec_resume = VBoxManage controlvm "$(ps -o args= -q $PID | sed -E 's/.*--startvm ([^ ]+).*/\1/')" resume +send_signals = false +resume_every = 0 +only_on_battery = false +downclock_on_battery = 1 + +[qBittorrent] +match_wm_class_contains = qbittorrent +resume_every = 5 +resume_for = 1 +suspend_delay = 60 + +[Pidgin] +match_wm_class_contains = Pidgin +resume_every = 1 +resume_for = 1 +downclock_on_battery = 2 + +[Clementine] +match_wm_class_contains = clementine +downclock_on_battery = 1 +send_signals = false + +[Rambox] +resume_every = 30 +match_wm_class_contains = rambox +suspend_subtree_pattern = .* + +#[MyApplication] +#match_wm_name_contains = +#match_wm_class_contains = +#match_wm_class_group_contains = +#suspend_delay = 10 +#resume_every = 50 +#resume_for = 5 +#exec_suspend = +#exec_resume = +#suspend_subtree_pattern = +#send_signals = true +#only_on_battery = true +#auto_suspend_on_battery = true +#downclock_on_battery = 0 diff --git a/.mbsyncrc b/.mbsyncrc new file mode 100755 index 0000000..943fe7c --- /dev/null +++ b/.mbsyncrc @@ -0,0 +1,21 @@ +IMAPAccount personal +Host imap.mailbox.org +UserCmd "echo ${MAIL_USERNAME}@${MAIL_SERVER}" +PassCmd "echo ${MAIL_PASSWORD}" +SSLType IMAPS + +IMAPStore personal-remote +Account personal + +MaildirStore personal-local +SubFolders Verbatim +Path ~/.local/share/mail/personal/ +Inbox ~/.local/share/mail/personal/INBOX + +Channel personal +Far :personal-remote: +Near :personal-local: +Patterns * +Create Both +Expunge Both +SyncState * @@ -0,0 +1 @@ +prefix=/home/qwd/.local/npm diff --git a/.weechat/buflist.conf b/.weechat/buflist.conf index 99bd851..b56726d 100755 --- a/.weechat/buflist.conf +++ b/.weechat/buflist.conf @@ -6,25 +6,25 @@ # # Use commands like /set or /fset to change settings in WeeChat. # -# For more info, see: https://weechat.org/doc/quickstart +# For more info, see: https://weechat.org/doc/quickstart/ # [look] add_newline = on auto_scroll = 50 -display_conditions = "${buffer.hidden}==0" +display_conditions = "${bar_item.name} == buflist && (${buffer.hidden} == || ${plugins.var.buflist.look.show_hidden_buffers} !=) && (${type} !~ ^(channel|private)$ || ${type} =~ ^(channel|private)$ && ${buffer[${if:${plugin}==irc?${info:irc_buffer,${irc_server.name}}:${info:slack_matrix_server_search,${buffer}}}].local_variables.fold}==) || ${bar_item.name} == buflist2 && ${buffer.local_variables.control_buffer} != || ${bar_item.name} == buflist3 && ${buffer.local_variables.control_buffer2} !=" enabled = on mouse_jump_visited_buffer = off mouse_move_buffer = on mouse_wheel = on nick_prefix = off nick_prefix_empty = on -signals_refresh = "" +signals_refresh = "irc_server_connected,relay_client_connected,relay_client_disconnected" sort = "number,-active" -use_items = 1 +use_items = 3 [format] -buffer = "${format_number}${indent}${format_nick_prefix}${color_hotlist}${name}${buffer.nick}" +buffer = "${format_number}${indent}${format_nick_prefix}${color_hotlist}${format_name}" buffer_current = "${color:,blue}${format_buffer}" hotlist = " ${color:green}(${hotlist}${color:green})" hotlist_highlight = "${color:magenta}" diff --git a/.weechat/fset.conf b/.weechat/fset.conf index 3d7a814..1b52d85 100755 --- a/.weechat/fset.conf +++ b/.weechat/fset.conf @@ -6,7 +6,7 @@ # # Use commands like /set or /fset to change settings in WeeChat. # -# For more info, see: https://weechat.org/doc/quickstart +# For more info, see: https://weechat.org/doc/quickstart/ # [look] diff --git a/.weechat/logger.conf b/.weechat/logger.conf index 37c02b4..3a66f92 100755 --- a/.weechat/logger.conf +++ b/.weechat/logger.conf @@ -6,7 +6,7 @@ # # Use commands like /set or /fset to change settings in WeeChat. # -# For more info, see: https://weechat.org/doc/quickstart +# For more info, see: https://weechat.org/doc/quickstart/ # [look] @@ -29,6 +29,9 @@ nick_prefix = "" nick_suffix = "" path = "${weechat_data_dir}/logs" replacement_char = "_" +rotation_compression_level = 20 +rotation_compression_type = none +rotation_size_max = "0" time_format = "%Y-%m-%d %H:%M:%S" [level] diff --git a/.weechat/weechat.conf b/.weechat/weechat.conf deleted file mode 100755 index 53e2776..0000000 --- a/.weechat/weechat.conf +++ /dev/null @@ -1,704 +0,0 @@ -# -# weechat -- weechat.conf -# -# WARNING: It is NOT recommended to edit this file by hand, -# especially if WeeChat is running. -# -# Use commands like /set or /fset to change settings in WeeChat. -# -# For more info, see: https://weechat.org/doc/quickstart -# - -[debug] - -[startup] -command_after_plugins = "" -command_before_plugins = "" -display_logo = on -display_version = on -sys_rlimit = "" - -[look] -align_end_of_lines = message -align_multiline_words = on -bar_more_down = "++" -bar_more_left = "<<" -bar_more_right = ">>" -bar_more_up = "--" -bare_display_exit_on_input = on -bare_display_time_format = "%H:%M" -buffer_auto_renumber = on -buffer_notify_default = all -buffer_position = end -buffer_search_case_sensitive = off -buffer_search_force_default = off -buffer_search_regex = off -buffer_search_where = prefix_message -buffer_time_format = "%H:%M:%S" -buffer_time_same = "" -color_basic_force_bold = off -color_inactive_buffer = on -color_inactive_message = on -color_inactive_prefix = on -color_inactive_prefix_buffer = on -color_inactive_time = off -color_inactive_window = on -color_nick_offline = off -color_pairs_auto_reset = 5 -color_real_white = off -command_chars = "" -command_incomplete = off -confirm_quit = off -confirm_upgrade = off -day_change = on -day_change_message_1date = "-- %a, %d %b %Y --" -day_change_message_2dates = "-- %%a, %%d %%b %%Y (%a, %d %b %Y) --" -eat_newline_glitch = off -emphasized_attributes = "" -highlight = "" -highlight_regex = "" -highlight_tags = "" -hotlist_add_conditions = "${away} || ${buffer.num_displayed} == 0 || ${info:relay_client_count,weechat,connected} > 0" -hotlist_buffer_separator = ", " -hotlist_count_max = 2 -hotlist_count_min_msg = 2 -hotlist_names_count = 3 -hotlist_names_length = 0 -hotlist_names_level = 12 -hotlist_names_merged_buffers = off -hotlist_prefix = "H: " -hotlist_remove = merged -hotlist_short_names = on -hotlist_sort = group_time_asc -hotlist_suffix = "" -hotlist_unique_numbers = on -hotlist_update_on_buffer_switch = on -input_cursor_scroll = 20 -input_share = none -input_share_overwrite = off -input_undo_max = 32 -item_away_message = on -item_buffer_filter = "*" -item_buffer_zoom = "!" -item_mouse_status = "M" -item_time_format = "%H:%M" -jump_current_to_previous_buffer = on -jump_previous_buffer_when_closing = on -jump_smart_back_to_buffer = on -key_bind_safe = on -key_grab_delay = 800 -mouse = off -mouse_timer_delay = 100 -nick_color_force = "" -nick_color_hash = djb2 -nick_color_hash_salt = "" -nick_color_stop_chars = "_|[" -nick_prefix = "" -nick_suffix = "" -paste_auto_add_newline = on -paste_bracketed = on -paste_bracketed_timer_delay = 10 -paste_max_lines = 1 -prefix_action = " *" -prefix_align = right -prefix_align_max = 0 -prefix_align_min = 0 -prefix_align_more = "+" -prefix_align_more_after = on -prefix_buffer_align = right -prefix_buffer_align_max = 0 -prefix_buffer_align_more = "+" -prefix_buffer_align_more_after = on -prefix_error = "=!=" -prefix_join = "-->" -prefix_network = "--" -prefix_quit = "<--" -prefix_same_nick = "" -prefix_same_nick_middle = "" -prefix_suffix = "|" -quote_nick_prefix = "<" -quote_nick_suffix = ">" -quote_time_format = "%H:%M:%S" -read_marker = line -read_marker_always_show = off -read_marker_string = "- " -read_marker_update_on_buffer_switch = on -save_config_on_exit = on -save_config_with_fsync = off -save_layout_on_exit = none -scroll_amount = 3 -scroll_bottom_after_switch = off -scroll_page_percent = 100 -search_text_not_found_alert = on -separator_horizontal = "-" -separator_vertical = "" -tab_width = 1 -time_format = "%a, %d %b %Y %T" -window_auto_zoom = off -window_separator_horizontal = on -window_separator_vertical = on -window_title = "" -word_chars_highlight = "!\u00A0,-,_,|,alnum" -word_chars_input = "!\u00A0,-,_,|,alnum" - -[palette] - -[color] -bar_more = lightmagenta -chat = default -chat_bg = default -chat_buffer = white -chat_channel = white -chat_day_change = cyan -chat_delimiters = green -chat_highlight = yellow -chat_highlight_bg = magenta -chat_host = cyan -chat_inactive_buffer = default -chat_inactive_window = default -chat_nick = lightcyan -chat_nick_colors = "cyan,magenta,green,brown,lightblue,default,lightcyan,lightmagenta,lightgreen,blue" -chat_nick_offline = default -chat_nick_offline_highlight = default -chat_nick_offline_highlight_bg = blue -chat_nick_other = cyan -chat_nick_prefix = green -chat_nick_self = white -chat_nick_suffix = green -chat_prefix_action = white -chat_prefix_buffer = brown -chat_prefix_buffer_inactive_buffer = default -chat_prefix_error = yellow -chat_prefix_join = lightgreen -chat_prefix_more = lightmagenta -chat_prefix_network = magenta -chat_prefix_quit = lightred -chat_prefix_suffix = green -chat_read_marker = magenta -chat_read_marker_bg = default -chat_server = brown -chat_tags = red -chat_text_found = yellow -chat_text_found_bg = lightmagenta -chat_time = default -chat_time_delimiters = brown -chat_value = cyan -chat_value_null = blue -emphasized = yellow -emphasized_bg = magenta -input_actions = lightgreen -input_text_not_found = red -item_away = yellow -nicklist_away = cyan -nicklist_group = green -separator = blue -status_count_highlight = magenta -status_count_msg = brown -status_count_other = default -status_count_private = green -status_data_highlight = lightmagenta -status_data_msg = yellow -status_data_other = default -status_data_private = lightgreen -status_filter = green -status_more = yellow -status_mouse = green -status_name = white -status_name_ssl = lightgreen -status_nicklist_count = default -status_number = yellow -status_time = default - -[completion] -base_word_until_cursor = on -command_inline = on -default_template = "%(nicks)|%(irc_channels)" -nick_add_space = on -nick_case_sensitive = off -nick_completer = ": " -nick_first_only = off -nick_ignore_chars = "[]`_-^" -partial_completion_alert = on -partial_completion_command = off -partial_completion_command_arg = off -partial_completion_count = on -partial_completion_other = off -partial_completion_templates = "config_options" - -[history] -display_default = 5 -max_buffer_lines_minutes = 0 -max_buffer_lines_number = 4096 -max_commands = 100 -max_visited_buffers = 50 - -[proxy] - -[network] -connection_timeout = 60 -gnutls_ca_system = on -gnutls_ca_user = "" -gnutls_handshake_timeout = 30 -proxy_curl = "" - -[plugin] -autoload = "*" -debug = off -extension = ".so,.dll" -path = "%h/plugins" -save_config_on_unload = on - -[signal] -sighup = "${if:${info:weechat_headless}?/reload:/quit -yes}" -sigquit = "/quit -yes" -sigterm = "/quit -yes" -sigusr1 = "" -sigusr2 = "" - -[bar] -buflist.color_bg = default -buflist.color_bg_inactive = default -buflist.color_delim = default -buflist.color_fg = default -buflist.conditions = "" -buflist.filling_left_right = vertical -buflist.filling_top_bottom = columns_vertical -buflist.hidden = off -buflist.items = "buflist" -buflist.position = left -buflist.priority = 0 -buflist.separator = on -buflist.size = 0 -buflist.size_max = 0 -buflist.type = root -fset.color_bg = default -fset.color_bg_inactive = default -fset.color_delim = cyan -fset.color_fg = default -fset.conditions = "${buffer.full_name} == fset.fset" -fset.filling_left_right = vertical -fset.filling_top_bottom = horizontal -fset.hidden = off -fset.items = "fset" -fset.position = top -fset.priority = 0 -fset.separator = on -fset.size = 3 -fset.size_max = 3 -fset.type = window -input.color_bg = default -input.color_bg_inactive = default -input.color_delim = cyan -input.color_fg = default -input.conditions = "" -input.filling_left_right = vertical -input.filling_top_bottom = horizontal -input.hidden = off -input.items = "[mode_indicator+][input_prompt]+(away),[input_search],[input_paste],input_text,[vi_buffer]" -input.position = bottom -input.priority = 1000 -input.separator = off -input.size = 0 -input.size_max = 0 -input.type = window -nicklist.color_bg = default -nicklist.color_bg_inactive = default -nicklist.color_delim = cyan -nicklist.color_fg = default -nicklist.conditions = "${nicklist}" -nicklist.filling_left_right = vertical -nicklist.filling_top_bottom = columns_vertical -nicklist.hidden = off -nicklist.items = "buffer_nicklist" -nicklist.position = right -nicklist.priority = 200 -nicklist.separator = on -nicklist.size = 0 -nicklist.size_max = 0 -nicklist.type = window -status.color_bg = blue -status.color_bg_inactive = darkgray -status.color_delim = cyan -status.color_fg = default -status.conditions = "" -status.filling_left_right = vertical -status.filling_top_bottom = horizontal -status.hidden = off -status.items = "[time],[buffer_last_number],[buffer_plugin],buffer_number+:+buffer_name+(buffer_modes)+{buffer_nicklist_count}+buffer_zoom+buffer_filter,scroll,[lag],[hotlist],[matrix_typing_notice],completion" -status.position = bottom -status.priority = 500 -status.separator = off -status.size = 1 -status.size_max = 0 -status.type = window -title.color_bg = blue -title.color_bg_inactive = darkgray -title.color_delim = cyan -title.color_fg = default -title.conditions = "" -title.filling_left_right = vertical -title.filling_top_bottom = horizontal -title.hidden = off -title.items = "buffer_title" -title.position = top -title.priority = 500 -title.separator = off -title.size = 1 -title.size_max = 0 -title.type = window -vi_line_numbers.color_bg = default -vi_line_numbers.color_bg_inactive = default -vi_line_numbers.color_delim = default -vi_line_numbers.color_fg = default -vi_line_numbers.conditions = "" -vi_line_numbers.filling_left_right = vertical -vi_line_numbers.filling_top_bottom = vertical -vi_line_numbers.hidden = on -vi_line_numbers.items = "line_numbers" -vi_line_numbers.position = left -vi_line_numbers.priority = 0 -vi_line_numbers.separator = off -vi_line_numbers.size = 0 -vi_line_numbers.size_max = 0 -vi_line_numbers.type = window - -[layout] - -[notify] - -[filter] -topic = on;*;irc_topic;* -irc_smart = on;*,!irc.undernet.*;irc_smart_filter;* -joinquit = on;*;irc_join,irc_part,irc_quit;* -irc_join_topic_date_names_creation = on;*;irc_332,irc_333,irc_366,irc_329,irc_372;* -backlog_in = on;*;<--;* -backlogtidy = on;*;logger_backlog;^\S+ \(\S+\) has (joined|left|quit) |^\S+ is now known as \S+$ - -[key] -ctrl-? = "/input delete_previous_char" -ctrl-A = "/input move_beginning_of_line" -ctrl-B = "/input move_previous_char" -ctrl-C_ = "/input insert \x1F" -ctrl-Cb = "/input insert \x02" -ctrl-Cc = "/input insert \x03" -ctrl-Ci = "/input insert \x1D" -ctrl-Co = "/input insert \x0F" -ctrl-Cv = "/input insert \x16" -ctrl-D = "/input delete_next_char" -ctrl-E = "/input move_end_of_line" -ctrl-F = "/input move_next_char" -ctrl-H = "/input delete_previous_char" -ctrl-I = "/input complete_next" -ctrl-J = "/input return" -ctrl-K = "/input delete_end_of_line" -ctrl-L = "/window refresh" -ctrl-M = "/input return" -ctrl-N = "/buffer +1" -ctrl-P = "/buffer -1" -ctrl-R = "/input search_text_here" -ctrl-Sctrl-U = "/input set_unread" -ctrl-T = "/input transpose_chars" -ctrl-U = "/input delete_beginning_of_line" -ctrl-W = "/input delete_previous_word" -ctrl-W= = "/window balance" -ctrl-Wh = "/window left" -ctrl-Wj = "/window down" -ctrl-Wk = "/window up" -ctrl-Wl = "/window right" -ctrl-Wq = "/window merge" -ctrl-Ws = "/window splith" -ctrl-Wv = "/window splitv" -ctrl-Wx = "/window swap" -ctrl-X = "/input switch_active_buffer" -ctrl-Y = "/input clipboard_paste" -meta-ctrl-M = "/input insert \n" -meta-meta-OP = "/bar scroll buflist * b" -meta-meta-OQ = "/bar scroll buflist * e" -meta-meta2-11~ = "/bar scroll buflist * b" -meta-meta2-12~ = "/bar scroll buflist * e" -meta-meta2-1~ = "/window scroll_top" -meta-meta2-23~ = "/bar scroll nicklist * b" -meta-meta2-24~ = "/bar scroll nicklist * e" -meta-meta2-4~ = "/window scroll_bottom" -meta-meta2-5~ = "/window scroll_up" -meta-meta2-6~ = "/window scroll_down" -meta-meta2-7~ = "/window scroll_top" -meta-meta2-8~ = "/window scroll_bottom" -meta-meta2-A = "/buffer -1" -meta-meta2-B = "/buffer +1" -meta-meta2-C = "/buffer +1" -meta-meta2-D = "/buffer -1" -meta-- = "/filter toggle @" -meta-/ = "/input jump_last_buffer_displayed" -meta-0 = "/buffer *10" -meta-1 = "/buffer *1" -meta-2 = "/buffer *2" -meta-3 = "/buffer *3" -meta-4 = "/buffer *4" -meta-5 = "/buffer *5" -meta-6 = "/buffer *6" -meta-7 = "/buffer *7" -meta-8 = "/buffer *8" -meta-9 = "/buffer *9" -meta-< = "/input jump_previously_visited_buffer" -meta-= = "/filter toggle" -meta-> = "/input jump_next_visited_buffer" -meta-B = "/buflist toggle" -meta-N = "/bar toggle nicklist" -meta-OA = "/input history_global_previous" -meta-OB = "/input history_global_next" -meta-OC = "/input move_next_word" -meta-OD = "/input move_previous_word" -meta-OF = "/input move_end_of_line" -meta-OH = "/input move_beginning_of_line" -meta-OP = "/bar scroll buflist * -100%" -meta-OQ = "/bar scroll buflist * +100%" -meta-Oa = "/input history_global_previous" -meta-Ob = "/input history_global_next" -meta-Oc = "/input move_next_word" -meta-Od = "/input move_previous_word" -meta2-11^ = "/bar scroll buflist * -100%" -meta2-11~ = "/bar scroll buflist * -100%" -meta2-12^ = "/bar scroll buflist * +100%" -meta2-12~ = "/bar scroll buflist * +100%" -meta2-15~ = "/buffer -1" -meta2-17~ = "/buffer +1" -meta2-18~ = "/window -1" -meta2-19~ = "/window +1" -meta2-1;3A = "/buffer -1" -meta2-1;3B = "/buffer +1" -meta2-1;3C = "/buffer +1" -meta2-1;3D = "/buffer -1" -meta2-1;3F = "/window scroll_bottom" -meta2-1;3H = "/window scroll_top" -meta2-1;3P = "/bar scroll buflist * b" -meta2-1;3Q = "/bar scroll buflist * e" -meta2-1;5A = "/input history_global_previous" -meta2-1;5B = "/input history_global_next" -meta2-1;5C = "/input move_next_word" -meta2-1;5D = "/input move_previous_word" -meta2-1;5P = "/bar scroll buflist * -100%" -meta2-1;5Q = "/bar scroll buflist * +100%" -meta2-1~ = "/input move_beginning_of_line" -meta2-200~ = "/input paste_start" -meta2-201~ = "/input paste_stop" -meta2-20~ = "/bar scroll title * -30%" -meta2-21~ = "/bar scroll title * +30%" -meta2-23;3~ = "/bar scroll nicklist * b" -meta2-23;5~ = "/bar scroll nicklist * -100%" -meta2-23^ = "/bar scroll nicklist * -100%" -meta2-23~ = "/bar scroll nicklist * -100%" -meta2-24;3~ = "/bar scroll nicklist * e" -meta2-24;5~ = "/bar scroll nicklist * +100%" -meta2-24^ = "/bar scroll nicklist * +100%" -meta2-24~ = "/bar scroll nicklist * +100%" -meta2-3~ = "/input delete_next_char" -meta2-4~ = "/input move_end_of_line" -meta2-5;3~ = "/window scroll_up" -meta2-5~ = "/window page_up" -meta2-6;3~ = "/window scroll_down" -meta2-6~ = "/window page_down" -meta2-7~ = "/input move_beginning_of_line" -meta2-8~ = "/input move_end_of_line" -meta2-A = "/input history_previous" -meta2-B = "/input history_next" -meta2-C = "/input move_next_char" -meta2-D = "/input move_previous_char" -meta2-F = "/input move_end_of_line" -meta2-G = "/window page_down" -meta2-H = "/input move_beginning_of_line" -meta2-I = "/window page_up" -meta2-Z = "/input complete_previous" -meta2-[E = "/buffer -1" -meta-_ = "/input redo" -meta-a = "/input jump_smart" -meta-b = "/input move_previous_word" -meta-d = "/input delete_next_word" -meta-f = "/input move_next_word" -meta-h = "/input hotlist_clear" -meta-j01 = "/buffer *1" -meta-j02 = "/buffer *2" -meta-j03 = "/buffer *3" -meta-j04 = "/buffer *4" -meta-j05 = "/buffer *5" -meta-j06 = "/buffer *6" -meta-j07 = "/buffer *7" -meta-j08 = "/buffer *8" -meta-j09 = "/buffer *9" -meta-j10 = "/buffer *10" -meta-j11 = "/buffer *11" -meta-j12 = "/buffer *12" -meta-j13 = "/buffer *13" -meta-j14 = "/buffer *14" -meta-j15 = "/buffer *15" -meta-j16 = "/buffer *16" -meta-j17 = "/buffer *17" -meta-j18 = "/buffer *18" -meta-j19 = "/buffer *19" -meta-j20 = "/buffer *20" -meta-j21 = "/buffer *21" -meta-j22 = "/buffer *22" -meta-j23 = "/buffer *23" -meta-j24 = "/buffer *24" -meta-j25 = "/buffer *25" -meta-j26 = "/buffer *26" -meta-j27 = "/buffer *27" -meta-j28 = "/buffer *28" -meta-j29 = "/buffer *29" -meta-j30 = "/buffer *30" -meta-j31 = "/buffer *31" -meta-j32 = "/buffer *32" -meta-j33 = "/buffer *33" -meta-j34 = "/buffer *34" -meta-j35 = "/buffer *35" -meta-j36 = "/buffer *36" -meta-j37 = "/buffer *37" -meta-j38 = "/buffer *38" -meta-j39 = "/buffer *39" -meta-j40 = "/buffer *40" -meta-j41 = "/buffer *41" -meta-j42 = "/buffer *42" -meta-j43 = "/buffer *43" -meta-j44 = "/buffer *44" -meta-j45 = "/buffer *45" -meta-j46 = "/buffer *46" -meta-j47 = "/buffer *47" -meta-j48 = "/buffer *48" -meta-j49 = "/buffer *49" -meta-j50 = "/buffer *50" -meta-j51 = "/buffer *51" -meta-j52 = "/buffer *52" -meta-j53 = "/buffer *53" -meta-j54 = "/buffer *54" -meta-j55 = "/buffer *55" -meta-j56 = "/buffer *56" -meta-j57 = "/buffer *57" -meta-j58 = "/buffer *58" -meta-j59 = "/buffer *59" -meta-j60 = "/buffer *60" -meta-j61 = "/buffer *61" -meta-j62 = "/buffer *62" -meta-j63 = "/buffer *63" -meta-j64 = "/buffer *64" -meta-j65 = "/buffer *65" -meta-j66 = "/buffer *66" -meta-j67 = "/buffer *67" -meta-j68 = "/buffer *68" -meta-j69 = "/buffer *69" -meta-j70 = "/buffer *70" -meta-j71 = "/buffer *71" -meta-j72 = "/buffer *72" -meta-j73 = "/buffer *73" -meta-j74 = "/buffer *74" -meta-j75 = "/buffer *75" -meta-j76 = "/buffer *76" -meta-j77 = "/buffer *77" -meta-j78 = "/buffer *78" -meta-j79 = "/buffer *79" -meta-j80 = "/buffer *80" -meta-j81 = "/buffer *81" -meta-j82 = "/buffer *82" -meta-j83 = "/buffer *83" -meta-j84 = "/buffer *84" -meta-j85 = "/buffer *85" -meta-j86 = "/buffer *86" -meta-j87 = "/buffer *87" -meta-j88 = "/buffer *88" -meta-j89 = "/buffer *89" -meta-j90 = "/buffer *90" -meta-j91 = "/buffer *91" -meta-j92 = "/buffer *92" -meta-j93 = "/buffer *93" -meta-j94 = "/buffer *94" -meta-j95 = "/buffer *95" -meta-j96 = "/buffer *96" -meta-j97 = "/buffer *97" -meta-j98 = "/buffer *98" -meta-j99 = "/buffer *99" -meta-k = "/input grab_key_command" -meta-l = "/window bare" -meta-m = "/mute mouse toggle" -meta-n = "/window scroll_next_highlight" -meta-p = "/window scroll_previous_highlight" -meta-r = "/input delete_line" -meta-s = "/mute spell toggle" -meta-u = "/window scroll_unread" -meta-x = "/input zoom_merged_buffer" -meta-z = "/window zoom" -ctrl-^ = "/input jump_last_buffer_displayed" -ctrl-_ = "/input undo" - -[key_search] -ctrl-I = "/input search_switch_where" -ctrl-J = "/input search_stop_here" -ctrl-M = "/input search_stop_here" -ctrl-Q = "/input search_stop" -ctrl-R = "/input search_switch_regex" -meta2-A = "/input search_previous" -meta2-B = "/input search_next" -meta-c = "/input search_switch_case" - -[key_cursor] -ctrl-J = "/cursor stop" -ctrl-M = "/cursor stop" -meta-meta2-A = "/cursor move area_up" -meta-meta2-B = "/cursor move area_down" -meta-meta2-C = "/cursor move area_right" -meta-meta2-D = "/cursor move area_left" -meta2-1;3A = "/cursor move area_up" -meta2-1;3B = "/cursor move area_down" -meta2-1;3C = "/cursor move area_right" -meta2-1;3D = "/cursor move area_left" -meta2-A = "/cursor move up" -meta2-B = "/cursor move down" -meta2-C = "/cursor move right" -meta2-D = "/cursor move left" -@chat(python.matrix.*):r = "hsignal:matrix_cursor_reply" -@item(buffer_nicklist):K = "/window ${_window_number};/kickban ${nick}" -@item(buffer_nicklist):b = "/window ${_window_number};/ban ${nick}" -@item(buffer_nicklist):k = "/window ${_window_number};/kick ${nick}" -@item(buffer_nicklist):q = "/window ${_window_number};/query ${nick};/cursor stop" -@item(buffer_nicklist):w = "/window ${_window_number};/whois ${nick}" -@chat:Q = "hsignal:chat_quote_time_prefix_message;/cursor stop" -@chat:m = "hsignal:chat_quote_message;/cursor stop" -@chat:q = "hsignal:chat_quote_prefix_message;/cursor stop" - -[key_mouse] -@bar(buflist):ctrl-wheeldown = "hsignal:buflist_mouse" -@bar(buflist):ctrl-wheelup = "hsignal:buflist_mouse" -@bar(input):button2 = "/input grab_mouse_area" -@bar(nicklist):button1-gesture-down = "/bar scroll nicklist ${_window_number} +100%" -@bar(nicklist):button1-gesture-down-long = "/bar scroll nicklist ${_window_number} e" -@bar(nicklist):button1-gesture-up = "/bar scroll nicklist ${_window_number} -100%" -@bar(nicklist):button1-gesture-up-long = "/bar scroll nicklist ${_window_number} b" -@chat(fset.fset):button1 = "/window ${_window_number};/fset -go ${_chat_line_y}" -@chat(fset.fset):button2* = "hsignal:fset_mouse" -@chat(fset.fset):wheeldown = "/fset -down 5" -@chat(fset.fset):wheelup = "/fset -up 5" -@chat(script.scripts):button1 = "/window ${_window_number};/script go ${_chat_line_y}" -@chat(script.scripts):button2 = "/window ${_window_number};/script go ${_chat_line_y};/script installremove -q ${script_name_with_extension}" -@chat(script.scripts):wheeldown = "/script down 5" -@chat(script.scripts):wheelup = "/script up 5" -@item(buffer_nicklist):button1 = "/window ${_window_number};/query ${nick}" -@item(buffer_nicklist):button1-gesture-left = "/window ${_window_number};/kick ${nick}" -@item(buffer_nicklist):button1-gesture-left-long = "/window ${_window_number};/kickban ${nick}" -@item(buffer_nicklist):button2 = "/window ${_window_number};/whois ${nick}" -@item(buffer_nicklist):button2-gesture-left = "/window ${_window_number};/ban ${nick}" -@item(buflist):button1* = "hsignal:buflist_mouse" -@item(buflist):button2* = "hsignal:buflist_mouse" -@item(buflist2):button1* = "hsignal:buflist_mouse" -@item(buflist2):button2* = "hsignal:buflist_mouse" -@item(buflist3):button1* = "hsignal:buflist_mouse" -@item(buflist3):button2* = "hsignal:buflist_mouse" -@bar:wheeldown = "/bar scroll ${_bar_name} ${_window_number} +20%" -@bar:wheelup = "/bar scroll ${_bar_name} ${_window_number} -20%" -@chat:button1 = "/window ${_window_number}" -@chat:button1-gesture-left = "/window ${_window_number};/buffer -1" -@chat:button1-gesture-left-long = "/window ${_window_number};/buffer 1" -@chat:button1-gesture-right = "/window ${_window_number};/buffer +1" -@chat:button1-gesture-right-long = "/window ${_window_number};/input jump_last_buffer" -@chat:ctrl-wheeldown = "/window scroll_horiz -window ${_window_number} +10%" -@chat:ctrl-wheelup = "/window scroll_horiz -window ${_window_number} -10%" -@chat:wheeldown = "/window scroll_down -window ${_window_number}" -@chat:wheelup = "/window scroll_up -window ${_window_number}" -@*:button3 = "/cursor go ${_x},${_y}" diff --git a/.xinitrc.dwm b/.xinitrc.dwm index 04ea96f..d1edaee 100755 --- a/.xinitrc.dwm +++ b/.xinitrc.dwm @@ -1,2 +1,8 @@ +eval $(gnome-keyring-daemon --start) +export SSH_AUTH_SOCK +dbus-update-activation-environment --systemd DISPLAY + xrdb -merge ~/.Xresources -exec dbus-run-session -- ~/.bin/dwm-start +exec ~/.bin/dwm-start +# exec dbus-run-session -- ~/.bin/dwm-start +# exec dbus-launch ~/.bin/dwm-start @@ -1,9 +1,12 @@ # ~/.zshrc configuration ~~ rgoncalves.se -. ~/.cprofile set -o vi +for cprofile in $HOME/.cprofile*; do + . "${cprofile}" +done + precmd() { vcs_info } @@ -12,13 +15,14 @@ precmd() { autoload -U history-search-end zle -N history-beginning-search-backward-end history-search-end zle -N history-beginning-search-forward-end history-search-end +bindkey '^R' history-incremental-search-backward bindkey "^[[A" history-beginning-search-backward-end bindkey "^[[B" history-beginning-search-forward-end bindkey "^[[1;5C" forward-word bindkey "^[[1;5D" backward-word bindkey "\[[H" beginning-of-line bindkey "\[[F" end-of-line -bindkey "\e[3~" delete-char +bindkey "\e[3~" delete-char bindkey '^[[Z' reverse-menu-complete zstyle ':completion:*' completer _complete zstyle ':completion:*' matcher-list '' 'm:{[:lower:][:upper:]}={[:upper:][:lower:]}' '+l:|=* r:|=*' @@ -43,7 +47,7 @@ _dir="%~" _color=002 autoload -Uz vcs_info -zstyle ':vcs_info:*' enable git svn +zstyle ':vcs_info:*' enable svn zstyle ':vcs_info:*' enable git zstyle ':vcs_info:*' get-revision true zstyle ':vcs_info:*' check-for-changes true @@ -60,8 +64,15 @@ RPROMPT='${vcs_info_msg_0_}' # pyenv # export PYENV_ROOT="$HOME/.pyenv" -eval "$(pyenv init --path)" eval "$(pyenv init -)" +eval "$(pyenv virtualenv-init - 2>/dev/null &)" (cat ~/.cache/dot/sequences 2>/dev/null &) # clear + +if [ -z "${SSH_AUTH_SOCK}" ]; then + eval $(ssh-agent) >/dev/null 2>&1 + ssh-add -k >/dev/null 2>&1 +fi + +command -v scw >/dev/null && eval "$(scw autocomplete script shell=zsh)" |