j vim: refactoring
This commit is contained in:
parent
697b202e25
commit
10f27ee8bd
@ -1,5 +1,6 @@
|
|||||||
{ config, pkgs, ... }:
|
{ config, pkgs, ... }:
|
||||||
|
|
||||||
|
with import <stockholm/lib>;
|
||||||
let
|
let
|
||||||
customPlugins.vim-javascript = pkgs.vimUtils.buildVimPlugin {
|
customPlugins.vim-javascript = pkgs.vimUtils.buildVimPlugin {
|
||||||
name = "vim-javascript";
|
name = "vim-javascript";
|
||||||
@ -16,72 +17,76 @@ let
|
|||||||
owner = "mxw";
|
owner = "mxw";
|
||||||
repo = "vim-jsx";
|
repo = "vim-jsx";
|
||||||
rev = "5b968dfa512c57c38ad7fe420f3e8ab75a73949a";
|
rev = "5b968dfa512c57c38ad7fe420f3e8ab75a73949a";
|
||||||
sha256 = "1z3yhhbmbzfw68qjzyvpbmlyv2a1p814sy5q2knn04kcl30vx94a";
|
sha256 = "1z3yhhbmbzfw68qjzyvpbmlyv2a1p814sy5q2knn04kcl30vx94a";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
# {
|
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
(pkgs.vim_configurable.customize {
|
(pkgs.vim_configurable.customize {
|
||||||
name = "vim";
|
name = "vim";
|
||||||
|
vimrcConfig.customRC = let
|
||||||
vimrcConfig.customRC = ''
|
colorscheme = ''colorscheme molokai'';
|
||||||
set nocompatible
|
setStatements = ''
|
||||||
|
set autowrite
|
||||||
:imap jk <Esc>
|
set clipboard=unnamedplus
|
||||||
:vmap v v
|
set nocompatible
|
||||||
:map gr :GoRun<Enter>
|
set path+=**
|
||||||
:nnoremap <S-TAB> :bnext<CR>
|
set ruler
|
||||||
:nnoremap <C-TAB> <c-w><c-w>
|
set undodir=$HOME/.vim/undo "directory where the undo files will be stored
|
||||||
:map nf :NERDTreeToggle<CR>
|
set undofile "turn on the feature
|
||||||
set autowrite
|
set wildignore+=*.o,*.class,*.hi,*.dyn_hi,*.dyn_o
|
||||||
set number
|
set wildmenu
|
||||||
set ruler
|
set listchars=trail:¶
|
||||||
set path+=**
|
'';
|
||||||
set wildmenu
|
remapStatements = ''
|
||||||
|
imap jk <Esc>
|
||||||
noremap x "_x
|
map gr :GoRun<Enter> " Map gr to execute go run
|
||||||
set clipboard=unnamedplus
|
map nf :NERDTreeToggle<CR>
|
||||||
|
nnoremap <C-TAB> <c-w><c-w>
|
||||||
let g:jsx_ext_required = 0
|
nnoremap <S-TAB> :bnext<CR>
|
||||||
|
noremap x "_x
|
||||||
let g:go_list_type = "quickfix"
|
vmap v v
|
||||||
let g:go_test_timeout = '10s'
|
'';
|
||||||
let g:go_fmt_command = "goimports"
|
settingsForGo = ''
|
||||||
let g:go_snippet_case_type = "camelcase"
|
let g:go_decls_includes = "func,type"
|
||||||
let g:go_highlight_types = 1
|
let g:go_def_mode = 'godef'
|
||||||
let g:go_highlight_fields = 1
|
let g:go_fmt_command = "goimports"
|
||||||
let g:go_highlight_functions = 1
|
let g:go_highlight_extra_types = 1
|
||||||
let g:go_highlight_methods = 1
|
let g:go_highlight_fields = 1
|
||||||
let g:go_highlight_extra_types = 1
|
let g:go_highlight_functions = 1
|
||||||
autocmd BufNewFile,BufRead *.go setlocal noexpandtab tabstop=4 shiftwidth=4
|
let g:go_highlight_methods = 1
|
||||||
let g:rehash256 = 1
|
let g:go_highlight_types = 1
|
||||||
let g:molokai_original = 1
|
let g:go_list_type = "quickfix"
|
||||||
colorscheme molokai
|
let g:go_metalinter_autosave = 1
|
||||||
let g:go_metalinter_enabled = ['vet', 'golint', 'errcheck']
|
let g:go_metalinter_enabled = ['vet', 'golint', 'errcheck']
|
||||||
let g:go_metalinter_autosave = 1
|
let g:go_snippet_case_type = "camelcase"
|
||||||
" let g:go_metalinter_autosave_enabled = ['vet', 'golint']
|
let g:go_test_timeout = '10s'
|
||||||
" let g:go_def_mode = 'godef'
|
let g:jsx_ext_required = 0
|
||||||
" let g:go_decls_includes = "func,type"
|
let g:molokai_original = 1
|
||||||
|
let g:rehash256 = 1
|
||||||
|
|
||||||
" Trigger configuration. Do not use <tab> if you use https://github.com/Valloric/YouCompleteMe.
|
|
||||||
let g:UltiSnipsExpandTrigger="<c-e>"
|
|
||||||
let g:UltiSnipsJumpForwardTrigger="<c-t>"
|
|
||||||
let g:UltiSnipsJumpBackwardTrigger="<c-q>"
|
|
||||||
|
|
||||||
" If you want :UltiSnipsEdit to split your window.
|
|
||||||
let g:UltiSnipsEditSplit="vertical"
|
|
||||||
|
|
||||||
if has('persistent_undo') "check if your vim version supports it
|
|
||||||
set undofile "turn on the feature
|
|
||||||
set undodir=$HOME/.vim/undo "directory where the undo files will be stored
|
|
||||||
endif
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
in ''
|
||||||
|
${colorscheme}
|
||||||
|
${remapStatements}
|
||||||
|
${setStatements}
|
||||||
|
${settingsForGo}
|
||||||
|
" I dont know what this line is about
|
||||||
|
autocmd BufNewFile,BufRead *.go setlocal noexpandtab tabstop=4 shiftwidth=4
|
||||||
|
'';
|
||||||
vimrcConfig.vam.knownPlugins = pkgs.vimPlugins // customPlugins;
|
vimrcConfig.vam.knownPlugins = pkgs.vimPlugins // customPlugins;
|
||||||
vimrcConfig.vam.pluginDictionaries = [
|
vimrcConfig.vam.pluginDictionaries = [
|
||||||
{ names = [ "undotree" "molokai" "Syntastic" "ctrlp" "surround" "snipmate" "nerdtree" "easymotion"]; }
|
{ names = [
|
||||||
|
"ctrlp"
|
||||||
|
"easymotion"
|
||||||
|
"molokai"
|
||||||
|
"nerdtree"
|
||||||
|
"snipmate"
|
||||||
|
"surround"
|
||||||
|
"Syntastic"
|
||||||
|
"undotree"
|
||||||
|
];
|
||||||
|
}
|
||||||
{ names = [ "vim-addon-nix" ]; ft_regex = "^nix\$"; }
|
{ names = [ "vim-addon-nix" ]; ft_regex = "^nix\$"; }
|
||||||
{ names = [ "vim-go" ]; ft_regex = "^go\$"; } # wanted: nsf/gocode
|
{ names = [ "vim-go" ]; ft_regex = "^go\$"; } # wanted: nsf/gocode
|
||||||
{ names = [ "vim-javascript" ]; ft_regex = "^js\$"; }
|
{ names = [ "vim-javascript" ]; ft_regex = "^js\$"; }
|
||||||
@ -89,4 +94,35 @@ in {
|
|||||||
];
|
];
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
|
# set up the directories up if they are not there.
|
||||||
|
# Needs to be changed.
|
||||||
|
# vim = let
|
||||||
|
# dirs = {
|
||||||
|
# backupdir = "$HOME/.cache/vim/backup";
|
||||||
|
# swapdir = "$HOME/.cache/vim/swap";
|
||||||
|
# undodir = "$HOME/.cache/vim/undo";
|
||||||
|
# };
|
||||||
|
# files = {
|
||||||
|
# viminfo = "$HOME/.cache/vim/info";
|
||||||
|
# };
|
||||||
|
#
|
||||||
|
# mkdirs = let
|
||||||
|
# dirOf = s: let out = concatStringsSep "/" (init (splitString "/" s));
|
||||||
|
# in assert out != ""; out;
|
||||||
|
# alldirs = attrValues dirs ++ map dirOf (attrValues files);
|
||||||
|
# in unique (sort lessThan alldirs);
|
||||||
|
# in
|
||||||
|
# pkgs.symlinkJoin {
|
||||||
|
# name = "vim";
|
||||||
|
# paths = [
|
||||||
|
# (pkgs.writeDashBin "vim" ''
|
||||||
|
# set -efu
|
||||||
|
# (umask 0077; exec ${pkgs.coreutils}/bin/mkdir -p ${toString mkdirs})
|
||||||
|
# exec ${pkgs.vim}/bin/vim "$@"
|
||||||
|
# '')
|
||||||
|
# pkgs.vim
|
||||||
|
# ];
|
||||||
|
# };
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user