some updates

This commit is contained in:
Steffen Vogel 2015-10-18 12:23:39 +02:00
parent 960b257a37
commit f2eb8b2013
8 changed files with 62 additions and 27 deletions

5
devtools.sh Executable file
View File

@ -0,0 +1,5 @@
#!/bin/bash
gem install travis -v 1.8.0 --no-rdoc --no-ri
pip install awscli

4
home/.aws/config Normal file
View File

@ -0,0 +1,4 @@
[default]
region = eu-central-1
[preview]
cloudfront = true

View File

@ -1,15 +1,18 @@
export PATH=$PATH:~/bin/scripts:~/bin
export PATH=~/bin/scripts:~/bin:/usr/local/bin:$PATH
if [ -d /opt/local/bin ]; then
# We are on a Macports system
if [ -d /opt/local ]; then
export PATH=/opt/local/bin:$PATH
fi
if [ -d /opt/local/libexec/gnubin ]; then
export PATH=/opt/local/Library/Frameworks/Python.framework/Versions/Current/bin/:$PATH
export PATH=/opt/local/libexec/gnubin:$PATH
fi
if [ -d /opt/local/sbin/ -a "$(id -u)" -eq "0" ]; then
export PATH=/opt/local/sbin:$PATH
if [ "$(id -u)" -eq "0" ]; then
if [ -d /opt/local/sbin ]; then
export PATH=/opt/local/sbin:$PATH
fi
export PATH=/usr/local/sbin:$PATH
fi
if [ -d /usr/local/MacGPG2/bin/ ]; then
@ -28,6 +31,17 @@ if [ -r ~/.gpg-agent-info ]; then
export SSH_AGENT_PID
fi
function aws {
local PASS=$(pass providers/aws)
local AWS=$(which aws)
# Start original aws executable with short-lived keys
AWS_ACCESS_KEY_ID=$(sed -En 's/^Access-Key: (.*)/\1/p' <<< "$PASS") \
AWS_SECRET_ACCESS_KEY=$(sed -En 's/^Secret-Key: (.*)/\1/p' <<< "$PASS") $AWS $@
}
export GCC_COLORS="error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01"
export EDITOR=vim
export DEBEMAIL="post@steffenvogel.de"
export DEBFULLNAME="Steffen Vogel"

View File

@ -12,6 +12,6 @@ fi
if [ -z "$DISPLAY" ] && [ -n "$XDG_VTNR" ] && [ "$XDG_VTNR" -eq "1" ]; then
exec startx
# start byobu session
elif [[ "$TERM" != "screen-bce" && "$SSH_CONNECTION" != "" ]]; then
elif [[ "$TERM" != "screen-bce" && "$SSH_CONNECTION" != "" && "$HOSTNAME" != "cam-deb" ]]; then
/usr/bin/byobu-screen -xR -S sshscreen && exit
fi

View File

@ -18,10 +18,10 @@
ignorecase = false
[merge]
tool = vimdiff
tool = meld
[diff]
tool = vimdiff
tool = meld
[rerere]
# Store and re-use manual conflict resolution changes.
@ -29,7 +29,7 @@
[core]
# Exclude everything this file. Used for general exclusions.
excludesfile = ~/.gitignore
excludesfile = /Users/stv0g/.gitignore
# Set attributes on files. Used for general diff improvements.
attributesfile = ~/.gitattributes
@ -39,10 +39,10 @@
autocorrect = 1
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
cmd = /opt/local/bin/meld $LOCAL $REMOTE
path =
[mergetool "sourcetree"]
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
cmd = /opt/local/bin/meld $LOCAL $REMOTE
trustExitCode = true
[diff "xml"]
@ -53,3 +53,7 @@
smtpServer = mail.0l.de
smtpUser = stv0g
smtpServerPort = 587
[filter "lfs"]
clean = git-lfs clean %f
smudge = git-lfs smudge %f
required = true

View File

@ -1,3 +1,5 @@
file:///Users/stv0g/workspace/rwth/s2ss
file:///Users/stv0g/workspace/rwth/acs
file:///home/stv0g/Dokumente
file:///home/stv0g/Musik
file:///home/stv0g/Bilder

View File

@ -9,6 +9,9 @@ colorscheme base16-default
" Vim Modus statt Vi Modus verwenden
set nocompatible
" Make backspace work like most other apps
set backspace=2
" Sets how many lines of history VIM has to remember
set history=1000
@ -91,25 +94,26 @@ let g:airline_powerline_fonts=1
let g:quickfixsigns#marks#buffer=split('abcdefghijklmnopqrstuvwxyz', '\zs')
let g:neocomplete#enable_at_startup=1
let g:neocomplete#sources#tags#cache_limit_size=4000000
let g:neosnippet#snippets_directory=['~/.vim/bundle/snippets/snippets']
let g:neocomplete#sources#tags#cache_limit_size=40000000
" Plugin key-mappings.
"imap <C-k> <Plug>(neosnippet_expand_or_jump)
"smap <C-k> <Plug>(neosnippet_expand_or_jump)
"xmap <C-k> <Plug>(neosnippet_expand_target)
" Trigger configuration.
let g:UltiSnipsExpandTrigger="<tab>"
let g:UltiSnipsJumpForwardTrigger="<c-b>"
let g:UltiSnipsJumpBackwardTrigger="<c-z>"
" SuperTab like snippets behavior.
imap <expr><TAB> neosnippet#expandable_or_jumpable() ?
\ "\<Plug>(neosnippet_expand_or_jump)"
\: pumvisible() ? "\<C-n>" : "\<TAB>"
smap <expr><TAB> neosnippet#expandable_or_jumpable() ?
\ "\<Plug>(neosnippet_expand_or_jump)"
\: "\<TAB>"
" If you want :UltiSnipsEdit to split your window.
let g:UltiSnipsEditSplit="vertical"
let g:UltiSnipsSnippetsDir="~/.homesick/repos/dotfiles/snippets/"
if !exists('g:neocomplete#sources#omni#input_patterns')
let g:neocomplete#sources#omni#input_patterns={}
endif
let g:neocomplete#sources#omni#input_patterns.tex='\v\\\a*(ref|cite)\a*([^]]*\])?\{([^}]*,)*[^}]*'
" For conceal markers.
if has('conceal')
set conceallevel=2 concealcursor=niv
set conceallevel=2 concealcursor=nv
endif
au BufNewFile,BufFilePre,BufRead *.md set filetype=markdown

View File

@ -35,6 +35,8 @@ case "$(hostname)" in
DISPLAY=:0.1 i3 &
sleep 0.1 && exec i3
;;
"cam-deb")
;;
*)
exec i3
esac