mirror of
https://github.com/Adam-Ant/dotfiles
synced 2024-12-20 11:34:35 +00:00
Mega commit to bring up to modern standards
This commit is contained in:
parent
1b0053e218
commit
886b131899
GPG Key ID:
7826B108895B86AA
18
.gitmodules
vendored
18
.gitmodules
vendored
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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}"
|
||||
|
||||
@ -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
|
||||
|
||||
@ -1,353 +0,0 @@
|
||||
" pathogen.vim - path option manipulation
|
||||
" Maintainer: Tim Pope <http://tpo.pe/>
|
||||
" 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,'\\\@<!\%(\\\\\)*\zs,')
|
||||
return map(split,'substitute(v:val,''\\\([\\,]\)'',''\1'',"g")')
|
||||
endfunction
|
||||
|
||||
" Convert a list to a path.
|
||||
function! pathogen#join(...) abort
|
||||
if type(a:1) == type(1) && a:1
|
||||
let i = 1
|
||||
let space = ' '
|
||||
else
|
||||
let i = 0
|
||||
let space = ''
|
||||
endif
|
||||
let path = ""
|
||||
while i < a:0
|
||||
if type(a:000[i]) == type([])
|
||||
let list = a:000[i]
|
||||
let j = 0
|
||||
while j < len(list)
|
||||
let escaped = substitute(list[j],'[,'.space.']\|\\[\,'.space.']\@=','\\&','g')
|
||||
let path .= ',' . escaped
|
||||
let j += 1
|
||||
endwhile
|
||||
else
|
||||
let path .= "," . a:000[i]
|
||||
endif
|
||||
let i += 1
|
||||
endwhile
|
||||
return substitute(path,'^,','','')
|
||||
endfunction
|
||||
|
||||
" Convert a list to a path with escaped spaces for 'path', 'tag', etc.
|
||||
function! pathogen#legacyjoin(...) abort
|
||||
return call('pathogen#join',[1] + a:000)
|
||||
endfunction
|
||||
|
||||
" Turn filetype detection off and back on again if it was already enabled.
|
||||
function! pathogen#cycle_filetype() abort
|
||||
if exists('g:did_load_filetypes')
|
||||
filetype off
|
||||
filetype on
|
||||
endif
|
||||
endfunction
|
||||
|
||||
" Check if a bundle is disabled. A bundle is considered disabled if its
|
||||
" basename or full name is included in the list g:pathogen_blacklist or the
|
||||
" comma delimited environment variable $VIMBLACKLIST.
|
||||
function! pathogen#is_disabled(path) abort
|
||||
if a:path =~# '\~$'
|
||||
return 1
|
||||
endif
|
||||
let sep = pathogen#slash()
|
||||
let blacklist =
|
||||
\ get(g:, 'pathogen_blacklist', get(g:, 'pathogen_disabled', [])) +
|
||||
\ pathogen#split($VIMBLACKLIST)
|
||||
if !empty(blacklist)
|
||||
call map(blacklist, 'substitute(v:val, "[\\/]$", "", "")')
|
||||
endif
|
||||
return index(blacklist, fnamemodify(a:path, ':t')) != -1 || index(blacklist, a:path) != -1
|
||||
endfunction
|
||||
|
||||
" Prepend the given directory to the runtime path and append its corresponding
|
||||
" after directory. Curly braces are expanded with pathogen#expand().
|
||||
function! pathogen#surround(path) abort
|
||||
let sep = pathogen#slash()
|
||||
let rtp = pathogen#split(&rtp)
|
||||
let path = fnamemodify(a:path, ':s?[\\/]\=$??')
|
||||
let before = filter(pathogen#expand(path), '!pathogen#is_disabled(v:val)')
|
||||
let after = filter(reverse(pathogen#expand(path, sep.'after')), '!pathogen#is_disabled(v:val[0:-7])')
|
||||
call filter(rtp, 'index(before + after, v:val) == -1')
|
||||
let &rtp = pathogen#join(before, rtp, after)
|
||||
return &rtp
|
||||
endfunction
|
||||
|
||||
" For each directory in the runtime path, add a second entry with the given
|
||||
" argument appended. Curly braces are expanded with pathogen#expand().
|
||||
function! pathogen#interpose(name) abort
|
||||
let sep = pathogen#slash()
|
||||
let name = a:name
|
||||
if has_key(s:done_bundles, name)
|
||||
return ""
|
||||
endif
|
||||
let s:done_bundles[name] = 1
|
||||
let list = []
|
||||
for dir in pathogen#split(&rtp)
|
||||
if dir =~# '\<after$'
|
||||
let list += reverse(filter(pathogen#expand(dir[0:-6].name, sep.'after'), '!pathogen#is_disabled(v:val[0:-7])')) + [dir]
|
||||
else
|
||||
let list += [dir] + filter(pathogen#expand(dir.sep.name), '!pathogen#is_disabled(v:val)')
|
||||
endif
|
||||
endfor
|
||||
let &rtp = pathogen#join(pathogen#uniq(list))
|
||||
return 1
|
||||
endfunction
|
||||
|
||||
let s:done_bundles = {}
|
||||
|
||||
" Invoke :helptags on all non-$VIM doc directories in runtimepath.
|
||||
function! pathogen#helptags() abort
|
||||
let sep = pathogen#slash()
|
||||
for glob in pathogen#split(&rtp)
|
||||
for dir in map(split(glob(glob), "\n"), 'v:val.sep."/doc/".sep')
|
||||
if (dir)[0 : strlen($VIMRUNTIME)] !=# $VIMRUNTIME.sep && filewritable(dir) == 2 && !empty(split(glob(dir.'*.txt'))) && (!filereadable(dir.'tags') || filewritable(dir.'tags'))
|
||||
silent! execute 'helptags' pathogen#fnameescape(dir)
|
||||
endif
|
||||
endfor
|
||||
endfor
|
||||
endfunction
|
||||
|
||||
command! -bar Helptags :call pathogen#helptags()
|
||||
|
||||
" Execute the given command. This is basically a backdoor for --remote-expr.
|
||||
function! pathogen#execute(...) abort
|
||||
for command in a:000
|
||||
execute command
|
||||
endfor
|
||||
return ''
|
||||
endfunction
|
||||
|
||||
" Section: Unofficial
|
||||
|
||||
function! pathogen#is_absolute(path) abort
|
||||
return a:path =~# (has('win32') ? '^\%([\\/]\|\w:\)[\\/]\|^[~$]' : '^[/~$]')
|
||||
endfunction
|
||||
|
||||
" Given a string, returns all possible permutations of comma delimited braced
|
||||
" alternatives of that string. pathogen#expand('/{a,b}/{c,d}') yields
|
||||
" ['/a/c', '/a/d', '/b/c', '/b/d']. Empty braces are treated as a wildcard
|
||||
" and globbed. Actual globs are preserved.
|
||||
function! pathogen#expand(pattern, ...) abort
|
||||
let after = a:0 ? a:1 : ''
|
||||
if a:pattern =~# '{[^{}]\+}'
|
||||
let [pre, pat, post] = split(substitute(a:pattern, '\(.\{-\}\){\([^{}]\+\)}\(.*\)', "\\1\001\\2\001\\3", ''), "\001", 1)
|
||||
let found = map(split(pat, ',', 1), 'pre.v:val.post')
|
||||
let results = []
|
||||
for pattern in found
|
||||
call extend(results, pathogen#expand(pattern))
|
||||
endfor
|
||||
elseif a:pattern =~# '{}'
|
||||
let pat = matchstr(a:pattern, '^.*{}[^*]*\%($\|[\\/]\)')
|
||||
let post = a:pattern[strlen(pat) : -1]
|
||||
let results = map(split(glob(substitute(pat, '{}', '*', 'g')), "\n"), 'v:val.post')
|
||||
else
|
||||
let results = [a:pattern]
|
||||
endif
|
||||
let vf = pathogen#slash() . 'vimfiles'
|
||||
call map(results, 'v:val =~# "\\*" ? v:val.after : isdirectory(v:val.vf.after) ? v:val.vf.after : isdirectory(v:val.after) ? v:val.after : ""')
|
||||
return filter(results, '!empty(v:val)')
|
||||
endfunction
|
||||
|
||||
" \ on Windows unless shellslash is set, / everywhere else.
|
||||
function! pathogen#slash() abort
|
||||
return !exists("+shellslash") || &shellslash ? '/' : '\'
|
||||
endfunction
|
||||
|
||||
function! pathogen#separator() abort
|
||||
return pathogen#slash()
|
||||
endfunction
|
||||
|
||||
" Convenience wrapper around glob() which returns a list.
|
||||
function! pathogen#glob(pattern) abort
|
||||
let files = split(glob(a:pattern),"\n")
|
||||
return map(files,'substitute(v:val,"[".pathogen#slash()."/]$","","")')
|
||||
endfunction
|
||||
|
||||
" Like pathogen#glob(), only limit the results to directories.
|
||||
function! pathogen#glob_directories(pattern) abort
|
||||
return filter(pathogen#glob(a:pattern),'isdirectory(v:val)')
|
||||
endfunction
|
||||
|
||||
" Remove duplicates from a list.
|
||||
function! pathogen#uniq(list) abort
|
||||
let i = 0
|
||||
let seen = {}
|
||||
while i < len(a:list)
|
||||
if (a:list[i] ==# '' && exists('empty')) || has_key(seen,a:list[i])
|
||||
call remove(a:list,i)
|
||||
elseif a:list[i] ==# ''
|
||||
let i += 1
|
||||
let empty = 1
|
||||
else
|
||||
let seen[a:list[i]] = 1
|
||||
let i += 1
|
||||
endif
|
||||
endwhile
|
||||
return a:list
|
||||
endfunction
|
||||
|
||||
" Backport of fnameescape().
|
||||
function! pathogen#fnameescape(string) abort
|
||||
if exists('*fnameescape')
|
||||
return fnameescape(a:string)
|
||||
elseif a:string ==# '-'
|
||||
return '\-'
|
||||
else
|
||||
return substitute(escape(a:string," \t\n*?[{`$\\%#'\"|!<"),'^[+>]','\\&','')
|
||||
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(<count>,'edit<bang>',<q-args>,0)
|
||||
command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vedit :execute s:find(<count>,'edit<bang>',<q-args>,0)
|
||||
command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vopen :execute s:find(<count>,'edit<bang>',<q-args>,1)
|
||||
command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vsplit :execute s:find(<count>,'split',<q-args>,<bang>1)
|
||||
command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vvsplit :execute s:find(<count>,'vsplit',<q-args>,<bang>1)
|
||||
command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vtabedit :execute s:find(<count>,'tabedit',<q-args>,<bang>1)
|
||||
command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vpedit :execute s:find(<count>,'pedit',<q-args>,<bang>1)
|
||||
command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vread :execute s:find(<count>,'read',<q-args>,<bang>1)
|
||||
|
||||
" vim:set et sw=2 foldmethod=expr foldexpr=getline(v\:lnum)=~'^\"\ Section\:'?'>1'\:getline(v\:lnum)=~#'^fu'?'a1'\:getline(v\:lnum)=~#'^endf'?'s1'\:'=':
|
||||
@ -1 +0,0 @@
|
||||
Subproject commit 466198adc015a9d81e975374d8e206dcf3efd173
|
||||
@ -1 +0,0 @@
|
||||
Subproject commit 66c2839bb1126c71a0a2d1da9804161ccd3b78b6
|
||||
@ -1 +0,0 @@
|
||||
Subproject commit 688837f23daa953a921a56c1780464d182577e6c
|
||||
@ -1 +0,0 @@
|
||||
Subproject commit b803a28f47b26d16f5fe9e747850992c9985c667
|
||||
@ -1 +0,0 @@
|
||||
Subproject commit bdb4454ab0dfb29d8b84b2515d77d013bed564d8
|
||||
@ -1 +0,0 @@
|
||||
Subproject commit f42c2fdfe78050b21eb37d970aa4b2ecbcf637db
|
||||
21
vim/vimrc
21
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
|
||||
|
||||
39
zsh/zshrc
39
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"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user