Merge branch 'master' of gitlab.com:shockrah/shell-scripts

configs/moc/nightly_theme

@@ -0,0 +1,35 @@
+# Author: Wim Speekenbrink <w.speek@wanadoo.nl>
+
+background          = blue      default
+frame               = blue      default   bold
+window_title        = blue      default   bold
+directory           = blue      default   bold
+selected_directory  = black     magenta
+playlist            = blue      default bold
+selected_playlist   = black     magenta
+file                = magenta default bold
+selected_file       = black     magenta
+marked_file         = green     default bold
+marked_info 		= blue      default bold
+marked_selected_file = black magenta bold
+info                = green     default   bold
+status              = blue      default   bold
+title               = green     default   bold
+state               = blue      default   bold
+current_time        = magenta   default   bold
+time_left           = magenta   default   bold
+total_time          = magenta   default   bold
+time_total_frames   = blue      default   bold
+sound_parameters    = magenta   default   bold
+legend              = blue      default   bold
+disabled            = black     default
+enabled             = blue      default   bold
+empty_mixer_bar     = blue      default   bold
+filled_mixer_bar    = black     magenta
+empty_time_bar      = blue      default   bold
+filled_time_bar     = black     magenta
+entry               = green     default   bold
+entry_title         = green     default   bold
+error               = red       default   bold
+message             = green     default   bold
+plist_time          = green	default bold

musicbg

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# for some reason this still kills all xwinwrap processes
+kill -9 `pgrep xwinwrap | head -1`
+
+# pick out the music video we want to play in the background
+base="$HOME/Videos/Music/"
+pape=`ls "${HOME}/Videos/Music/" | shuf | head -n 1`
+
+mpv="mpv --wid WID --no-config --keepaspect=no --loop \
+    --no-border --vd-lavc-fast --x11-bypass-compositor=no \
+    --gapless-audio=yes --vo=x11 --hwdec=auto \
+    --x11-name=mpvbg"
+
+xwinwrap -g 1920x1080 -ni -fdt -sh rectangle -un -b -nf -ov -- $mpv "$base/$pape" & > /dev/null 2>&1 &

newbga

@@ -34,11 +34,13 @@ echo "$pape1" > $HOME/.cache/newbga_img
 
 # Quick check if we even have a second monitor at all
 c=`xrandr | grep ' connected' | wc -l`
-if $c = "1"
+if [ $c = "1" ]
 then 
+	echo 'asdf'
 	exit
+else
+	# Second monitor
+	xwinwrap -g 1920x1080+1920+0 -ni -fdt -sh rectangle -un -b -nf -ov -- $mpv "$base/$pape2" & > /dev/null 2>&1 &
+	echo $! >> ${HOME}/.cache/mpvbg.pid
+	echo "$pape1" >> $HOME/.cache/newbga_img
 fi
-# Second monitor
-xwinwrap -g 1920x1080+1920+0 -ni -fdt -sh rectangle -un -b -nf -ov -- $mpv "$base/$pape2" & > /dev/null 2>&1 &
-echo $! >> ${HOME}/.cache/mpvbg.pid
-echo "$pape1" >> $HOME/.cache/newbga_img

snip

@@ -1,7 +1,6 @@
 #!/bin/sh
-if [ ! -z "$1" ]; then
-	n=$1
+if [ -z "$1" ]; then
+	scrot -sz $HOME/tmp.png
 else
-	n="tmp.png"
+	scrot -sz $HOME/$1
 fi
-scrot -sz $HOME/$n

ytdl

@@ -14,12 +14,16 @@ url=`echo '' | dmenu -p 'Enter a url'`
 if [ -z "$url" ]; then exit; fi
 
 # youtube-dl constantly breaks so --verbose is here for your pleasure
-cmd='youtube-dl --extract-audio --verbose --audio-format mp3 -o'
+cmd='youtube-dl --extract-audio --verbose --audio-format mp3'
 outplaylist="$HOME/Music/${dir}/%(autonumber)02d - %(title)s.%(ext)s"
 outsingle="$HOME/Music/${dir}/%(title)s.%(ext)s"
 
+# youtube playlists
 if echo "$url" | grep -q '&list='; then
-	$cmd "$outplaylist" "$url"
+	$cmd -o "$outplaylist" "$url"
+# soundcloud sets
+elif echo "$url" | grep -q '/sets/'; then
+	$cmd -o "$outplaylist" "$url"
 else
 	$cmd "$outsingle" "$url"
 fi