Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

bug replace project for command-t, change schema, fixes

  • Loading branch information...
commit b3221f9c9079aaae1617e61299f5a2b74c7633e8 1 parent 63689f2
Ondrej Brablc authored
3  .dotvim-init
View
@@ -6,3 +6,6 @@ cd ~/.vim
git submodule init
env GIT_SSL_NO_VERIFY=true git submodule update
+cd ~/.vim/bundle/command-t
+rake make
+
22 .gitmodules
View
@@ -6,14 +6,6 @@
path = bundle/ack
url = https://github.com/mileszs/ack.vim.git
ignore = untracked
-#[submodule "bundle/command-t"]
-# path = bundle/command-t
-# url = git://git.wincent.com/command-t.git
-# ignore = untracked
-#[submodule "bundle/solarized"]
-# path = bundle/solarized
-# url = https://github.com/altercation/vim-colors-solarized.git
-# ignore = untracked
[submodule "bundle/matchit"]
path = bundle/matchit
url = https://github.com/tsaleh/vim-matchit.git
@@ -22,10 +14,6 @@
path = bundle/nerdcommenter
url = https://github.com/scrooloose/nerdcommenter.git
ignore = untracked
-[submodule "vim-repeat"]
- path = vim-repeat
- url = https://github.com/tpope/vim-repeat.git
- ignore = untracked
[submodule "bundle/repeat"]
path = bundle/repeat
url = https://github.com/tpope/vim-repeat.git
@@ -62,7 +50,11 @@
path = bundle/mru
url = https://github.com/vim-scripts/mru.vim
ignore = untracked
-[submodule "bundle/project"]
- path = bundle/project
- url = https://github.com/shemerey/vim-project.git
+[submodule "bundle/solarized"]
+ path = bundle/solarized
+ url = https://github.com/altercation/vim-colors-solarized.git
+ ignore = untracked
+[submodule "bundle/command-t"]
+ path = bundle/command-t
+ url = git://git.wincent.com/command-t.git
ignore = untracked
21 .vimrc
View
@@ -8,10 +8,13 @@ call pathogen#helptags()
"" Generic VIM settings
set history=50 " keep 50 lines of command line history
-set foldenable
+set backspace=indent,eol,start
+"set foldenable
set viewoptions=folds,options,cursor,unix,slash
set pastetoggle=<F2>
set showmode
+"set number
+set virtualedit=onemore
" Search
set incsearch " do incremental searching
@@ -27,8 +30,6 @@ set sw=4
set expandtab
set smarttab
-" Colors and fonts
-" colorscheme vividchalk
" Nicer status line
set statusline=%F%m%r%h%w\ [%{&ff}/%Y]%=[%04l,%04v][%p%%/%L]
@@ -38,13 +39,17 @@ set laststatus=2
set guioptions+=c
set showcmd " display incomplete commands
+set nolist
if has("gui_running")
" Maximize gvim window.
set lines=999 columns=999
+ colorscheme solarized
+ set background=dark
+else
+ set listchars=tab:»·,trail:·
+ colorscheme blue
endif
-set nolist
-set listchars=tab:»·,trail:·
" Tab completion options
" (only complete to the longest unambiguous match, and show a menu)
@@ -62,6 +67,7 @@ syntax enable
filetype plugin indent on
au FileType php set omnifunc=phpcomplete
+
" Leader Mappings
let mapleader = ","
@@ -73,6 +79,11 @@ nnoremap <silent> <Leader>h :nohlsearch<cr>
nnoremap <Leader>b :silent :%s/\s\+$//<cr>:noh<cr>``
" - Display extra whitespace
nnoremap <Leader>l :set list!<CR>
+" - Chage dir to the current path
+nnoremap <Leader>p :cd %:p:h<CR>
+
+map <Leader>f <Esc>:EnableFastPHPFolds<Cr>
+map <Leader>u <Esc>:DisablePHPFolds<Cr>
" Regular Mappings
2  after/ftplugin/php.vim
View
@@ -1,5 +1,5 @@
" Don't use the PHP syntax folding
setlocal foldmethod=manual
" Turn on PHP fast folds
-EnableFastPHPFolds
+"EnableFastPHPFolds
1  bundle/command-t
@@ -0,0 +1 @@
+Subproject commit cee619ac6e906d1c6bfc3052f01ccaa6ac1d4b3c
1  bundle/solarized
@@ -0,0 +1 @@
+Subproject commit 528a59f26d12278698bb946f8fb82a63711eec21
Please sign in to comment.
Something went wrong with that request. Please try again.