cleanup

vim/.vim/lua/config/neotree.lua

@@ -0,0 +1,3 @@
+local map = require("utils").map
+
+map('n', '<C-n>', ':Neotree<cr>')

vim/.vim/lua/config/telescope.lua

@@ -42,6 +42,12 @@ require('telescope').setup {
 
 local map = require("utils").map
 
+map('n', '<leader>tb', ":Telescope file_browser", { desc = '[T]elescope [B]rowse' })
+map('n', '<leader>tf', require('telescope.builtin').find_files, { desc = '[T]elescope [F]iles' })
+map('n', '<leader>th', require('telescope.builtin').help_tags, { desc = '[T]elescope [H]elp' })
+map('n', '<leader>tw', require('telescope.builtin').grep_string, { desc = '[T]elescope current [W]ord' })
+map('n', '<leader>tg', require('telescope.builtin').live_grep, { desc = '[T]elescope by [G]rep' })
+
 if use_google() then
     -- These custom mappings let you open telescope-codesearch quickly:
     map('n', '<C-P>',

vim/.vim/lua/plugins.lua

@@ -21,10 +21,6 @@ require('packer').startup(function(use)
     use 'lewis6991/impatient.nvim'
     use 'dstein64/vim-startuptime'
 
-    if use_google() then
-        require 'config.google'.config(use)
-    end
-
     -- use {
     --     'google/vim-glaive',
     --     after  =  {
@@ -51,7 +47,7 @@ require('packer').startup(function(use)
     use {
         'nvim-treesitter/nvim-treesitter',
         run = ':TSUpdate',
-        config = require("config.nvim-treesitter")
+        config = [[ require("config.nvim-treesitter") ]]
     }
 
     -- Unless you are still migrating, remove the deprecated commands from v1.x
@@ -60,7 +56,7 @@ require('packer').startup(function(use)
     use {
       "nvim-neo-tree/neo-tree.nvim",
         branch = "v2.x",
-        -- config = require("config.neotree"),
+        config = [[ require("config.neotree") ]],
         requires = {
           "nvim-lua/plenary.nvim",
           "nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
@@ -78,7 +74,7 @@ require('packer').startup(function(use)
     use 'nvim-lua/plenary.nvim'
     use {
         'renerocksai/telekasten.nvim',
-        config = require("config.telekasten")
+        config = [[ require("config.telekasten") ]]
     }
     use 'renerocksai/calendar-vim'
 
@@ -110,45 +106,48 @@ require('packer').startup(function(use)
             'ray-x/cmp-treesitter',
             { 'saadparwaiz1/cmp_luasnip', after = {'LuaSnip'} },
         },
-        config = require("config.lsp"),
+        config = [[ require("config.lsp") ]],
-        event = 'InsertEnter',
     }
     use {
         "tzachar/cmp-tabnine", run = "./install.sh",
         event = 'InsertEnter',
         cond = not use_google(),
     }
-    use { 'ErichDonGubler/lsp_lines.nvim', config = require("lsp_lines").setup() }
+    use { 'ErichDonGubler/lsp_lines.nvim', config = [[ require("lsp_lines").setup() ]] }
     use {
         "williamboman/mason.nvim",
         "williamboman/mason-lspconfig.nvim",
         'VonHeikemen/lsp-zero.nvim',
-        event = 'InsertEnter',
     }
     use {
         'jose-elias-alvarez/null-ls.nvim',
-        config = require("config.null-ls"),
+        config = [[ require("config.null-ls") ]],
-        event = 'InsertEnter',
     }
 
+    if use_google() then
+        require 'config.google'.config(use)
+    end
+
+    use { 'vim-scripts/vcscommand.vim' }
+
     -- Rust
-    -- use {
+    use {
-    --     'saecki/crates.nvim',
+        'saecki/crates.nvim',
-    --     ft = 'rust',
+        ft = 'rust',
-    --     tag = 'v0.3.0',
+        tag = 'v0.3.0',
-    --     requires = { 'nvim-lua/plenary.nvim' },
+        requires = { 'nvim-lua/plenary.nvim' },
-    --     config = require('crates').setup()
+        config = [[ require('crates').setup() ]]
-    -- }
+    }
     use {'simrat39/rust-tools.nvim', ft = 'rust'}
 
     use {
         'folke/trouble.nvim',
-        config = require("config.trouble")
+        config = [[ require("config.trouble") ]]
     }
 
     use {
         'ThePrimeagen/refactoring.nvim',
-        config = require("config.refactoring")
+        config = [[ require("config.refactoring") ]]
     }
     use 'apalmer1377/factorus'
 
@@ -157,13 +156,13 @@ require('packer').startup(function(use)
     use {'andymass/vim-matchup', event = 'VimEnter'}
 
     use 'jghauser/mkdir.nvim'
-    use { 'simrat39/symbols-outline.nvim', config = require("config.symbols-outline")  }
+    use { 'simrat39/symbols-outline.nvim', config = [[ require("config.symbols-outline")]]  }
-    use { 'petertriho/nvim-scrollbar', config = require("scrollbar").setup() }
+    use { 'petertriho/nvim-scrollbar', config = [[ require("scrollbar").setup()]] }
 
     use {
         'nvim-telescope/telescope.nvim',
         branch = '0.1.x',
-        config = require("config.telescope")
+        config = [[ require("config.telescope") ]]
     }
     use 'nvim-telescope/telescope-file-browser.nvim'
 
@@ -188,11 +187,11 @@ require('packer').startup(function(use)
     use 'nvim-lua/lsp-status.nvim'
     use {
         'nvim-lualine/lualine.nvim',
-        config = require("config.lualine")
+        config = [[ require("config.lualine") ]]
     }
     use {
         'rcarriga/nvim-notify',
-        config =require("config.notify")
+        config = [[require("config.notify")]]
     }
 
     -- Git
@@ -205,13 +204,13 @@ require('packer').startup(function(use)
         {
             'akinsho/git-conflict.nvim',
             tag = '*',
-            config = require('git-conflict').setup(),
+            config = [[ require('git-conflict').setup() ]],
         },
         { 'rhysd/conflict-marker.vim' }
     }
 
     -- use { "catppuccin/nvim", as = "catppuccin" }
-    use { "catppuccin/nvim", as = "catppuccin", config = require("config.catppuccin")}
+    use { "catppuccin/nvim", as = "catppuccin", config = [[ require("config.catppuccin") ]]}
     -- Tmux
     use {
         'preservim/vimux',
@@ -224,7 +223,7 @@ require('packer').startup(function(use)
     }
     use {
         'ojroques/nvim-osc52',
-        config = require("config.oscyank")
+        config = [[ require("config.oscyank") ]]
     }
 
     -- mine
@@ -234,7 +233,7 @@ require('packer').startup(function(use)
 
     use {
         "folke/which-key.nvim",
-        config = require("config.whichkey")
+        config = [[ require("config.whichkey") ]]
     }
 
     use 'ntpeters/vim-better-whitespace'
@@ -248,9 +247,6 @@ require('packer').startup(function(use)
 
     use 'jremmen/vim-ripgrep'
 
-    -- use 'preservim/nerdtree'
-    -- use 'tiagofumo/vim-nerdtree-syntax-highlight'
-
     use { 'udalov/kotlin-vim', ft='kotin' }
 
     use {
@@ -267,7 +263,7 @@ require('packer').startup(function(use)
     }
     use {
         'j-hui/fidget.nvim',
-        config = require("fidget").setup()
+        config = [[ require("fidget").setup() ]]
     }
     use {
         "iamcco/markdown-preview.nvim",

vim/.vim/lua/utils.lua

@@ -5,7 +5,8 @@ function M.map(mode, lhs, rhs, opts)
     if opts then
         options = vim.tbl_extend("force", options, opts)
     end
-    vim.api.nvim_set_keymap(mode, lhs, rhs, options)
+    -- vim.api.nvim_set_keymap(mode, lhs, rhs, options)
+    vim.keymap.set(mode, lhs, rhs, options)
 end
 
 function M.use_google()

vim/.vim/prefs/google.vim

@@ -1,8 +1,6 @@
 source /usr/share/vim/google/glug/bootstrap.vim
 source /usr/share/vim/google/core.vim
 
-Plug 'vim-scripts/vcscommand.vim'
-
 let g:VCSCommandDisableMappings = 1
 
 let g:signify_skip_filename_pattern = ['\.pipertmp.*']
@@ -33,9 +31,6 @@ Glug buganizer plugin[mappings]
 Glug relatedfiles plugin[mappings]
 Glug g4
 
-" Update the current file's build deps
-Plug 'junegunn/fzf', { 'do': { -> fzf#install() }, 'commit': '3f75a83' }
-Plug 'junegunn/fzf.vim'
 Glug outline-window
 Glug fzf-query
 

vim/.vim/prefs/ripgrep.vim

@@ -1,13 +0,0 @@
-Plug 'kyoh86/vim-ripgrep'
-
-" command! -nargs=+ -complete=file Rg :call ripgrep#search(<q-args>)
-command! -nargs=+ -complete=file Rg :call s:ripgrep(<q-args>)
-function s:ripgrep(searchterm)
-    let l:dir = fnameescape(expand("%:p:h")."/")
-    let l:rel = ripgrep#path#rel(l:dir)
-    " echomsg 'DIR: ' . l:dir . '\tREL: ' . l:rel
-    call ripgrep#call('rg --smart-case --json ' . a:searchterm, l:dir, l:rel)
-endfunction
-nnoremap <leader>rg :Rg<Space>
-
-let g:rg_root_marks = ['BUILD', 'METADATA', '.git']

vim/.vim/prefs/ultisnips.vim

@@ -1,6 +0,0 @@
-Plug 'SirVer/ultisnips'
-Plug 'honza/vim-snippets'
-
-if filereadable(expand("~/use_google"))
-    Glug ultisnips-google
-endif

vim/.vimrc

@@ -84,7 +84,6 @@ lua require('impatient')
 " lua require'impatient'.enable_profile()
 
 
-call plug#begin('~/.vim/plugged')
 if filereadable(expand("~/.vimrc.local"))
   source ~/.vimrc.local
 endif
@@ -96,10 +95,7 @@ call plug#begin('~/.vim/plugged')
 source ~/.vim/prefs/mappings.vim
 source ~/.vim/prefs/leader.vim
 source ~/.vim/prefs/ui.vim
-   source ~/.vim/prefs/ultisnips.vim
+" source ~/.vim/prefs/fzf.vim
-   source ~/.vim/prefs/ripgrep.vim
-   source ~/.vim/prefs/fzf.vim
-call plug#end()            " required
 
 lua require("plugins")