Revert "Add playlist RTMP streaming script"

This reverts commit 66d5ac91b1e114a9c6fbaedbb7663948c5967d2f.

Accidentally added everything to that commit...

Conflicts:
	.aliases
	.config/sxhkd/sxhkdrc
	.scripts/wacom_conf.sh

.aliases

@@ -11,7 +11,6 @@ alias xu="xi -Su"
 alias xr="sudo xbps-remove -R"
 
 alias e="sudo emerge -a"
-alias a="sudo zfs load-key tank/media; sudo zfs mount -a; ranger /tank/media/anime"
 
 alias y="youtube-dl"
 alias ym="youtube-dl --format bestaudio --extract-audio --add-metadata"

.config/mpv/mpv.conf

@@ -27,6 +27,8 @@ ytdl-format=best
 # Cache {{{
 
 cache=yes
+cache-default=4000000
+cache-backbuffer=250000
 demuxer-max-bytes=1147483647
 
 # }}}

.config/nvim/init.vim

@@ -53,8 +53,6 @@ nnoremap <leader>u :!ctags -R .<CR>
 
 nnoremap <esc> :set nohlsearch<CR>
 
-tnoremap <Esc> <C-\><C-n>
-
 " Local (scope) replace
 nnoremap gr gd[{V%::s/<C-R>///gc<left><left><left>
 
@@ -116,7 +114,6 @@ Plug 'raimondi/delimitmate'
 Plug 'fisadev/dragvisuals.vim'
 Plug 'dense-analysis/ale'
 Plug 'maralla/completor.vim'
-Plug 'artur-shaik/vim-javacomplete2'
 Plug 'junegunn/fzf'
 Plug 'Chiel92/vim-autoformat'
 Plug 'preservim/nerdtree'
@@ -140,11 +137,6 @@ augroup rust
     autocmd FileType rust let b:delimitMate_smart_quotes='\%(\w\|[^[:punct:][:space:]]\|\%(\\\\\)*\\\)\%#\|\%#\%(\w\|[^[:space:][:punct:]]\)\|\<\%#\|\&\%#'
 augroup END
 
-augroup java
-    autocmd!
-    autocmd FileType java setlocal omnifunc=javacomplete#Complete
-augroup END
-
 " Use TAB to complete when typing words, else inserts TABs as usual.  Uses
 " dictionary, source files, and completor to find matching words to complete.
 
@@ -173,4 +165,3 @@ inoremap <expr> <S-Tab> pumvisible() ? "\<C-p>" : "\<S-Tab>"
 " Use tab to trigger auto completion.
 inoremap <expr> <Tab> Tab_Or_Complete()
 " }}}
-

.config/polybar/config

@@ -19,9 +19,9 @@ secondary = ${xrdb:color2:#222}
 alert = ${xrdb:color3:#222}
 
 [bar/dp2]
-monitor = ${env:MONITOR:DisplayPort-1}
+monitor = ${env:MONITOR:DP-2}
 width = 100%
-height = 20
+height = 27
 ;offset-x = 1%
 ;offset-y = 1%
 ;radius = 6.0
@@ -30,7 +30,7 @@ fixed-center = false
 background = ${colors.background}
 foreground = ${colors.foreground}
 
-line-size = 1
+line-size = 3
 line-color = #f00
 
 ;border-size = 4
@@ -42,7 +42,7 @@ padding-right = 2
 module-margin-left = 1
 module-margin-right = 2
 
-font-0 = "Hack:style=Regular:pixelsize=10;1"
+font-0 = "xos4 Terminus:style=Bold:pixelsize=18;1"
 font-1 = unifont:fontformat=truetype:size=8:antialias=false;0
 font-2 = "Wuncon Siji:pixelsize=14;1"
 font-3 = "HanaMinA,花園明朝A:pixelsize=14;1"
@@ -263,7 +263,7 @@ label = %date% %time%
 type = internal/volume
 
 format-volume = <label-volume> <bar-volume>
-label-volume = %percentage%%
+label-volume = VOL: %percentage%%
 label-volume-foreground = ${root.foreground}
 
 format-muted-prefix = " "

.config/sxhkd/sxhkdrc

@@ -21,15 +21,6 @@ alt + shift + s
 alt + shift + f
     $BROWSER
 
-alt + shift + Return
-    $TERMINAL
-
-alt + shift + m
-    $TERMINAL neomutt
-
-alt + p
-    dmenu_run
-
 # Media controls
 XF86AudioRaiseVolume
     pulseaudio-ctl up 4; pkill --signal=USR1 dwm_status.sh
@@ -50,108 +41,3 @@ alt + z
 alt + x
     mpc next; pkill --signal=USR1 dwm_status.sh
 
-#
-# bspwm hotkeys
-#
-
-## quit/restart bspwm
-#alt + alt + {q,r}
-#    bspc {quit,wm -r}
-#
-## close and kill
-#alt + {_,shift + }w
-#    bspc node -{c,k}
-#
-## alternate between the tiled and monocle layout
-#alt + m
-#    bspc desktop -l next
-#
-## send the newest marked node to the newest preselected node
-#alt + y
-#    bspc node newest.marked.local -n newest.!automatic.local
-#
-## swap the current node and the biggest node
-#alt + g
-#    bspc node -s biggest
-#
-##
-## state/flags
-##
-#
-## set the window state
-#alt + {t,shift + t,s,f}
-#    bspc node -t {tiled,pseudo_tiled,floating,fullscreen}
-#
-## set the node flags
-#alt + ctrl + {m,x,y,z}
-#    bspc node -g {marked,locked,sticky,private}
-#
-##
-## focus/swap
-##
-#
-## focus the node in the given direction
-#alt + {_,shift + }{h,j,k,l}
-#    bspc node -{f,s} {west,south,north,east}
-#
-## focus the node for the given path jump
-#alt + {p,b,comma,period}
-#    bspc node -f @{parent,brother,first,second}
-#
-## focus the next/previous node in the current desktop
-#alt + {_,shift + }c
-#    bspc node -f {next,prev}.local
-#
-## focus the next/previous desktop in the current monitor
-#alt + bracket{left,right}
-#    bspc desktop -f {prev,next}.local
-#
-## focus the last node/desktop
-#alt + {grave,Tab}
-#    bspc {node,desktop} -f last
-#
-## focus the older or newer node in the focus history
-#alt + {o,i}
-#    bspc wm -h off; \
-#    bspc node {older,newer} -f; \
-#    bspc wm -h on
-#
-## focus or send to the given desktop
-#alt + {_,shift + }{1-9,0}
-#    bspc {desktop -f,node -d} '^{1-9,10}'
-#
-##
-## preselect
-##
-#
-## preselect the direction
-#alt + ctrl + {h,j,k,l}
-#    bspc node -p {west,south,north,east}
-#
-## preselect the ratio
-#alt + ctrl + {1-9}
-#    bspc node -o 0.{1-9}
-#
-## cancel the preselection for the focused node
-#alt + ctrl + space
-#    bspc node -p cancel
-#
-## cancel the preselection for the focused desktop
-#alt + ctrl + shift + space
-#    bspc query -N -d | xargs -I id -n 1 bspc node id -p cancel
-#
-##
-## move/resize
-##
-#
-## expand a window by moving one of its side outward
-#alt + alt + {h,j,k,l}
-#    bspc node -z {left -20 0,bottom 0 20,top 0 -20,right 20 0}
-#
-## contract a window by moving one of its side inward
-#alt + alt + shift + {h,j,k,l}
-#    bspc node -z {right -20 0,top 0 20,bottom 0 -20,left 20 0}
-#
-## move a floating window
-#alt + {Left,Down,Up,Right}
-#    bspc node -v {-20 0,0 20,0 -20,20 0}

.profile

@@ -3,16 +3,14 @@
 # the default umask is set in /etc/profile; for setting the umask
 # for ssh logins, install and configure the libpam-umask package.
 #umask 022
-source /etc/profile
 
 export GOPATH="$HOME/go"
 export RUST_SRC_PATH="$(rustc --print sysroot)/lib/rustlib/src/rust/src"
-export PATH="$PATH:$HOME/.cargo/bin:$GOPATH/bin:$HOME/.scripts:$HOME/bin"
-export BROWSER="firefox"
+export PATH="/usr/lib/distcc/bin:$PATH:$HOME/.cargo/bin:$GOPATH/bin:$HOME/.scripts:$HOME/bin"
+export BROWSER="icecat"
 export READER="zathura"
 export MAKEFLAGS="-j$(nproc)"
 export EDITOR="vim"
-export TERMINAL="st"
 export LESSOPEN="|lesspipe.sh %s"
 
 # less colors

.scripts/compiler

@@ -1,2 +1,2 @@
 #!/bin/sh
-refer -PS -e -p ~/git/university-documents/bibliography "$1" | groff -ms -e -k -t -U -T ps > "${1%.*}.ps"
+refer -PS -e -p ~/git/university-documents/bibliography "$1" | groff -ms -e -k -t -U -T pdf > "${1%.*}.pdf"

.scripts/exit_menu.sh

@@ -12,16 +12,16 @@ EOF
 
 case $CHOICE in
     "Lock")
-        ~/.scripts/lock.sh && xset dpms force standby
+        ~/.scripts/lock.sh
         ;;
     "Sleep")
-        ~/.scripts/lock.sh && sudo s2ram
+        ~/.scripts/lock.sh && sudo zzz
         ;;
     "Hibernate")
-        ~/.scripts/lock.sh && {sudo ZZZ || sudo pm-hibernate }
+        ~/.scripts/lock.sh && sudo ZZZ
         ;;
     "Exit")
