aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkatherine <shmibs@airen-no-jikken.icu>2018-12-02 16:55:28 -0700
committerkatherine <shmibs@airen-no-jikken.icu>2018-12-02 16:55:28 -0700
commitbbb3faf55eaa2915492d721f8bbfd52fbef44461 (patch)
treec92ca7ec217b32fa7f44191c94e8c26caf5aa88b
parent1c12ba3e788c59a252745271bbe555fcab00374e (diff)
downloaddotfiles-bbb3faf55eaa2915492d721f8bbfd52fbef44461.tar.gz
more ocaml tweaks
decided would rather not have the completion stuff in vim
-rw-r--r--.ocamlinit5
-rw-r--r--.vimrc56
2 files changed, 13 insertions, 48 deletions
diff --git a/.ocamlinit b/.ocamlinit
index 22c8994..da23674 100644
--- a/.ocamlinit
+++ b/.ocamlinit
@@ -1,7 +1,6 @@
#use "topfind";;
-#require "base";;
-#require "core";;
+#require "core.top";;
+#require "core.syntax";;
-open Base;;
open Core;;
diff --git a/.vimrc b/.vimrc
index 1013ac8..af4a7f8 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1,6 +1,6 @@
if !has('gui_running')
set t_Co=256
-end
+endif
set nocompatible
@@ -129,40 +129,6 @@ call s:Lightline_palette_init()
let g:easytags_async = 1
let g:easytags_always_enabled = 1
-"opam stuff
-if executable('opam')
- let s:opam_share_dir = system('opam config var share')
- let s:opam_share_dir = substitute(s:opam_share_dir, '[\r\n]*$', '', '')
-
- let s:opam_configuration = {}
-
- fun! OpamConfOcpIndent()
- exec 'set rtp^=' . s:opam_share_dir . '/ocp-indent/vim'
- endfun
- let s:opam_configuration['ocp-indent'] = function('OpamConfOcpIndent')
-
- fun! OpamConfOcpIndex()
- exec 'set rtp+=' . s:opam_share_dir . '/ocp-index/vim'
- endfun
- let s:opam_configuration['ocp-index'] = function('OpamConfOcpIndex')
-
- fun! OpamConfMerlin()
- let l:dir = s:opam_share_dir . '/merlin/vim'
- exec 'set rtp+=' . l:dir
- endfun
- let s:opam_configuration['merlin'] = function('OpamConfMerlin')
-
- let s:opam_packages = ['ocp-indent', 'ocp-index', 'merlin']
- let s:opam_check_cmdline = ['opam list --installed --short --safe --color=never'] + s:opam_packages
- let s:opam_available_tools = split(system(join(s:opam_check_cmdline)))
- for tool in s:opam_packages
- "respect package order (merlin should be after ocp-index)
- if count(s:opam_available_tools, tool) > 0
- call s:opam_configuration[tool]()
- end
- endfor
-end
-
""""""""""""""""""""""
" GENERAL SETTINGS "
@@ -265,7 +231,7 @@ if &term != 'linux' && has('clipboard')
nnoremap <expr> P (v:register ==# '"' ? '"+' : '') . 'P'
xnoremap <expr> p (v:register ==# '"' ? '"+' : '') . 'p'
xnoremap <expr> P (v:register ==# '"' ? '"+' : '') . 'P'
-end
+endif
"use pgup/pgdwn for command history completion (matches zsh conf)
cnoremap <PageUp> <up>
@@ -333,7 +299,7 @@ if has('autocmd')
au FileType * call Settings_skel_read()
augroup END
-end "autocmd
+endif "autocmd
"
" Settings Subroutines
@@ -344,11 +310,11 @@ fun! Settings_skel_read()
"is the buffer not empty?
if line('$') != 1 || col('$') != 1
return 1
- end
+ endif
"is there no template?
if filereadable(split(&rtp, ',')[0] . "/skel/" . &ft) == 0
return 1
- end
+ endif
exec 'silent! r ' . split(&rtp, ',')[0] . "/skel/" . &ft
"read the date into %DATE%
exec '%s/%DATE%/' . system("date '+%a, %B %d, %Y'|tr -d '\n'") . '/ge'
@@ -370,7 +336,7 @@ fun! Settings_sub_wmodetoggle()
Goyo!
else
Goyo
- end
+ endif
endfun
"run vader tests on the current file
@@ -385,21 +351,21 @@ fun! Settings_sub_test_vim()
let l:check = l:base . '/test/' . expand('%:t:r') . '.vader'
if filereadable(l:check)
let l:real = l:check
- end
- end
+ endif
+ endif
"or else test for one in the same dir
let l:check = expand('%:t:r') . '.vader'
if l:real == '' && filereadable(l:check)
let l:real = l:check
- end
+ endif
"if a vader file was found, run the test
if l:real != ''
silent source %
silent exec 'Vader' l:real
- end
- end
+ endif
+ endif
endfun
"