aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitmodules3
m---------.vim/bundle/Vundle.vim.git0
-rw-r--r--.vim/bundles.vim38
-rw-r--r--.vimrc13
-rw-r--r--README.md10
5 files changed, 2 insertions, 62 deletions
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 29d0cb4..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule ".vim/bundle/Vundle.vim.git"]
- path = .vim/bundle/Vundle.vim.git
- url = https://github.com/gmarik/Vundle.vim.git
diff --git a/.vim/bundle/Vundle.vim.git b/.vim/bundle/Vundle.vim.git
deleted file mode 160000
-Subproject b255382d6242d7ea3877bf059d2934125e0c4d9
diff --git a/.vim/bundles.vim b/.vim/bundles.vim
deleted file mode 100644
index 8d012ac..0000000
--- a/.vim/bundles.vim
+++ /dev/null
@@ -1,38 +0,0 @@
-" Vundle setup
-set rtp+=~/.vim/bundle/Vundle.vim.git
-call vundle#begin()
-
-Plugin 'gmarik/Vundle.vim'
-
-" My list of plugins.
-Plugin 'tpope/vim-surround.git'
-Plugin 'kien/ctrlp.vim.git'
-Plugin 'derekwyatt/vim-scala.git'
-Plugin 'fatih/vim-go'
-Plugin 'Glench/Vim-Jinja2-Syntax'
-Plugin 'saltstack/salt-vim'
-Plugin 'b4b4r07/vim-hcl'
-Plugin 'fatih/vim-hclfmt'
-
-call vundle#end()
-
-""
-" Some small adjustments for the installed plugins.
-
-" vim-surround.vim: <leader>s is used to surround a word.
-map <leader>s ysiw
-
-" Let CtrlP's window to be taller than its default configuration.
-let g:ctrlp_match_window = 'max:40'
-
-" Hi-yo Silver!
-let g:ctrlp_user_command = 'ag %s -l --nocolor --hidden -g ""'
-
-" Tell vim-go to use goimports on save.
-let g:go_fmt_command = "goimports"
-
-" Execute go-lint on save.
-if isdirectory($GOPATH."/src/github.com/golang/lint/misc/vim")
- set rtp+=$GOPATH/src/github.com/golang/lint/misc/vim
- autocmd BufWritePost,FileWritePost *.go execute 'Lint' | cwindow
-endif
diff --git a/.vimrc b/.vimrc
index 18c6b4e..6ac8fcc 100644
--- a/.vimrc
+++ b/.vimrc
@@ -108,19 +108,6 @@ set expandtab
set backspace=indent,eol,start
""
-" Plugins.
-
-filetype off
-filetype indent plugin off
-
-" All the plugins are listed in my bundles file, that will be installed
-" inside the ~/.vim directory.
-source ~/.vim/bundles.vim
-
-" Enable plugins again.
-filetype indent plugin on
-
-""
" Everything regarding filetypes: indentation rules, gofmt & friends.
source ~/.vim/autocmd.vim
diff --git a/README.md b/README.md
index 800a14a..ae64b98 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,5 @@
-These are my personal dotfiles, use them at your own risk! You can download
-everything by performing the following command (notice the `--recursive` flag):
-
-```bash
-$ git clone --recursive https://github.com/mssola/dotfiles.git
-```
-
-To install everything just run the `install.sh` script.
+These are my personal dotfiles, use them at your own risk! To install everything
+just run the `install.sh` script.
## GNU Emacs