Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of github.com:svenstaro/dotfiles

  • Loading branch information...
commit 1d0d786975868884afb1a7aa199851e4efedb151 2 parents 48b02cd + d95b3e3
@svenstaro authored
View
2  .bashrc
@@ -18,7 +18,7 @@ alias svim='sudo vim'
alias mkchr='sudo extra-i686-build && sudo multilib-build'
alias mkchr32='sudo extra-i686-build'
alias mkchr64='sudo multilib-build'
-alias db-aur='ssh sigurd.archlinux.org /arch/db-update'
+alias db-update='ssh nymeria.archlinux.org /srv/repos/svn-community/dbscripts/db-update'
export PS1='\[\e[0;32m\]\u\[\e[1;30m\]@\[\e[0;36m\]\h\[\e[0m\] \[\e[0;33m\]\w\[\e[0;37m\]\$\[\e[0m\] '
export PATH="/usr/lib/colorgcc/bin:$PATH"
View
14 .gitconfig
@@ -1,8 +1,12 @@
[user]
- name = Sven-Hendrik Haase
- email = sh@lutzhaase.com
+ name = Sven-Hendrik Haase
+ email = sh@lutzhaase.com
[color]
- diff = auto
- status = auto
- branch = auto
+ diff = auto
+ status = auto
+ branch = auto
+ interactive = auto
+
+[alias]
+ lg = log --graph --all --format=format:'%C(yellow)%h%C(reset) - %C(cyan)%ci%C(reset) %C(green)(%cr)%C(reset) %C(bold yellow)%d%C(reset)%n %C(white)%s%C(reset) %C(bold white)- %cn%C(reset)%n' --abbrev-commit --date=relative
View
1  .makepkg.conf
@@ -1,3 +1,2 @@
MAKEFLAGS="-j9"
PACKAGER="Sven-Hendrik Haase <sh@lutzhaase.com>"
-SIGNPKG="y"
View
10 .mplayer/config
@@ -0,0 +1,10 @@
+# Write your default config options here!
+
+cache=262144
+cache-min=1
+vo=xv
+ass=yes
+embeddedfonts=yes
+correct-pts=yes
+softvol=yes
+use-filename-title=yes
View
10 .vimrc
@@ -1,7 +1,7 @@
" basics
-set t_Co=256 " set 256 color
set nocompatible " use Vim defaults
set mouse=a " make sure mouse is used in all cases.
+set t_Co=256 " set 256 color
colorscheme wombat256 " define syntax color scheme
set shortmess+=I " disable the welcome screen
set clipboard+=unnamed " yank and copy to X clipboard
@@ -17,7 +17,8 @@ set showmatch " show matching brackets (),{},[]
set matchpairs+=<:> " match < and > as well
set mat=5 " show matching brackets for 0.5 seconds
"set background=dark " we don't like bright white terminals
-set gfn=Bitstream\ Vera\ Sans\ Mono\ 9
+"set gfn=Bitstream\ Vera\ Sans\ Mono\ 8
+set gfn=Tamsyn\ 8
set number " show line numbers
" cursor settings
@@ -129,8 +130,11 @@ autocmd FileType python let python_slow_sync = 1
"autocmd FileType python set expandtab shiftwidth=4 softtabstop=4
autocmd Filetype tex,latex :set grepprg=grep\ -nH\ $*
autocmd Filetype tex,latex :set dictionary=~/.vim/dict/latex.dict
-autocmd Filetype tex,latex :set textwidth=79
+autocmd Filetype tex,latex :set textwidth=99
" gui
set guioptions-=m " remove menubar
set guioptions-=T " remove toolbar
+
+" additional syntax
+au BufRead,BufNewFile *.qml setfiletype qml
View
4 menvid.sh
@@ -11,8 +11,8 @@ if [[ ${2} != "" ]]; then
fi
echo -e "Using bitrate of $bitrate \n"
-mencoder mf://*.png -mf w=1280:h=800:fps=15:type=png -ovc x264 -x264encopts threads=auto:pass=1:bitrate=$bitrate:slow_firstpass -oac copy -o $output
-mencoder mf://*.png -mf w=1280:h=800:fps=15:type=png -ovc x264 -x264encopts threads=auto:pass=2:bitrate=$bitrate -oac lavc -lavcopts acodec=vorbis -o "${output}"
+mencoder mf://*.png -mf w=1366:h=768:fps=20:type=png -ovc x264 -x264encopts threads=auto:pass=1:bitrate=$bitrate:slow_firstpass -oac copy -o $output
+mencoder mf://*.png -mf w=1366:h=768:fps=20:type=png -ovc x264 -x264encopts threads=auto:pass=2:bitrate=$bitrate -oac lavc -lavcopts acodec=vorbis -o "${output}"
#mencoder mf://*.png -mf w=1280:h=800:fps=15:type=png -ovc lavc -lavcopts vcodec=ffv1 -oac copy -o $output
#mencoder "${1}" -ovc x264 -x264encopts threads=auto:pass=1:bitrate=$bitrate:slow_firstpass -oac lavc -lavcopts acodec=vorbis -o "${output}"
#mencoder "${1}" -ovc x264 -x264encopts threads=auto:pass=2:bitrate=$bitrate -oac lavc -lavcopts acodec=vorbis -o "${output}"
Please sign in to comment.
Something went wrong with that request. Please try again.