-        pkill X
+        pkill Xorg
         ;;
     "Shutdown")
         sudo poweroff

.scripts/lock.sh

@@ -2,7 +2,7 @@
 
 playerctl pause
 
-maim /tmp/lock.png
-convert /tmp/lock.png -blur 0x8 /tmp/lock.png
+scrot /tmp/lock.png
+convert /tmp/lock.png -paint 2 /tmp/lock.png
 i3lock -i /tmp/lock.png
 rm /tmp/lock.png

.scripts/playlist_stream.sh

@@ -1,14 +0,0 @@
-#!/bin/sh -e
-
-PLAYLIST="$1" # Playlist directory
-SERVER="$2"   # Target RTMP server
-
-while true; do
-    for i in $PLAYLIST/*.{mp4,mkv}; do
-        BASENAME="${i%.*}"
-        ffmpeg -i "$i" \
-            -c:v mpeg2video -b:v 9000k -f mpegts -
-            #-vf "ass=$BASENAME.enUS.ass"\
-    done
-done | mbuffer -q -m 100M | ffmpeg -re -i pipe:0 -f flv -b:v 9000k "$SERVER"
-

.xinitrc

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-xrandr --output DVI-D-0 --auto --left-of DisplayPort-1
+xrandr --output DVI-I-1 --auto --left-of DP-2
 xrandr --output HDMI-0 --mode 3840x2160 --rate 59.94 --right-of DP-2
 
 xset s off
@@ -30,9 +30,4 @@ picom &
 sxhkd &
 ~/.scripts/dwm_status.sh &
 
-ckb-next -b &
-pgrep seaf-daemon || seaf-cli start
-
-#exec ck-launch-session bspwm -c ~/.bspwmrc
 exec ck-launch-session dwm
-