Switched to termite terminal

This commit is contained in:
Carolyn Saunders 2016-12-03 11:04:05 -08:00
parent 7f564ce9d1
commit e344212ef5
3 changed files with 97 additions and 3 deletions

View file

@ -4,7 +4,6 @@ Plug 'HerringtonDarkholme/yats', {'for' : 'typescript'}
Plug 'Shougo/vimproc.vim', {'do' : 'make'}
Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
Plug 'mhartington/deoplete-typescript', {'for' : 'typescript'}
Plug 'zchee/deoplete-go', {'do': 'make', 'for' : 'go'}
Plug 'Quramy/tsuquyomi', {'for' : 'typescript'}
Plug 'pangloss/vim-javascript', {'for' : 'javascript'}
Plug 'Quramy/vim-js-pretty-template', {'for' : 'javascript'}
@ -25,7 +24,6 @@ Plug 'vim-airline/vim-airline'
Plug 'vim-airline/vim-airline-themes'
Plug 'tpope/vim-fugitive'
Plug 'nathanaelkane/vim-indent-guides'
Plug 'fatih/vim-go', {'for' : 'go'}
Plug 'rust-lang/rust.vim', {'for' : 'rust'}
Plug 'sebastianmarkow/deoplete-rust', {'for' : 'rust'}
Plug 'cespare/vim-toml', {'for' : 'toml'}
@ -45,14 +43,22 @@ Plug 'fmoralesc/vim-tutor-mode', {'on' : 'Tutor'}
Plug 'Shougo/neosnippet'
Plug 'Shougo/neosnippet-snippets'
Plug 'wikitopian/hardmode'
Plug 'majutsushi/tagbar', {'on' : 'Tagbar'}
Plug 'chrisbra/improvedft'
Plug 'haya14busa/incsearch.vim'
Plug 'haya14busa/incsearch-fuzzy.vim'
Plug 'haya14busa/incsearch-easymotion.vim'
Plug 'mhinz/vim-startify'
call plug#end()
let g:ft_improved_ignorecase = 1
let test#strategy = "neoterm"
let g:elm_format_autosave = 1
"set tags=tags;/
set tags=./tags,tags;$HOME
let g:easytags_dynamic_files = 1
let g:easytags_async = 1
let g:easytags_events = ['BufWritePost']
set ttyfast
set number
set hidden
@ -158,6 +164,7 @@ noremap <Leader>q :q<CR>
noremap <Leader>r :%s/
noremap <Leader>f :Ack
noremap <Leader>n :NERDTreeToggle<CR>
noremap <leader>t :Tagbar<CR>
nmap <silent> <leader>ev :e $MYVIMRC<CR>
nmap <silent> <leader>sv :so $MYVIMRC<CR>
nnoremap <leader>bd :bd<CR>
@ -187,3 +194,47 @@ au FileType go nmap <leader>rt <Plug>(go-run-tab)
au FileType go nmap <Leader>rs <Plug>(go-run-split)
au FileType go nmap <Leader>rv <Plug>(go-run-vertical)
"tagbar
let g:tagbar_type_elixir = {
\ 'ctagstype' : 'elixir',
\ 'kinds' : [
\ 'f:functions',
\ 'functions:functions',
\ 'c:callbacks',
\ 'd:delegates',
\ 'e:exceptions',
\ 'i:implementations',
\ 'a:macros',
\ 'o:operators',
\ 'm:modules',
\ 'p:protocols',
\ 'r:records'
\ ]
\ }
"Incsearch
function! s:config_fuzzyall(...) abort
return extend(copy({
\ 'converters': [
\ incsearch#config#fuzzy#converter(),
\ incsearch#config#fuzzyspell#converter()
\ ],
\ }), get(a:, 1, {}))
endfunction
noremap <silent><expr> / incsearch#go(<SID>config_fuzzyall())
noremap <silent><expr> ? incsearch#go(<SID>config_fuzzyall({'command': '?'}))
noremap <silent><expr> g? incsearch#go(<SID>config_fuzzyall({'is_stay': 1}))
"Easymotion
function! s:config_easyfuzzymotion(...) abort
return extend(copy({
\ 'converters': [incsearch#config#fuzzyword#converter()],
\ 'modules': [incsearch#config#easymotion#module({'overwin': 1})],
\ 'keymap': {"\<CR>": '<Over>(easymotion)'},
\ 'is_expr': 0,
\ 'is_stay': 1
\ }), get(a:, 1, {}))
endfunction
noremap <silent><expr> <Space>/ incsearch#go(<SID>config_easyfuzzymotion())

43
.config/termite/config Normal file
View file

@ -0,0 +1,43 @@
[options]
font = SauceCodePro Nerd Font 11
[colors]
# special
foreground = #aeb1b7
foreground_bold = #aeb1b7
cursor = #aeb1b7
background = #212121
# black
color0 = #3c3e42
color8 = #4f5558
# red
color1 = #dd6880
color9 = #de889a
# green
color2 = #83b879
color10 = #99c490
# yellow
color3 = #dec790
color11 = #e7d09a
# blue
color4 = #95b5e4
color12 = #a0beea
# magenta
color5 = #c1a3e0
color13 = #cbacea
# cyan
color6 = #64c1d4
color14 = #88d1df
# white
color7 = #9a9da3
color15 = #b4b7bb

View file

@ -27,7 +27,7 @@ main = do
, manageHook = manageDocks <+> myManageHook <+> manageHook defaultConfig
, modMask = mod4Mask
, workspaces = ["1:web_0", "2:web_1", "3:terminal", "4:code", "5", "6", "7", "8", "9"]
, terminal = "uxterm"
, terminal = "termite"
, layoutHook = avoidStruts $ layoutHook defaultConfig
, logHook = dynamicLogWithPP xmobarPP
{ ppOutput = hPutStrLn xmproc