diff --git a/.gitmodules b/.gitmodules
index 5498334..39cf041 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,21 +1,3 @@
-[submodule "vim/bundle/vim-airline"]
- path = vim/bundle/vim-airline
- url = https://github.com/vim-airline/vim-airline
-[submodule "vim/bundle/vim-airline-themes"]
- path = vim/bundle/vim-airline-themes
- url = https://github.com/vim-airline/vim-airline-themes
[submodule "vim/bundle/GitGutter"]
path = vim/bundle/GitGutter
url = https://github.com/jisaacks/GitGutter
-[submodule "vim/bundle/vim-gitgutter"]
- path = vim/bundle/vim-gitgutter
- url = https://github.com/airblade/vim-gitgutter
-[submodule "vim/bundle/vim-markdown-preview"]
- path = vim/bundle/vim-markdown-preview
- url = https://github.com/JamshedVesuna/vim-markdown-preview.git
-[submodule "vim/bundle/vim-markdown-toc"]
- path = vim/bundle/vim-markdown-toc
- url = git@github.com:mzlogin/vim-markdown-toc.git
-[submodule "vim/bundle/vim-better-whitespace"]
- path = vim/bundle/vim-better-whitespace
- url = git@github.com:ntpeters/vim-better-whitespace.git
diff --git a/i3/config b/i3/config
index e4f1f2c..7a2ec2a 100644
--- a/i3/config
+++ b/i3/config
@@ -75,8 +75,7 @@ bindsym $mod+q kill
bindsym $mod+d exec --no-startup-id rofi -show run
#Screenshots!
-bindsym --release Print exec scrot -s ~/Screenshots/%y%m%d-%H%M%S.png -e '~/.dotfiles/i3/screenshot.sh $f'
-bindsym --release $mod+Print exec scrot ~/Screenshots/%y%m%d-%H%M%S.png -e '~/.dotfiles/i3 /screenshot.sh $f'
+bindsym --release Print exec ~/.dotfiles/i3/screenshot.sh
#Gist the clipboard:
bindsym --release $mod+p exec gist -cpPR
diff --git a/i3/lock.sh b/i3/lock.sh
index 252d470..dee6cab 100755
--- a/i3/lock.sh
+++ b/i3/lock.sh
@@ -15,7 +15,7 @@ R=$(file $icon | grep -o '[0-9]* x [0-9]*')
RX=$(echo $R | cut -d' ' -f 1)
RY=$(echo $R | cut -d' ' -f 3)
-RES=$(xrandr --query | grep 'HDMI-0' | cut -f4 -d' ')
+RES=$(xrandr --query | grep 'DP-1' | cut -f4 -d' ')
# monitor position/offset
SRX=$(echo $RES | cut -d'x' -f 1) # x pos
diff --git a/i3/screenshot.sh b/i3/screenshot.sh
index 2ec9c13..1767757 100755
--- a/i3/screenshot.sh
+++ b/i3/screenshot.sh
@@ -1,11 +1,15 @@
#!/bin/sh
set -e
-basename=$(basename ${1})
+FILEPATH="$HOME/Screenshots/$(date +%y%m%d-%H%M%S).png"
+
+maim -s -b 2 -c 0.5,0.5,0.5,0.6 ${FILEPATH}
+
+basename=$(basename ${FILEPATH})
# Full path to bypass ssh-agent
-/usr/bin/scp -i ~/.ssh/screenshoter ${1} screenshots@srv2.cwgaming.co.uk:~/${basename}
+/usr/bin/scp -i ~/.ssh/screenshoter ${FILEPATH} screenshots@web.spritsail.io:~/${basename}
-echo "https://admnt.cf/i/${basename}" | xclip -r -selection c
+echo "https://admnt.pw/i/${basename}" | xclip -r -selection c
-notify-send -t 1500 "Screenshot: Upload Complete!" "https://admnt.cf/i/${basename}"
+notify-send -t 1500 "Screenshot: Upload Complete!" "https://admnt.pw/i/${basename}"
diff --git a/ssh-ident/config b/ssh-ident/config
index fffc1cc..2ef0672 100644
--- a/ssh-ident/config
+++ b/ssh-ident/config
@@ -62,7 +62,7 @@ SSH_DEFAULT_OPTIONS = "-oUseRoaming=no"
# Which options to use by default if no match with SSH_ADD_OPTIONS
# was found. Note that ssh-ident hard codes -t 7200 to prevent your
# keys from remaining in memory for too long.
-SSH_ADD_DEFAULT_OPTIONS = "-t 900"
+SSH_ADD_DEFAULT_OPTIONS = "-t 1800"
# Output verbosity
# valid values are: LOG_ERROR, LOG_WARN, LOG_INFO, LOG_DEBUG
diff --git a/vim/autoload/pathogen.vim b/vim/autoload/pathogen.vim
deleted file mode 100644
index 59a75c1..0000000
--- a/vim/autoload/pathogen.vim
+++ /dev/null
@@ -1,353 +0,0 @@
-" pathogen.vim - path option manipulation
-" Maintainer: Tim Pope
-" Version: 2.4
-
-" Install in ~/.vim/autoload (or ~\vimfiles\autoload).
-"
-" For management of individually installed plugins in ~/.vim/bundle (or
-" ~\vimfiles\bundle), adding `execute pathogen#infect()` to the top of your
-" .vimrc is the only other setup necessary.
-"
-" The API is documented inline below.
-
-if exists("g:loaded_pathogen") || &cp
- finish
-endif
-let g:loaded_pathogen = 1
-
-" Point of entry for basic default usage. Give a relative path to invoke
-" pathogen#interpose() (defaults to "bundle/{}"), or an absolute path to invoke
-" pathogen#surround(). Curly braces are expanded with pathogen#expand():
-" "bundle/{}" finds all subdirectories inside "bundle" inside all directories
-" in the runtime path.
-function! pathogen#infect(...) abort
- for path in a:0 ? filter(reverse(copy(a:000)), 'type(v:val) == type("")') : ['bundle/{}']
- if path =~# '^\%({\=[$~\\/]\|{\=\w:[\\/]\).*[{}*]'
- call pathogen#surround(path)
- elseif path =~# '^\%([$~\\/]\|\w:[\\/]\)'
- call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')')
- call pathogen#surround(path . '/{}')
- elseif path =~# '[{}*]'
- call pathogen#interpose(path)
- else
- call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')')
- call pathogen#interpose(path . '/{}')
- endif
- endfor
- call pathogen#cycle_filetype()
- if pathogen#is_disabled($MYVIMRC)
- return 'finish'
- endif
- return ''
-endfunction
-
-" Split a path into a list.
-function! pathogen#split(path) abort
- if type(a:path) == type([]) | return a:path | endif
- if empty(a:path) | return [] | endif
- let split = split(a:path,'\\\@]','\\&','')
- endif
-endfunction
-
-" Like findfile(), but hardcoded to use the runtimepath.
-function! pathogen#runtime_findfile(file,count) abort
- let rtp = pathogen#join(1,pathogen#split(&rtp))
- let file = findfile(a:file,rtp,a:count)
- if file ==# ''
- return ''
- else
- return fnamemodify(file,':p')
- endif
-endfunction
-
-" Section: Deprecated
-
-function! s:warn(msg) abort
- echohl WarningMsg
- echomsg a:msg
- echohl NONE
-endfunction
-
-" Prepend all subdirectories of path to the rtp, and append all 'after'
-" directories in those subdirectories. Deprecated.
-function! pathogen#runtime_prepend_subdirectories(path) abort
- call s:warn('Change pathogen#runtime_prepend_subdirectories('.string(a:path).') to pathogen#infect('.string(a:path.'/{}').')')
- return pathogen#surround(a:path . pathogen#slash() . '{}')
-endfunction
-
-function! pathogen#incubate(...) abort
- let name = a:0 ? a:1 : 'bundle/{}'
- call s:warn('Change pathogen#incubate('.(a:0 ? string(a:1) : '').') to pathogen#infect('.string(name).')')
- return pathogen#interpose(name)
-endfunction
-
-" Deprecated alias for pathogen#interpose().
-function! pathogen#runtime_append_all_bundles(...) abort
- if a:0
- call s:warn('Change pathogen#runtime_append_all_bundles('.string(a:1).') to pathogen#infect('.string(a:1.'/{}').')')
- else
- call s:warn('Change pathogen#runtime_append_all_bundles() to pathogen#infect()')
- endif
- return pathogen#interpose(a:0 ? a:1 . '/{}' : 'bundle/{}')
-endfunction
-
-if exists(':Vedit')
- finish
-endif
-
-let s:vopen_warning = 0
-
-function! s:find(count,cmd,file,lcd)
- let rtp = pathogen#join(1,pathogen#split(&runtimepath))
- let file = pathogen#runtime_findfile(a:file,a:count)
- if file ==# ''
- return "echoerr 'E345: Can''t find file \"".a:file."\" in runtimepath'"
- endif
- if !s:vopen_warning
- let s:vopen_warning = 1
- let warning = '|echohl WarningMsg|echo "Install scriptease.vim to continue using :V'.a:cmd.'"|echohl NONE'
- else
- let warning = ''
- endif
- if a:lcd
- let path = file[0:-strlen(a:file)-2]
- execute 'lcd `=path`'
- return a:cmd.' '.pathogen#fnameescape(a:file) . warning
- else
- return a:cmd.' '.pathogen#fnameescape(file) . warning
- endif
-endfunction
-
-function! s:Findcomplete(A,L,P)
- let sep = pathogen#slash()
- let cheats = {
- \'a': 'autoload',
- \'d': 'doc',
- \'f': 'ftplugin',
- \'i': 'indent',
- \'p': 'plugin',
- \'s': 'syntax'}
- if a:A =~# '^\w[\\/]' && has_key(cheats,a:A[0])
- let request = cheats[a:A[0]].a:A[1:-1]
- else
- let request = a:A
- endif
- let pattern = substitute(request,'/\|\'.sep,'*'.sep,'g').'*'
- let found = {}
- for path in pathogen#split(&runtimepath)
- let path = expand(path, ':p')
- let matches = split(glob(path.sep.pattern),"\n")
- call map(matches,'isdirectory(v:val) ? v:val.sep : v:val')
- call map(matches,'expand(v:val, ":p")[strlen(path)+1:-1]')
- for match in matches
- let found[match] = 1
- endfor
- endfor
- return sort(keys(found))
-endfunction
-
-command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Ve :execute s:find(,'edit',,0)
-command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vedit :execute s:find(,'edit',,0)
-command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vopen :execute s:find(,'edit',,1)
-command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vsplit :execute s:find(,'split',,1)
-command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vvsplit :execute s:find(,'vsplit',,1)
-command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vtabedit :execute s:find(,'tabedit',,1)
-command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vpedit :execute s:find(,'pedit',,1)
-command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vread :execute s:find(,'read',,1)
-
-" vim:set et sw=2 foldmethod=expr foldexpr=getline(v\:lnum)=~'^\"\ Section\:'?'>1'\:getline(v\:lnum)=~#'^fu'?'a1'\:getline(v\:lnum)=~#'^endf'?'s1'\:'=':
diff --git a/vim/bundle/vim-airline b/vim/bundle/vim-airline
deleted file mode 160000
index 466198a..0000000
--- a/vim/bundle/vim-airline
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 466198adc015a9d81e975374d8e206dcf3efd173
diff --git a/vim/bundle/vim-airline-themes b/vim/bundle/vim-airline-themes
deleted file mode 160000
index 66c2839..0000000
--- a/vim/bundle/vim-airline-themes
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 66c2839bb1126c71a0a2d1da9804161ccd3b78b6
diff --git a/vim/bundle/vim-better-whitespace b/vim/bundle/vim-better-whitespace
deleted file mode 160000
index 688837f..0000000
--- a/vim/bundle/vim-better-whitespace
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 688837f23daa953a921a56c1780464d182577e6c
diff --git a/vim/bundle/vim-gitgutter b/vim/bundle/vim-gitgutter
deleted file mode 160000
index b803a28..0000000
--- a/vim/bundle/vim-gitgutter
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b803a28f47b26d16f5fe9e747850992c9985c667
diff --git a/vim/bundle/vim-markdown-preview b/vim/bundle/vim-markdown-preview
deleted file mode 160000
index bdb4454..0000000
--- a/vim/bundle/vim-markdown-preview
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit bdb4454ab0dfb29d8b84b2515d77d013bed564d8
diff --git a/vim/bundle/vim-markdown-toc b/vim/bundle/vim-markdown-toc
deleted file mode 160000
index f42c2fd..0000000
--- a/vim/bundle/vim-markdown-toc
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f42c2fdfe78050b21eb37d970aa4b2ecbcf637db
diff --git a/vim/vimrc b/vim/vimrc
index d69cadd..968e835 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -1,4 +1,21 @@
-execute pathogen#infect()
+if empty(glob('~/.vim/autoload/plug.vim'))
+ silent !curl -fLo ~/.vim/autoload/plug.vim --create-dirs
+ \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
+ autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
+endif
+
+call plug#begin('~/.vim/plugged')
+
+Plug 'vim-airline/vim-airline'
+ Plug 'vim-airline/vim-airline-themes'
+
+Plug 'ntpeters/vim-better-whitespace'
+Plug 'airblade/vim-gitgutter'
+Plug 'JamshedVesuna/vim-markdown-preview'
+Plug 'chr4/nginx.vim'
+
+call plug#end()
+
syntax on
" Spaces are better than tabs :P
@@ -16,7 +33,7 @@ let g:airline_powerline_fonts = 1
let g:airline_theme='murmur'
" markdown-preview
-let vim_markdown_preview_toggle=1
+let vim_markdown_preview_toggle=0
let vim_markdown_preview_browser='Firefox'
let vim_markdown_preview_use_xdg_open=1
let vim_markdown_preview_github=1
diff --git a/zsh/zshrc b/zsh/zshrc
index 23bc7c6..6a4670e 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -14,7 +14,6 @@ eval "$(thefuck --alias)"
dme (){ eval $(docker-machine env "$@");}
alias dmssh='docker-machine ssh'
alias dm='docker-machine'
-
alias dc='docker-compose'
alias dps='docker ps'
@@ -26,7 +25,7 @@ alias dbl='docker build'
alias dbl.='docker build .'
alias drun='docker run -ti'
alias dkl='docker kill'
-alias dalpine='docker run -ti --rm alpine /bin/sh'
+alias dalpine='docker run -ti --rm spritsail/alpine /bin/sh'
alias drm-stopped='docker rm -v $(docker ps -a -q -f status=exited)'
alias drmi-untag='docker rmi $(docker images -f "dangling=true" -q)'
dsh() {
@@ -45,7 +44,39 @@ alias dd='dd status=progress'
alias ls='ls -F --color=always'
alias pacman='pacman --color=always'
alias pacaur='pacaur --color=always'
-which gopass &>/dev/null && alias pass='gopass' && source <(gopass completion zsh) #Only override pass if gopass exists
+#which gopass &>/dev/null && alias pass='gopass' && source <(gopass completion zsh) #Only override pass if gopass exists
+
+# Function for converting from eac3 to ac3
+function eac3-away() {
+ # Dont analyze rar files, causes false positives
+ if $(file -binN $1 | grep -q "x-rar"); then
+ echo "File is in rar format, refusing to analyze"
+ return 2
+ fi
+
+ if ! $(ffprobe -hide_banner -v 24 -show_streams -select_streams a "$1" | grep -q eac3); then
+ echo "File is not in eac3 format"
+ return 1
+ fi
+
+ mv "$1" "old.$1"
+ ffmpeg -i "old.$1" -map 0 -vcodec copy -scodec copy -acodec ac3 -b:a 640k "$1"
+ rm "old.$1"
+}
+
+
+# Function to fix mangled mp3 headers in some files
+function fix-headers() {
+ # Dont analyze rar files, causes false positives
+ if $(file -binN $1 | grep -q "x-rar"); then
+ echo "File is in rar format, refusing to analyze"
+ return 2
+ fi
+
+ mv "$1" "old.$1"
+ ffmpeg -i "old.$1" "$1"
+ rm "old.$1"
+}
# Beets remote music management
alias beet="eval $(docker-machine env DockerOther | sed -n 's/export\s*//gp' | xargs ) docker exec -ti beets beet"
@@ -60,7 +91,7 @@ export PROJECT_HOME=$HOME/Sync/Programming/Python # optional
source /usr/bin/virtualenvwrapper.sh
#Ruby. Yay...
-export PATH="$PATH:$(ruby -rubygems -e 'puts Gem.user_dir')/bin"
+#export PATH="$PATH:$(ruby -rubygems -e 'puts Gem.user_dir')/bin"
# Go
export GOPATH="/home/adam/Sync/Go"