dotfiles

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs | README | LICENSE

commit f2d056cb85b0a8e2038468e690232c63d87f797e
parent be62eb5c82937dced3585ee03c3f8b0375745bb2
Author: Luke Smith <luke@lukesmith.xyz>
Date:   Fri,  4 Jan 2019 23:08:12 -0500

mpv pause system changed (socat required)

Diffstat:
M.bashrc | 19++++++-------------
M.config/ranger/rifle.conf | 14++++++++------
M.scripts/tools/dmenuhandler | 4++--
M.scripts/tools/linkhandler | 10+++++-----
M.scripts/tools/pauseallmpv | 6+++---
5 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/.bashrc b/.bashrc @@ -1,40 +1,33 @@ #!/bin/bash -# _ _ -# | |__ __ _ ___| |__ _ __ ___ -# | '_ \ / _` / __| '_ \| '__/ __| -# | |_) | (_| \__ \ | | | | | (__ -# |_.__/ \__,_|___/_| |_|_| \___| - stty -ixon # Disable ctrl-s and ctrl-q. shopt -s autocd #Allows you to cd into directory merely by typing the directory name. HISTSIZE= HISTFILESIZE= # Infinite history. - export PS1="\[$(tput bold)\]\[$(tput setaf 1)\][\[$(tput setaf 3)\]\u\[$(tput setaf 2)\]@\[$(tput setaf 4)\]\h \[$(tput setaf 5)\]\W\[$(tput setaf 1)\]]\[$(tput setaf 7)\]\\$ \[$(tput sgr0)\]" [ -f "$HOME/.shortcuts" ] && source "$HOME/.shortcuts" # Load shortcut aliases -export GPG_TTY=$(tty) - # System Maintainence alias mw="~/.config/mutt/mutt-wizard.sh" -alias muttwizard="~/.config/mutt/mutt-wizard.sh" alias sdn="sudo shutdown now" alias psref="gpg-connect-agent RELOADAGENT /bye" # Refresh gpg +alias gua="git remote | xargs -L1 git push --all" # Some aliases alias e="$EDITOR" alias p="sudo pacman" alias SS="sudo systemctl" alias v="vim" -alias sv="sudo vim" +alias f="vifm" alias r="ranger" alias sr="sudo ranger" alias ka="killall" alias g="git" alias trem="transmission-remote" alias mkd="mkdir -pv" -alias ref="shortcuts && source ~/.bashrc" # Refresh shortcuts manually and reload bashrc -alias bw="wal -i ~/.config/wall.png" # Rerun pywal +alias ref="shortcuts >/dev/null ; source ~/.bashrc" # Refresh shortcuts manually and reload bashrc +alias mpv="mpv --input-ipc-server=/tmp/mpvsoc$(date +%s)" +alias x="sxiv -ft *" +alias lp="pacman -Qett --color=always | less" # Adding color alias ls='ls -hN --color=auto --group-directories-first' diff --git a/.config/ranger/rifle.conf b/.config/ranger/rifle.conf @@ -117,9 +117,11 @@ ext php = php -- "$1" #------------------------------------------- mime ^video|audio, has gmplayer, X, flag f = gmplayer -- "$@" mime ^video|audio, has smplayer, X, flag f = smplayer "$@" -mime ^video, has mpv, X, flag f = mpv -- "$@" -mime ^video, has mpv, X, flag f = mpv --fs -- "$@" -mime ^video, has mpv, X, flag f = mpv --loop -- "$@" +mime ^video, has mpv, X, flag f = mpv --input-ipc-server=/tmp/mpvsoc$(date +%s) -- "$@" +mime ^video, has mpv, X, flag f = mpv --input-ipc-server=/tmp/mpvsoc$(date +%s) --no-video -- "$@" +mime ^video, has mpv, X, flag f = mpv --input-ipc-server=/tmp/mpvsoc$(date +%s) --fs -- "$@" +mime ^video, has mpv, X, flag f = mpv --input-ipc-server=/tmp/mpvsoc$(date +%s) --loop -- "$@" +mime ^video, has mpv, X, flag f = mpv --input-ipc-server=/tmp/mpvsoc$(date +%s) --title="obs" --autofit=1050x700 -- "$@" mime ^video, has mplayer2, X, flag f = mplayer2 -- "$@" mime ^video, has mplayer2, X, flag f = mplayer2 -fs -- "$@" mime ^video, has mplayer, X, flag f = mplayer -- "$@" @@ -132,16 +134,16 @@ mime ^video|audio, has totem, X, flag f = totem --fullscreen -- "$@" #------------------------------------------- mime ^audio|ogg$, terminal, has mplayer = mplayer -- "$@" mime ^audio|ogg$, terminal, has mplayer2 = mplayer2 -- "$@" -mime ^audio|ogg$, terminal, has mpv = mpv --no-audio-display -- "$@" +mime ^audio|ogg$, terminal, has mpv = mpv --input-ipc-server=/tmp/mpvsoc$(date +%s) --no-audio-display -- "$@" mime ^audio|ogg$ = tag "$@" -mime ^audio|ogg$, terminal, has mpv = mpv -- "$@" +mime ^audio|ogg$, terminal, has mpv = mpv --input-ipc-server=/tmp/mpvsoc$(date +%s) -- "$@" ext midi?, terminal, has wildmidi = wildmidi -- "$@" #-------------------------------------------- # Video without X: #------------------------------------------- -mime ^video, terminal, !X, has mpv = mpv -- "$@" +mime ^video, terminal, !X, has mpv = mpv --input-ipc-server=/tmp/mpvsoc$(date +%s) -- "$@" mime ^video, terminal, !X, has mplayer2 = mplayer2 -- "$@" mime ^video, terminal, !X, has mplayer = mplayer -- "$@" diff --git a/.scripts/tools/dmenuhandler b/.scripts/tools/dmenuhandler @@ -5,11 +5,11 @@ case "$(printf "copy url\\nmpv\\nmpv (loop)\\nqueue download\\n\\nqueue youtube-dl\\nfeh\\nbrowser\\nw3m\\nmpv (float)" | dmenu -i -p "Open link with what program?")" in "copy url") echo "$1" | xclip -selection clipboard ;; mpv) setsid mpv -quiet "$1" >/dev/null 2>&1 & ;; - "mpv (loop)") setsid mpv -quiet --loop "$1" >/dev/null 2>&1 & ;; + "mpv (loop)") setsid mpv --input-ipc-server=/tmp/mpvsoc$(date +%s) -quiet --loop "$1" >/dev/null 2>&1 & ;; "queue download") tsp curl -LO "$1" >/dev/null 2>&1 ;; "queue youtube-dl") tsp youtube-dl --write-metadata -ic "$1" >/dev/null 2>&1 ;; browser) setsid "$BROWSER" "$1" >/dev/null 2>&1 & ;; feh) setsid feh "$1" >/dev/null 2>&1 & ;; w3m) w3m "$1" >/dev/null 2>&1 ;; - "mpv (float)") setsid mpv --geometry=+0-0 --autofit=30% --title="mpvfloat" "$1" >/dev/null 2>&1 & ;; + "mpv (float)") setsid mpv --input-ipc-server=/tmp/mpvsoc$(date +%s) --geometry=+0-0 --autofit=30% --title="mpvfloat" "$1" >/dev/null 2>&1 & ;; esac diff --git a/.scripts/tools/linkhandler b/.scripts/tools/linkhandler @@ -13,11 +13,11 @@ scihub="http://sci-hub.tw/" [ -z "$1" ] && { "$BROWSER"; exit; } case "$1" in - *mkv|*webm|*mp4|*gif|*youtube.com*|*youtu.be*|*hooktube.com*|*bitchute.com*) - setsid mpv -quiet "$1" >/dev/null 2>&1 & ;; - *png|*jpg|*jpe|*jpeg) - setsid feh "$1" >/dev/null 2>&1 & ;; - *mp3|*flac|*opus|*mp3?source) + *mkv|*webm|*mp4|*youtube.com*|*youtu.be*|*hooktube.com*|*bitchute.com*) + setsid mpv --input-ipc-server=/tmp/mpvsoc$(date +%s) -quiet "$1" >/dev/null 2>&1 & ;; + *png|*jpg|*jpe|*jpeg|*gif) + setsid sxiv -a "$1" >/dev/null 2>&1 & ;; + *mp3|*flac|*opus|*mp3?source*) setsid tsp curl -LO "$1" >/dev/null 2>&1 & ;; *springer.com*) setsid curl -sO "$(curl -s "$scihub$*" | grep -Po "(?<=location.href=').+.pdf")" >/dev/null 2>&1 & ;; diff --git a/.scripts/tools/pauseallmpv b/.scripts/tools/pauseallmpv @@ -1,4 +1,4 @@ #!/bin/sh -# Sends a , key to all mpv instances, pausing them at the last frame. - -xdotool search --class mpv | xargs -I % xdotool key --window % comma +for i in $(ls /tmp/mpvsoc*); do + echo '{ "command": ["set_property", "pause", true] }' | socat - $i; +done