From 18b252d6a358c723273aea6a8af2d52604edc19e Mon Sep 17 00:00:00 2001 From: Christian Nieves Date: Wed, 10 May 2023 13:31:46 -0500 Subject: [PATCH] in progress --- vim/.vim/lua/config/lsp.lua | 2 -- vim/.vim/prefs/google.vim | 3 ++- vim/.vimrc | 18 +----------------- 3 files changed, 3 insertions(+), 20 deletions(-) diff --git a/vim/.vim/lua/config/lsp.lua b/vim/.vim/lua/config/lsp.lua index 46e89eb..290d11d 100644 --- a/vim/.vim/lua/config/lsp.lua +++ b/vim/.vim/lua/config/lsp.lua @@ -1,6 +1,4 @@ local use_google = require("utils").use_google --- local tprint = require("utils").tprint --- local dump = require("utils").dump local log = require("utils").log local notify = require 'notify' diff --git a/vim/.vim/prefs/google.vim b/vim/.vim/prefs/google.vim index 497437a..a5ff3b5 100644 --- a/vim/.vim/prefs/google.vim +++ b/vim/.vim/prefs/google.vim @@ -7,7 +7,8 @@ let g:signify_skip_filename_pattern = ['\.pipertmp.*'] Glug alert Glug csearch -Glug codefmt ktfmt_executable=`["/google/bin/releases/kotlin-google-eng/ktfmt/ktfmt_deploy.jar", "--google-style"]` +" Glug codefmt ktfmt_executable=`["/google/bin/releases/kotlin-google-eng/ktfmt/ktfmt_deploy.jar", "--google-style"]` +Glug codefmt Glug codefmt-google Glug languages " applies google coding style settings to files whitelisted as google code. probably also want diff --git a/vim/.vimrc b/vim/.vimrc index 9a18de7..f8d3367 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -95,16 +95,6 @@ endif source ~/.vim/prefs/mappings.vim source ~/.vim/prefs/leader.vim source ~/.vim/prefs/ui.vim -" source ~/.vim/prefs/fzf.vim - -filetype plugin on " redundant? -filetype plugin indent on - -" auto-reload vimrc on save -augroup myvimrc - au! -au BufWritePost .vimrc,_vimrc,.vimrc.local,vimrc,.gvimrc,_gvimrc,gvimrc,*.vim nested so $MYVIMRC | if has('gui_running') | so $MYGVIMRC | endif -augroup END fun! NewInitBex() let &bex = '-' . strftime("(%Y%m%d)-{%H%M}") @@ -119,13 +109,6 @@ set t_Co=256 let base16colorspace=256 set colorcolumn=100 -if has('macunix') - let g:python3_host_prog='/usr/local/bin/python3' - let g:python_host_prog='/usr/local/bin/python3' -else - let g:python3_host_prog='/usr/bin/python3' - let g:python_host_prog='/usr/bin/python' -endif if (has("termguicolors")) set termguicolors @@ -213,4 +196,5 @@ function! s:AddBufferToTab() tabfirst endfun +filetype plugin indent on lua require("plugins")