aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.emacs.d/init.el1
-rw-r--r--.emacs.d/lisp/init-org.el1
-rw-r--r--.vim/plugin/general.plug4
-rw-r--r--.vim/plugin/lsp.vim (renamed from .vim/plugin/lsp.plug)3
4 files changed, 6 insertions, 3 deletions
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index e070fc2..5d07f24 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -15,7 +15,6 @@
(require 'init-package)
(require 'init-evil)
(require 'init-org)
-(require 'init-mu4e)
(require 'init-lang)
(require 'init-misc)
diff --git a/.emacs.d/lisp/init-org.el b/.emacs.d/lisp/init-org.el
index 50061b2..8e4d784 100644
--- a/.emacs.d/lisp/init-org.el
+++ b/.emacs.d/lisp/init-org.el
@@ -33,6 +33,7 @@
(kbd "<leader>oih") 'org-insert-heading
(kbd "<leader>oci") 'org-clock-in
(kbd "<leader>oco") 'org-clock-out
+ (kbd "<leader>ocr") 'org-clock-report
(kbd "<leader>sp") 'org-set-property
(kbd "+") 'org-priority-up
(kbd "-") 'org-priority-down)
diff --git a/.vim/plugin/general.plug b/.vim/plugin/general.plug
index 453acba..d68ee70 100644
--- a/.vim/plugin/general.plug
+++ b/.vim/plugin/general.plug
@@ -1,9 +1,13 @@
+" vim: ft=vim
+
Plug 'Yggdroot/LeaderF', {'do': ':LeaderfInstallCExtension'}
Plug 'Valloric/YouCompleteMe', {
\ 'do': 'python3 ./install.py --clangd-completer',
\ }
Plug 'dense-analysis/ale'
Plug 'sheerun/vim-polyglot'
+Plug 'prabirshrestha/vim-lsp'
+Plug 'mattn/vim-lsp-settings'
let g:ycm_language_server = []
let g:Lf_RootMarkers = []
diff --git a/.vim/plugin/lsp.plug b/.vim/plugin/lsp.vim
index 1a5704b..2816300 100644
--- a/.vim/plugin/lsp.plug
+++ b/.vim/plugin/lsp.vim
@@ -1,5 +1,3 @@
-Plug 'prabirshrestha/vim-lsp'
-
if executable('gopls')
au User lsp_setup call lsp#register_server({
\ 'name': 'gopls',
@@ -37,3 +35,4 @@ augroup lsp_install
autocmd User lsp_buffer_enabled call s:on_lsp_buffer_enabled()
augroup END
+let g:lsp_settings_filetype_lua = 'sumneko-lua-language-server'