summaryrefslogtreecommitdiff
path: root/vim
diff options
context:
space:
mode:
authorMiguel <m.i@gmx.at>2019-01-27 20:05:18 +0100
committerMiguel <m.i@gmx.at>2019-01-27 20:05:18 +0100
commitdfe1efe982999312aba825c98918cdd205870cd2 (patch)
treed6e0d16f717e8d970584da50794b3c7ff2231507 /vim
parentbd0c6bc05c529e90317e9b3d6f0ba7890a1ebca3 (diff)
some updates
Diffstat (limited to 'vim')
-rw-r--r--vim/README.md6
-rw-r--r--vim/vimrc36
2 files changed, 31 insertions, 11 deletions
diff --git a/vim/README.md b/vim/README.md
index e4fe8e7..ef26c2e 100644
--- a/vim/README.md
+++ b/vim/README.md
@@ -1,7 +1,8 @@
My Vimrc Config
===============
-This directory hosts my personal vim config files.
+This repo hosts my personal vim config files.
+They are very unlikely to be useful to anybody (excepting me) at this point.
Dependancies
============
@@ -13,7 +14,6 @@ I found the foloowing on vim.org.
* syntax/htmljinja.vim
* syntax/jinja.vim
-
Installation
============
@@ -37,7 +37,7 @@ Steve Losh's book: Learn Vimscript The Hard Way: http://learnvimscriptthehardway
License
=======
-Copyright (c) 2014-2018 Michal Idziorek (unless stated otherwise)
+Copyright (c) 2014-2019 Michal Idziorek (unless stated otherwise)
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
diff --git a/vim/vimrc b/vim/vimrc
index d716a0e..63dc82d 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -1,11 +1,13 @@
"""""""""""""""""""""""""""""""""""""
" Miguel's .vimrc "
" Author: Michal Idziorek "
-" Last Update: 2018-05-29 "
+" Last Update: 2018-OCT-17 "
"""""""""""""""""""""""""""""""""""""
" {{{ TODO / NOTES
"
+" NEW: https://github.com/vim-airline/vim-airline
+"
" http://www.alexeyshmalko.com/2014/using-vim-as-c-cpp-ide/
" set exrc
" set secure
@@ -88,6 +90,7 @@
" {{{ Vundle - Plugin Manager
"
" Vundle plugin manager (Replaces pathogen)"
+
" https://github.com/VundleVim/Vundle.vim
set nocompatible
filetype off
@@ -104,12 +107,15 @@ Plugin 'gmarik/Vundle.vim'
" github plugins
" Plugin 'Valloric/YouCompleteMe'
-Plugin 'fholgado/minibufexpl.vim'
+
Plugin 'scrooloose/nerdtree'
+Plugin 'altercation/vim-colors-solarized'
+
+Plugin 'fholgado/minibufexpl.vim'
Plugin 'majutsushi/tagbar'
Plugin 'tpope/vim-fugitive'
Plugin 'tpope/vim-sensible'
-Plugin 'vim-scripts/Conque-GDB'
+"""Plugin 'vim-scripts/Conque-GDB'
" My own plugins on github
" Plugin 'git://ex40.softwarefools.com/vim-potion.git'
@@ -167,6 +173,7 @@ filetype plugin indent on
" misc!
" {{{
+set expandtab
let g:potion_command = "/home/miguel/int/dev/potion/bin/potion"
set nocompatible
@@ -214,9 +221,10 @@ set statusline+=%= " Switch to the right side
set statusline+=%l " Current line
set statusline+=/ " Separator
set statusline+=%L " Total lines
-set statusline+=, " comma
+set statusline+=, " comma
set statusline+=%c " Column
set statusline+=\ (%P) " Percentage
+set statusline& " reset?
" }}}
" terminal width / colorcolumn
@@ -254,8 +262,18 @@ set foldlevelstart=0
" colorscheme / syntax highlight
" {{{
"colorscheme olgas
-colorscheme desert
+"colorscheme miguels
syntax enable
+
+if has('gui_running')
+ set background=light
+else
+ set background=dark
+endif
+
+ set background=dark
+
+colorscheme solarized
syntax sync fromstart
" }}}
@@ -299,8 +317,9 @@ inoremap jk <esc>
" display help in new tab on <F1>
map <F1> :tab help<CR>
-map <F5> :silent make \| copen \| redraw!<CR>
-map <F5> :silent make \| redraw!<CR>
+"map <F5> :silent make \| copen \| redraw!<CR>
+"map <F5> :silent make \| redraw!<CR>
+map <F5> :make<CR>
" retab
map <leader>rt :retab!<CR>
@@ -416,7 +435,8 @@ augroup filetype_haskell
autocmd!
autocmd FileType haskell setlocal foldmethod=marker
" autocmd Filetype haskell map <F5> :w<ENTER>:term cabal -- exec runghc %<ENTER>
- autocmd Filetype haskell map <F5> :w<ENTER>:term make<ENTER>
+" autocmd Filetype haskell map <F5> :w<ENTER>:term make<ENTER>
+ " autocmd Filetype haskell map <F5> :w<ENTER>:term make<ENTER>
autocmd FileType haskell setlocal expandtab
augroup END
" }}}