Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

fixes and updates

  • Loading branch information...
commit 5e5d8f1f579df5ba189f1f2ddc8d5948288831b4 1 parent c76a867
@mremolt-dcs mremolt-dcs authored
Showing with 35 additions and 32 deletions.
  1. +2 −0  gvimrc
  2. +2 −5 tmux.conf
  3. +1 −1  vim/bundle/Command-T
  4. +1 −1  vim/bundle/Gist.vim
  5. +1 −1  vim/bundle/delimitMate
  6. +1 −1  vim/bundle/gundo.vim
  7. +1 −1  vim/bundle/jasmine.vim
  8. +1 −1  vim/bundle/jslint.vim
  9. +1 −1  vim/bundle/nerdtree
  10. +1 −1  vim/bundle/snipmate-snippets
  11. +1 −1  vim/bundle/supertab
  12. +1 −1  vim/bundle/syntastic
  13. +1 −1  vim/bundle/tagbar
  14. +1 −1  vim/bundle/tcomment_vim
  15. +1 −1  vim/bundle/tlib_vim
  16. +1 −1  vim/bundle/vim-addon-mw-utils
  17. +1 −1  vim/bundle/vim-coffee-script
  18. +1 −1  vim/bundle/vim-cucumber
  19. +1 −1  vim/bundle/vim-javascript
  20. +1 −1  vim/bundle/vim-markdown
  21. +1 −0  vim/bundle/vim-numbertoggle
  22. +1 −1  vim/bundle/vim-powerline
  23. +1 −1  vim/bundle/vim-rails
  24. +1 −1  vim/bundle/vim-repeat
  25. +1 −1  vim/bundle/vim-snipmate
  26. +1 −1  vim/bundle/vim-surround
  27. +1 −1  vim/bundle/vim-unimpaired
  28. +1 −1  vim/bundle/vundle
  29. +1 −1  vim/bundle/zencoding-vim
  30. +1 −0  vim/vundle.vim
  31. +1 −1  vimrc
  32. +2 −0  zshrc
