Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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

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

0 comments on commit 1d0d786

Please sign in to comment.
Something went wrong with that request. Please try again.