From 27b63b8a410e12ba4d2711b92cd3e8b409959e31 Mon Sep 17 00:00:00 2001
From: Christian Nieves <cnieves@google.com>
Date: Mon, 14 Nov 2022 18:34:29 +0000
Subject: [PATCH] clean

---
 vim/.vim/lua/lualine_config.lua |  8 ++++----
 vim/.vim/prefs/imp.vim          | 26 ++++++++++++++------------
 vim/.vim/prefs/ultisnips.vim    |  4 +++-
 vim/.vimrc                      |  9 +--------
 4 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/vim/.vim/lua/lualine_config.lua b/vim/.vim/lua/lualine_config.lua
index d472622..8d3813b 100644
--- a/vim/.vim/lua/lualine_config.lua
+++ b/vim/.vim/lua/lualine_config.lua
@@ -30,11 +30,11 @@ local function getLightbulb()
     return require('nvim-lightbulb').get_status_text()
 end
 
-local comments = require("google.comments")
-local tracker = require("google.comments.tracker")
-local dump = require("utils").dump
-
 local function getLGTMs()
+    local comments = require("google.comments")
+    local tracker = require("google.comments.tracker")
+    local dump = require("utils").dump
+
     print(dump(tracker.get_all_comments()))
     local lgtm = comments.get_lgtms()
     local appr = comments.get_approvals()
diff --git a/vim/.vim/prefs/imp.vim b/vim/.vim/prefs/imp.vim
index 1db1a43..2cca10f 100644
--- a/vim/.vim/prefs/imp.vim
+++ b/vim/.vim/prefs/imp.vim
@@ -1,14 +1,16 @@
-set runtimepath+=/google/src/files/head/depot/google3/experimental/users/tstone/vim/vim-imp
-set runtimepath+=/google/src/files/head/depot/google3/experimental/users/tstone/vim/imp-csearch
+if filereadable(expand("~/use_google"))
+    set runtimepath+=/google/src/files/head/depot/google3/experimental/users/tstone/vim/vim-imp
+    set runtimepath+=/google/src/files/head/depot/google3/experimental/users/tstone/vim/imp-csearch
 
-Glug! glaive
-" Glaive imp Suggest[default]=buffer,primp,csearch,prompt Report[default]=popupnotify
-" Glaive imp Suggest[default]=buffer,csearch,prompt,primp Report[default]=popupnotify
-" Glaive imp Pick[default]=inputlist Suggest[default]=buffer,primp,csearch,prompt Report[default]=echo
-Glaive imp Pick[default]=fzf Suggest[default]=buffer,primp,csearch,prompt Report[default]=echo
-"
-" nnoremap <leader>csi :CsImporter<cr>
-nnoremap <leader>csi :ImpSuggest <C-r><C-w><cr>
-nnoremap <leader>ii :ImpSuggest <C-r><C-w><cr>
-nnoremap <leader>if :ImpFirst <C-r><C-w><cr>
+    Glug! glaive
+    " Glaive imp Suggest[default]=buffer,primp,csearch,prompt Report[default]=popupnotify
+    " Glaive imp Suggest[default]=buffer,csearch,prompt,primp Report[default]=popupnotify
+    " Glaive imp Pick[default]=inputlist Suggest[default]=buffer,primp,csearch,prompt Report[default]=echo
+    Glaive imp Pick[default]=fzf Suggest[default]=buffer,primp,csearch,prompt Report[default]=echo
+    "
+    " nnoremap <leader>csi :CsImporter<cr>
+    nnoremap <leader>csi :ImpSuggest <C-r><C-w><cr>
+    nnoremap <leader>ii :ImpSuggest <C-r><C-w><cr>
+    nnoremap <leader>if :ImpFirst <C-r><C-w><cr>
 
+endif
diff --git a/vim/.vim/prefs/ultisnips.vim b/vim/.vim/prefs/ultisnips.vim
index 6bcb280..6ca3716 100644
--- a/vim/.vim/prefs/ultisnips.vim
+++ b/vim/.vim/prefs/ultisnips.vim
@@ -1,4 +1,6 @@
 Plug 'SirVer/ultisnips'
 Plug 'honza/vim-snippets'
 
-" Glug ultisnips-google
+if filereadable(expand("~/use_google"))
+    Glug ultisnips-google
+endif
diff --git a/vim/.vimrc b/vim/.vimrc
index c2b95a1..e83d170 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -95,19 +95,12 @@ call plug#begin('~/.vim/plugged')
    source ~/.vim/prefs/golang.vim
    source ~/.vim/prefs/ultisnips.vim
    source ~/.vim/prefs/ripgrep.vim
+    source ~/.vim/prefs/imp.vim
    source ~/.vim/prefs/fzf.vim
-   source ~/.vim/prefs/devicons.vim
-   source ~/.vim/prefs/airline.vim
 call plug#end()            " required
 
 lua require("plugins")
 
-if filereadable(expand("~/use_google"))
-    source ~/.vim/prefs/imp.vim
-    source ~/.vim/prefs/google_comments.vim
-    lua require("google_comments")
-endif
-
 filetype plugin on     " redundant?
 filetype plugin indent on