View
2  gvimrc
@@ -1,6 +1,8 @@
" helper functions
source ~/.vim/functions.vim
+colorscheme solarized
+
" ,s for ConqueTerm
map <Leader>s :call StartTerm()<CR>
View
7 tmux.conf
@@ -73,7 +73,8 @@ set -g mouse-select-window on
# Set the default terminal mode to 256color mode
# START:termcolor
-set -g default-terminal "screen-256color"
+#set -g default-terminal "screen-256color"
+set -g default-terminal "xterm"
# END:termcolor
# enable activity alerts
@@ -184,7 +185,3 @@ bind C-v run "tmux set-buffer \"$(xclip -o -sel clipboard)\"; tmux paste-buffer"
-ng /home/mremolt/.rvm/gems/ruby-1.9.3-p125-perf
-
-
-
2  vim/bundle/Command-T
@@ -1 +1 @@
-Subproject commit 18686a82a2e4d015b877bf0b6867a269aa8a284f
+Subproject commit ca5566eb312f57b9f4091023cfc03ad8e692bf29
2  vim/bundle/Gist.vim
@@ -1 +1 @@
-Subproject commit 1eb0321b458a97554c4514095e4558e2e95f4df8
+Subproject commit dc2d64434467a2bbab8a419cd66afeac47e4162f
2  vim/bundle/delimitMate
@@ -1 +1 @@
-Subproject commit 39b8298390a9171c796df077ad3c5f3c0f111c56
+Subproject commit 5a84c1a746cad05288a7bf9c7e0739c1ac56b420
2  vim/bundle/gundo.vim
@@ -1 +1 @@
-Subproject commit 50092711ff831742cece76f3322674858863e3f3
+Subproject commit 7198c51b5d2b145b5ca4899fda8397e7f68efa77
2  vim/bundle/jasmine.vim
@@ -1 +1 @@
-Subproject commit 525ba3857ab4628091f67a9b14638b3f9fa77568
+Subproject commit 9e389d6159515d2eaf617b658bf38cb0a59c144e
2  vim/bundle/jslint.vim
@@ -1 +1 @@
-Subproject commit 8605dd82733497929046b294f42a5e35dcd1f906
+Subproject commit 47065878071458833ba4e40ac57eb7ef40dc977a
2  vim/bundle/nerdtree
@@ -1 +1 @@
-Subproject commit 2a0578227ebcc334da64f5e93137926388f71ce6
+Subproject commit 2cb0fc78fb4c7a1db5f51c042a447cc50f09983d
2  vim/bundle/snipmate-snippets
@@ -1 +1 @@
-Subproject commit 8a3c78decc04e00884ce3fd70d38d41638ad7af4
+Subproject commit 036dc1ad1136f6fe057a91a60078b2032273250c
2  vim/bundle/supertab
@@ -1 +1 @@
-Subproject commit ac395b57fec47f034cba151d01669d134ac7041b
+Subproject commit 8302775fc2dee4935c35f3436e59486940dba3b8
2  vim/bundle/syntastic
@@ -1 +1 @@
-Subproject commit ad1481c2ce7c1859f4d3ca877b5759c5d5689e0c
+Subproject commit 7fc5246be4be9e1034e84266ae567a08e193f764
2  vim/bundle/tagbar
@@ -1 +1 @@
-Subproject commit f14c81770b3d22f9e82761c151885ef04444690d
+Subproject commit 272e2e84784e9a4bc7603da9ca26a22ff6c8e6b9
2  vim/bundle/tcomment_vim
@@ -1 +1 @@
-Subproject commit 9f2d0d803dea913013e0abd90bb943e4873e8a37
+Subproject commit 87adab024258071cd4bc6055d544605505a160e1
2  vim/bundle/tlib_vim
@@ -1 +1 @@
-Subproject commit 4fcd23ff95dca1322a1f691e223815bb60805085
+Subproject commit 4bfa2df5cfe9a139d65ab9a3ca1609623e968b90
2  vim/bundle/vim-addon-mw-utils
@@ -1 +1 @@
-Subproject commit a2676b4225b8a370b9e7046c5fc2f5ad1155e590
+Subproject commit d1bfbc589944fcb84af887aec79074d80a327f4c
2  vim/bundle/vim-coffee-script
@@ -1 +1 @@
-Subproject commit 049c8cc01c32931ff115f15b44dfc3a8d3a35872
+Subproject commit d6dcb9b0fb5beac9e84cfb84c1917b7e0df5850f
2  vim/bundle/vim-cucumber
@@ -1 +1 @@
-Subproject commit 51180532f4ceffc1613f57f8a35d1db941c11d81
+Subproject commit 8112713aaf04192d255761b3d19279f2b9582996
2  vim/bundle/vim-javascript
@@ -1 +1 @@
-Subproject commit e66f9019b4eca05d7f5dfe38c742cf42e641e98d
+Subproject commit a599ac8ecede3a30f5a89e6f9f704d97a04f982e
2  vim/bundle/vim-markdown
@@ -1 +1 @@
-Subproject commit fdc0f091c78cd9a474ac3e3cf40ba7d6933ef9da
+Subproject commit 3a99157473cb6508d1bc6f5980f928f27f52d65b
1  vim/bundle/vim-numbertoggle
@@ -0,0 +1 @@
+Subproject commit c07baef29c3caf7e4b38af2d0e2d10bb460ffe22
2  vim/bundle/vim-powerline
@@ -1 +1 @@
-Subproject commit 27f18a2276f5be338b86d766ab19155495bf3775
+Subproject commit 65e54dde89c73cae4cf089a83f5c26d605dda594
2  vim/bundle/vim-rails
@@ -1 +1 @@
-Subproject commit 1599eecc7105971409d041e5acfe0fa85b23a097
+Subproject commit 04c7b18f66963e3bdb6307052c2dbeb89aad7ead
2  vim/bundle/vim-repeat
@@ -1 +1 @@
-Subproject commit cdffdd43816ddaeee858ae42da3ab6ddcfa25d19
+Subproject commit d75a544b786710705f0db0d8d8fd66ca4a5a7239
2  vim/bundle/vim-snipmate
@@ -1 +1 @@
-Subproject commit 4cef3fca6969155698cda224acfb0843c2d6c6b4
+Subproject commit 3f52de449280badc57c0d41014e64d051166e741
2  vim/bundle/vim-surround
@@ -1 +1 @@
-Subproject commit 4eb2cdfccc016889acfa3b5d63e8f390a87863cf
+Subproject commit 489a1e8c676ad47dd358dbf883bfaf492148d38b
2  vim/bundle/vim-unimpaired
@@ -1 +1 @@
-Subproject commit 52eef03408f0df43b7a05484e2278a2acb777944
+Subproject commit e8013727a008a68664a789fe0d2b5c2ab2ecf657
2  vim/bundle/vundle
@@ -1 +1 @@
-Subproject commit eb6e676d3eef214525a293c5eac6f1681004c18d
+Subproject commit 59bff0c457f68c3d52bcebbf6068ea01ac8f5dac
2  vim/bundle/zencoding-vim
@@ -1 +1 @@
-Subproject commit 3766ec94eaff3364b8714f4fc7f1b43c46221552
+Subproject commit e1015e84709454e26277df33b6dbb7dace1d65a7
View
1  vim/vundle.vim
@@ -30,6 +30,7 @@ Bundle 'mileszs/ack.vim'
Bundle 'michaeljsmith/vim-indent-object'
Bundle "cakebaker/scss-syntax.vim.git"
Bundle 'altercation/vim-colors-solarized'
+Bundle 'jeffkreeftmeijer/vim-numbertoggle'
Bundle "MarcWeber/vim-addon-mw-utils"
Bundle "tomtom/tlib_vim"
View
2  vimrc
@@ -9,7 +9,7 @@ set t_Co=256
syntax enable
set background=dark
let g:solarized_termcolors=256
-colorscheme solarized
+colorscheme desert
call togglebg#map("<F9>")
set relativenumber
View
2  zshrc
@@ -73,6 +73,8 @@ export RUBY_HEAP_SLOTS_GROWTH_FACTOR=1
export RUBY_GC_MALLOC_LIMIT=1000000000
export RUBY_HEAP_FREE_MIN=500000
+alias tmux="TERM=screen-256color-bce tmux"
+
alias es="cd ~/workspace/gfk_emoscan_admin/source/dcs_emoscan && rvm use ruby-1.9.3-p125-perf && clear"
alias ga="cd ~/workspace/gfk_answers/source && rvm use ruby-1.9.3-p125-perf && clear"
alias stunden="(cd ~/workspace/dcs_stunden && ./ci.sh)"
Please sign in to comment.
Something went wrong with that request. Please try again.