Fix commenter

config/.config/nvim/lazy-lock.json

@@ -0,0 +1,92 @@
+{
+  "ai.nvim": { "branch": "main", "commit": "d7391d4782b90ad3501f6f716f2b308092981787" },
+  "asyncrun.vim": { "branch": "master", "commit": "7191d0c30dd105e5d7f897b9a6ee19cabe734466" },
+  "auto-session": { "branch": "main", "commit": "21033c6815f249a7839c3a85fc8a6b44d74925c9" },
+  "calendar-vim": { "branch": "master", "commit": "a7e73e02c92566bf427b2a1d6a61a8f23542cc21" },
+  "catppuccin": { "branch": "main", "commit": "233c4175780d9b4e39ae4fe4535c1e4c14bd76ed" },
+  "ciderlsp_nvim": { "branch": "main", "commit": "7007e1881eb421a4d6f7ef1f31e973f7cc0b4d8d" },
+  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
+  "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" },
+  "cmp-nvim-lsp-document-symbol": { "branch": "main", "commit": "f0f53f704c08ea501f9d222b23491b0d354644b0" },
+  "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "3d8912ebeb56e5ae08ef0906e3a54de1c66b92f1" },
+  "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
+  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
+  "cmp-spell": { "branch": "master", "commit": "60584cb75e5e8bba5a0c9e4c3ab0791e0698bffa" },
+  "cmp-tabnine": { "branch": "main", "commit": "b93f82ef5150e578677fc2e2b4b328b19eed77e1" },
+  "cmp-treesitter": { "branch": "master", "commit": "389eadd48c27aa6dc0e6b992644704f026802a2e" },
+  "cmp-under-comparator": { "branch": "master", "commit": "6857f10272c3cfe930cece2afa2406e1385bfef8" },
+  "cmp-vsnip": { "branch": "main", "commit": "989a8a73c44e926199bfd05fa7a516d51f2d2752" },
+  "cmp_nvim_ciderlsp": { "branch": "main", "commit": "e1b0015a0c090e20d1cbb34e5639e6dd145d3f3e" },
+  "conflict-marker.vim": { "branch": "master", "commit": "11a4d42244755505b66b15cd4496a150432eb5e3" },
+  "crates.nvim": { "branch": "main", "commit": "1dffccc0a95f656ebe00cacb4de282473430c5a1" },
+  "factorus": { "branch": "master", "commit": "19816e370df82fe96ca96856cf2be4d1c82302da" },
+  "fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" },
+  "fzf": { "branch": "master", "commit": "3e9efd1401404da8afdcf9757ac9996f5c48290f" },
+  "fzf.vim": { "branch": "master", "commit": "5d87ac1fe8d729f116bda2f90a7211ad309ddf5a" },
+  "git-conflict.nvim": { "branch": "main", "commit": "8d962d83cae924a314965f738ed1e05a4000d682" },
+  "gitsigns.nvim": { "branch": "main", "commit": "4455bb5364d29ff86639dfd5533d4fe4b48192d4" },
+  "go.nvim": { "branch": "master", "commit": "a8095eb334495caec3099b717cc7f5b1fbc3e628" },
+  "google_comments": { "branch": "main", "commit": "ad50cd3c71a7553c92a966dba6a03232a81e3812" },
+  "guihua.lua": { "branch": "master", "commit": "ab8b1f09603cc268770efd057115035dc6cfa83d" },
+  "hg": { "branch": "main", "commit": "f9bab452d778f74976430f091a8830ec2d8a3720" },
+  "impatient.nvim": { "branch": "main", "commit": "47302af74be7b79f002773011f0d8e85679a7618" },
+  "java-syntax.vim": { "branch": "master", "commit": "9a3d76a8c6cd7765ba93a7bdd9280594167e3f1b" },
+  "kotlin-vim": { "branch": "master", "commit": "53fe045906df8eeb07cb77b078fc93acda6c90b8" },
+  "lazy.nvim": { "branch": "main", "commit": "d1b02c2dda88422ca573f2a1ebdfb213ce0124d6" },
+  "libp.nvim": { "branch": "main", "commit": "db62a17ad68946d970bca0b0736e854058d3b307" },
+  "lsp-status.nvim": { "branch": "master", "commit": "54f48eb5017632d81d0fd40112065f1d062d0629" },
+  "lsp-zero.nvim": { "branch": "v2.x", "commit": "8fda9a849d6ab4196ecf129905764ddefdfb64b5" },
+  "lsp_lines.nvim": { "branch": "main", "commit": "3b57922d2d79762e6baedaf9d66d8ba71f822816" },
+  "lspkind.nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" },
+  "lualine.nvim": { "branch": "master", "commit": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9" },
+  "markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "5230617372e656d4a2e1e236e03bf7e7b4b97273" },
+  "mason.nvim": { "branch": "main", "commit": "7d7efc738e08fc5bee822857db45cb6103f0b0c1" },
+  "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" },
+  "neo-tree.nvim": { "branch": "v2.x", "commit": "d883632bf8f92f1d5abea4a9c28fb2f90aa795aa" },
+  "nerdcommenter": { "branch": "master", "commit": "b0b09ea46c9f0509556257bd8b838b40f493d6a0" },
+  "nui.nvim": { "branch": "main", "commit": "062e366afcdf2bc1e9d28313a1df4ff14f05cb4e" },
+  "null-ls.nvim": { "branch": "main", "commit": "a138b14099e9623832027ea12b4631ddd2a49256" },
+  "nvim-cmp": { "branch": "main", "commit": "b5a636d46c69bb371995c22d7a10ee1544004879" },
+  "nvim-lightbulb": { "branch": "master", "commit": "ca5b44a8efffb5fec1963ccd21f25ec04cc778b7" },
+  "nvim-lspconfig": { "branch": "master", "commit": "0f598b9ab9f2a6d7e137074be99c8d89af44b990" },
+  "nvim-notify": { "branch": "master", "commit": "ea9c8ce7a37f2238f934e087c255758659948e0f" },
+  "nvim-osc52": { "branch": "main", "commit": "3e96035d62290183fe7a11418db2b254fcfcaee3" },
+  "nvim-scrollbar": { "branch": "main", "commit": "35f99d559041c7c0eff3a41f9093581ceea534e8" },
+  "nvim-treesitter": { "branch": "master", "commit": "2c59e0ff3da6514b03d853ebecb6c36c515a5d7d" },
+  "nvim-web-devicons": { "branch": "master", "commit": "2a125024a137677930efcfdf720f205504c97268" },
+  "nvim_figtree": { "branch": "main", "commit": "9bc3025f46e34732382da1019e256a9d8bec1e55" },
+  "plenary.nvim": { "branch": "master", "commit": "499e0743cf5e8075cd32af68baa3946a1c76adf1" },
+  "refactoring.nvim": { "branch": "master", "commit": "a85dfff2602b739627b9f8a831de8c3e7b2993ae" },
+  "registers.nvim": { "branch": "main", "commit": "2ab8372bb837f05fae6b43091f10a0b725d113ca" },
+  "rust-tools.nvim": { "branch": "master", "commit": "71d2cf67b5ed120a0e31b2c8adb210dd2834242f" },
+  "symbols-outline.nvim": { "branch": "master", "commit": "512791925d57a61c545bc303356e8a8f7869763c" },
+  "telekasten.nvim": { "branch": "main", "commit": "36dad2692974a5cc69813441442ccce8c53fbfd4" },
+  "telescope-file-browser.nvim": { "branch": "master", "commit": "fc70589a93d7bb42f4671ad75c8628a29995bcbe" },
+  "telescope.nvim": { "branch": "0.1.x", "commit": "533c7fb1b3fb412a16e1c1c9cf6d2b1ac130f1b7" },
+  "telescope_citc": { "branch": "main", "commit": "d6421d5bfe058915ece0daec55e488f8ea05f207" },
+  "telescope_codesearch": { "branch": "main", "commit": "a26077ad3c68cf897ae1c31da903d6516ebb9c92" },
+  "telescope_fig": { "branch": "main", "commit": "90150e1aa368b49a5125689b3a6da573a99e2bda" },
+  "trouble.nvim": { "branch": "main", "commit": "2af0dd9767526410c88c628f1cbfcb6cf22dd683" },
+  "undotree": { "branch": "master", "commit": "485f01efde4e22cb1ce547b9e8c9238f36566f21" },
+  "vcscommand.vim": { "branch": "master", "commit": "2fb32681361f37533455d20aaa7fc6eb11b0fa4b" },
+  "vim-better-whitespace": { "branch": "master", "commit": "1b22dc57a2751c7afbc6025a7da39b7c22db635d" },
+  "vim-dirdiff": { "branch": "master", "commit": "84bc8999fde4b3c2d8b228b560278ab30c7ea4c9" },
+  "vim-indent-guides": { "branch": "master", "commit": "a1e1390c0136e63e813d051de2003bf0ee18ae30" },
+  "vim-matchup": { "branch": "master", "commit": "3625e099b09bff2db5f04082cb09ba679525980c" },
+  "vim-ripgrep": { "branch": "master", "commit": "2bb2425387b449a0cd65a54ceb85e123d7a320b8" },
+  "vim-searchindex": { "branch": "master", "commit": "b0788c8213210b3bd23b62847dd5a9ebbe4ad648" },
+  "vim-signify": { "branch": "master", "commit": "7d538b77a5a8806e344b057f8846f6d0c035efa9" },
+  "vim-startuptime": { "branch": "master", "commit": "454b3de856b7bd298700de33d79774ca9b9e3875" },
+  "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
+  "vim-tmux": { "branch": "master", "commit": "cfe76281efc29890548cf9eedd42ad51c7a1faf0" },
+  "vim-tmux-focus-events": { "branch": "master", "commit": "b1330e04ffb95ede8e02b2f7df1f238190c67056" },
+  "vim-tmux-navigator": { "branch": "master", "commit": "cdd66d6a37d991bba7997d593586fc51a5b37aa8" },
+  "vim-tmux-syntax": { "branch": "master", "commit": "1b6a6a5beb96fa232c8d35d305f77496b12678a9" },
+  "vim-tmux-yank": { "branch": "master", "commit": "8432fd440f61ddead070093be06b3dd6b0b5790e" },
+  "vim-vsnip": { "branch": "master", "commit": "7753ba9c10429c29d25abfd11b4c60b76718c438" },
+  "vim-windowswap": { "branch": "master", "commit": "15db3f697aa1fa696d99fcdc920c90cd2cec855e" },
+  "vimux": { "branch": "master", "commit": "616fcb4799674a7a809b14ca2dc155bb6ba25788" },
+  "which-key.nvim": { "branch": "main", "commit": "e271c28118998c93a14d189af3395812a1aa646c" }
+}

config/.config/nvim/spell/en.utf-8.add

@@ -2,3 +2,4 @@ private
 handlePackageIntent
 for/!
 tooling/!
+createApkDescriptor

vim/.vim/lua/config/google.lua

@@ -0,0 +1 @@
+

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'
 
@@ -12,17 +10,26 @@ require("mason-lspconfig").setup({
     ensure_installed = { "lua_ls", "rust_analyzer" }
 })
 
+-- CiderLSP
+vim.opt.completeopt = { "menu", "menuone", "noselect" }
+-- Don't show the dumb matching stuff
+vim.opt.shortmess:append("c")
+
+vim.opt.spell = true
+vim.opt.spelllang = { 'en_us' }
+
 local lspconfig = require("lspconfig")
 local configs = require("lspconfig.configs")
+
 if use_google() then
     configs.ciderlsp = {
         default_config = {
             cmd = { "/google/bin/releases/cider/ciderlsp/ciderlsp", "--tooltag=nvim-cmp", "--forward_sync_responses", "--merge_diagnostic_layers" },
             filetypes = { "c", "cpp", "java", "kotlin", "objc", "proto", "textproto", "go", "python", "bzl", "typescript"},
-            -- root_dir = lspconfig.util.root_pattern("BUILD"),
-            root_dir = function(fname)
-                return string.match(fname, '(/google/src/cloud/[%w_-]+/[%w_-]+/google3/).+$')
-            end;
+            root_dir = lspconfig.util.root_pattern("BUILD"),
+            -- root_dir = function(fname)
+            --     return string.match(fname, '(/google/src/cloud/[%w_-]+/[%w_-]+/google3/).+$')
+            -- end;
             settings = {},
         },
     }
@@ -31,10 +38,10 @@ if use_google() then
         default_config = {
             cmd = { '/google/bin/users/lerm/glint-ale/analysis_lsp/server', '--lint_on_save=false', '--max_qps=10' },
             filetypes = { "c", "cpp", "java", "kotlin", "objc", "proto", "textproto", "go", "python", "bzl", "markdown","typescript", "javascript"},
-            -- root_dir = lspconfig.util.root_pattern('BUILD'),
-            root_dir = function(fname)
-                return string.match(fname, '(/google/src/cloud/[%w_-]+/[%w_-]+/google3/).+$')
-            end;
+            root_dir = lspconfig.util.root_pattern('BUILD'),
+            -- root_dir = function(fname)
+            --     return string.match(fname, '(/google/src/cloud/[%w_-]+/[%w_-]+/google3/).+$')
+            -- end;
             settings = {},
         },
     }

vim/.vim/lua/config/nerdcommenter.lua

@@ -0,0 +1,30 @@
+--------- NERD Commenter
+-- Create default mappings
+vim.g.NERDCreateDefaultMappings = 0
+
+-- Add spaces after comment delimiters by default
+vim.g.NERDSpaceDelims = 1
+
+-- Use compact syntax for prettified multi-line comments
+vim.g.NERDCompactSexyComs = 1
+
+-- Align line-wise comment delimiters flush left instead of following code indentation
+vim.g.NERDDefaultAlign = 'left'
+
+-- Set a language to use its alternate delimiters by default
+vim.g.NERDAltDelims_java = 1
+
+-- Allow commenting and inverting empty lines (useful when commenting a region)
+vim.g.NERDCommentEmptyLines = 1
+
+-- Enable trimming of trailing whitespace when uncommenting
+vim.g.NERDTrimTrailingWhitespace = 1
+
+--Enable NERDCommenterToggle to check all selected lines is commented or not
+vim.g.NERDToggleCheckAllLines = 1
+
+nnoremap <leader>c<Space> :call nerdcommenter#Comment(0,"toggle")<CR>
+vnoremap <leader>c<Space> :call nerdcommenter#Comment(0,"toggle")<CR>
+
+nnoremap <leader>c$ :call nerdcommenter#Comment(0,"ToEOL")<CR>
+vnoremap <leader>c$ :call nerdcommenter#Comment(0,"ToEOL")<CR>

vim/.vim/lua/config/nvim-treesitter.lua

@@ -1,10 +1,10 @@
 require('nvim-treesitter.configs').setup {
-    -- A list of parser names, or "all"
-    -- ensure_installed = { "c", "lua", "vim", "java", "kotlin"},
-    ensure_installed = "all",
+-- A list of parser names, or "all"
+-- ensure_installed = { "c", "lua", "vim", "java", "kotlin"},
+ensure_installed = "all",
 
-    -- Install parsers synchronously (only applied to `ensure_installed`)
-   sync_install = false,
+-- Install parsers synchronously (only applied to `ensure_installed`)
+sync_install = false,
 
     highlight = {
         -- `false` will disable the whole extension
@@ -12,17 +12,17 @@ require('nvim-treesitter.configs').setup {
         indent = {
             enable = true
         },
-        disable = {"java"},
+        -- disable = {"java"},
         --
         -- Setting this to true will run `:h syntax` and tree-sitter at the same time.
         -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
         -- Using this option may slow down your editor, and you may see some duplicate highlights.
         -- Instead of true it can also be a list of languages
         -- additional_vim_regex_highlighting = true,
-        -- additional_vim_regex_highlighting = {"java"},
+        additional_vim_regex_highlighting = {"java"},
     },
-    rainbow = {
-        enable = true,
-        extended_mode = true,
-    }
+    -- rainbow = {
+    --     enable = true,
+    --     extended_mode = true,
+    -- }
 }

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

@@ -39,3 +39,43 @@ require('telescope').setup {
     }
 }
 }
+
+local map = require("utils").map
+
+map('n', '<leader>tb', ":Telescope file_buffers", { desc = '[T]elescope [B]uffers' })
+map('n', '<leader>tf', [[:lua require('telescope.builtin').find_files{ find_command = {'rg', '--files', '--hidden', '-g', '!node_modules/**'} }<cr>]], { 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>',
+    [[<cmd>lua require('telescope').extensions.codesearch.find_files{}<CR>]],
+    { noremap = true, silent=true }
+    )
+
+    -- Search using codesearch queries.
+    map(
+    "n",
+    "<leader>cs",
+    [[<cmd>lua require('telescope').extensions.codesearch.find_query{}<CR>]],
+    { noremap = true, silent = true }
+    )
+
+    -- Search for the word under cursor.
+    map(
+    "n",
+    "<leader>CS",
+    [[<cmd>lua require('telescope').extensions.codesearch.find_query{default_text_expand='<cword>'}<CR>]],
+    { noremap = true, silent = true }
+    )
+
+    -- Search for text selected in Visual mode.
+    map(
+    "v",
+    "<leader>cs",
+    [[<cmd>lua require('telescope').extensions.codesearch.find_query{}<CR>]],
+    { noremap = true, silent = true }
+    )
+end

vim/.vim/lua/config/trouble.lua

@@ -4,13 +4,6 @@ vim.diagnostic.config({
   severity_sort = true,
 })
 
-vim.keymap.set(
-  "",
-  "<Leader>l",
-  require("lsp_lines").toggle,
-  { desc = "Toggle lsp_lines" }
-)
-
 -- Diagnostics
 require("trouble").setup({
   signs = {
@@ -35,4 +28,4 @@ vim.api.nvim_set_keymap("n", "<Leader>xq", "<Cmd>Trouble quickfix<CR>", opts)
 vim.api.nvim_set_keymap("n", "[g", "<cmd>lua vim.diagnostic.goto_prev()<CR>", opts)
 vim.api.nvim_set_keymap("n", "]g", "<cmd>lua vim.diagnostic.goto_next()<CR>", opts)
 
-vim.cmd [[autocmd! CursorHold,CursorHoldI * lua vim.diagnostic.open_float(nil, {focus=false})]]
+-- vim.cmd [[autocmd! CursorHold,CursorHoldI * lua vim.diagnostic.open_float(nil, {focus=false})]]

vim/.vim/lua/plugin_init.lua

@@ -0,0 +1,20 @@
+local fn = vim.fn
+local use_google = require("utils").use_google
+
+local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
+if not vim.loop.fs_stat(lazypath) then
+  vim.fn.system({
+    "git",
+    "clone",
+    "--filter=blob:none",
+    "https://github.com/folke/lazy.nvim.git",
+    "--branch=stable", -- latest stable release
+    lazypath,
+  })
+end
+vim.opt.rtp:prepend(lazypath)
+
+package.path = package.path .. ';' .. vim.env.HOME .. "/.vim/lua/?.lua"
+
+require("lazy").setup("plugins")
+

vim/.vim/lua/plugins.lua

@@ -1,397 +0,0 @@
-local use_google = require("utils").use_google
-local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
-if not vim.loop.fs_stat(lazypath) then
-    vim.fn.system({
-        "git",
-        "clone",
-        "--filter=blob:none",
-        "https://github.com/folke/lazy.nvim.git",
-        "--branch=stable", -- latest stable release
-        lazypath,
-    })
-end
-vim.opt.rtp:prepend(lazypath)
-package.path = package.path ..  vim.fn.expand(";$HOME/.vim/lua/?.lua")
-
--- Example using a list of specs with the default options
-vim.g.mapleader = "," -- Make sure to set `mapleader` before lazy so your mappings are correct
-vim.g.windowswap_map_keys = 0
-
-require("lazy").setup({
-    "folke/which-key.nvim",
-    { "folke/neoconf.nvim", cmd = "Neoconf" },
-    "folke/neodev.nvim",
-
-    'lewis6991/impatient.nvim',
-    'dstein64/vim-startuptime',
-    'will133/vim-dirdiff',
-
-    {
-        "nvim-treesitter/nvim-treesitter",
-        lazy = false,
-        build = ":TSUpdate",
-        config = function() require("config.nvim-treesitter") end
-    },
-
-    {
-        "nvim-neo-tree/neo-tree.nvim",
-        config = function() require("config.neotree") end,
-        dependencies = {
-            "nvim-lua/plenary.nvim",
-            -- "nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
-            "MunifTanjim/nui.nvim",
-        }
-    },
-
-    -- Undo tree
-    {
-        'mbbill/undotree',
-        cmd = 'UndotreeToggle',
-        config = function() vim.g.undotree_SetFocusWhenToggle = 1 end,
-    },
-
-    'nvim-lua/plenary.nvim',
-    {
-        'renerocksai/telekasten.nvim',
-        config = function()  require("config.telekasten") end
-    },
-    'renerocksai/calendar-vim',
-
-    'google/vim-searchindex',
-    { 'ray-x/go.nvim',ft='go' },
-    { 'ray-x/guihua.lua',ft='go' },
-
-    -- Pretty symbols
-    'kyazdani42/nvim-web-devicons',
-
-    -- Completion and linting
-    'neovim/nvim-lspconfig',
-
-    {
-        'hrsh7th/nvim-cmp',
-        dependencies = {
-            'onsails/lspkind.nvim',
-            'hrsh7th/cmp-nvim-lsp',
-            'hrsh7th/cmp-buffer',
-            'lukas-reineke/cmp-under-comparator',
-            'hrsh7th/cmp-cmdline',
-            'f3fora/cmp-spell',
-            'hrsh7th/cmp-nvim-lsp-document-symbol',
-            'hrsh7th/cmp-nvim-lsp-signature-help',
-            'hrsh7th/cmp-nvim-lua',
-            'hrsh7th/cmp-path',
-            'hrsh7th/cmp-vsnip',
-            'ray-x/cmp-treesitter',
-        },
-        event = 'InsertEnter',
-        lazy = false,
-        config = function() require("config.lsp") end,
-    },
-
-    {
-        "tzachar/cmp-tabnine", build = "./install.sh",
-        event = 'InsertEnter',
-        enabled = not use_google(),
-    },
-
-    { 'ErichDonGubler/lsp_lines.nvim', config = function()  require("lsp_lines").setup()  end },
-    {
-        'jose-elias-alvarez/null-ls.nvim',
-        config = function()  require("config.null-ls")  end,
-    },
-
-    "williamboman/mason.nvim",
-    "williamboman/mason-lspconfig.nvim",
-    'VonHeikemen/lsp-zero.nvim',
-    {
-        'nvim-telescope/telescope.nvim',
-        cmd = 'Telescope',
-        config = function()
-            require('telescope').setup {
-                pickers = {
-                    buffers = {
-                        sort_lastused = true,
-                    },
-                },
-            }
-        end,
-        dependencies = {
-            'nvim-lua/plenary.nvim',
-        },
-        event = { "BufReadPost", "BufNewFile" },
-        keys = {
-            {
-                '<leader>tf',
-                function()
-                    require('telescope.builtin').find_files{ find_command = {'rg', '--files', '--hidden', '-g', '!node_modules/**'} }
-                end,
-                desc = 'Telescope Files',
-                remap = false,
-                unique = true,
-            },
-            {
-                '<leader>th',
-                function()
-                    require('telescope.builtin').help_tags{}
-                end,
-                desc = 'Telescope Help',
-                remap = false,
-                unique = true,
-            },
-            {
-                '<leader>tw',
-                function()
-                    require('telescope.builtin').grep_string{}
-                end,
-                desc = 'Telescope Word',
-                remap = false,
-                unique = true,
-            },
-            {
-                '<leader>tg',
-                function()
-                    require('telescope.builtin').live_grep{}
-                end,
-                desc = 'Telescope Grep',
-                remap = false,
-                unique = true,
-            },
-            {
-                '<leader>cs',
-                function()
-                    require('telescope').extensions.codesearch.find_query{}
-                end,
-                desc = 'Telescope Codesearch',
-                remap = false,
-                unique = true,
-            },
-            {
-                '<leader>CS',
-                function()
-                    require('telescope').extensions.codesearch.find_query{default_text_expand='<cword>'}
-                end,
-                desc = 'Telescope Codesearch',
-                remap = false,
-                unique = true,
-            },
-            {
-                '<leader>CS',
-                function()
-                    require('telescope').extensions.codesearch.find_query{}
-                end,
-                desc = 'Telescope Codesearch',
-                remap = false,
-                unique = true,
-                mode = "v",
-            },
-
-            { "<leader>tm", "<cmd>:Telescope citc modified<CR>" },
-            { "<leader>tb", "<cmd>Telescope file_browser<CR>" },
-            { '<leader>fs', function() require('telescope').extensions.fig.status{} end },
-            { '<leader>fx', function() require('telescope').extensions.fig.xl{} end },
-            { '<leader>fw', function() require('telescope').extensions.fig.status{whatsout=true} end },
-        }
-    },
-
-    {
-        'nvim-telescope/telescope-file-browser.nvim',
-        dependencies = {'nvim-telescope/telescope.nvim'}
-    },
-
-    -- Rust
-    {
-        'saecki/crates.nvim',
-        ft = 'rust',
-        version = 'v0.3.0',
-        dependencies = { 'nvim-lua/plenary.nvim' },
-        config = function()  require('crates').setup() end
-    },
-
-    {'simrat39/rust-tools.nvim', ft = 'rust'},
-
-    {
-        'folke/trouble.nvim',
-        config = function()  require("config.trouble") end
-    },
-
-    {
-        'ThePrimeagen/refactoring.nvim',
-        dependencies = {
-            {"nvim-lua/plenary.nvim"},
-            {"nvim-treesitter/nvim-treesitter"}
-        },
-        config = function()  require("config.refactoring") end
-    },
-
-    'apalmer1377/factorus',
-    'hrsh7th/vim-vsnip',
-    'kosayoda/nvim-lightbulb',
-    'jghauser/mkdir.nvim',
-    'nvim-lua/lsp-status.nvim',
-
-    {'andymass/vim-matchup', event = 'VimEnter'},
-    { 'simrat39/symbols-outline.nvim', config = function()  require("config.symbols-outline") end  },
-    { 'petertriho/nvim-scrollbar', config = function()  require("scrollbar").setup() end },
-    {
-        'rmagatti/auto-session',
-        lazy = false,
-        config = function()
-            require("auto-session").setup {
-                log_level = "error",
-                auto_session_suppress_dirs = { "~/", "~/Downloads", "/", os.getenv("HOME")},
-            }
-        end
-    },
-
-    {
-        "ipod825/libp.nvim",
-        config = function()
-            require("libp").setup()
-        end,
-    },
-
-
-    {
-        'nvim-lualine/lualine.nvim',
-        lazy = false,
-        config = function()  require("config.lualine") end
-    },
-    {
-        'rcarriga/nvim-notify',
-        config = function() require("config.notify") end
-    },
-
-    -- Git
-    {
-        {
-            'lewis6991/gitsigns.nvim',
-            dependencies = 'nvim-lua/plenary.nvim',
-            event = 'User ActuallyEditing',
-        },
-        {
-            'akinsho/git-conflict.nvim',
-            config = function() require('git-conflict').setup()  end,
-        },
-        { 'rhysd/conflict-marker.vim' }
-    },
-
-    -- { "catppuccin/nvim", as = "catppuccin" }
-    { "catppuccin/nvim", name = "catppuccin", lazy=false, config = function()  require("config.catppuccin")  end},
-
-    -- Tmux
-    'preservim/vimux',
-    'tmux-plugins/vim-tmux',
-    'christoomey/vim-tmux-navigator',
-    'whatyouhide/vim-tmux-syntax',
-    'tmux-plugins/vim-tmux-focus-events',
-    'jabirali/vim-tmux-yank',
-    'skywind3000/asyncrun.vim',
-
-    {
-        'ojroques/nvim-osc52',
-        config = function()  require("config.oscyank") end
-    },
-
-    -- mine
-    {
-        'squk/java-syntax.vim', ft='java', lazy=false
-    },
-
-    {
-        "folke/which-key.nvim",
-        config = function()  require("config.whichkey") end
-    },
-
-    'ntpeters/vim-better-whitespace',
-    'junegunn/fzf.vim',
-    { 'junegunn/fzf', build = ":call fzf#install()" },
-
-    'nathanaelkane/vim-indent-guides',
-    'tversteeg/registers.nvim',
-    'jremmen/vim-ripgrep',
-
-    { 'udalov/kotlin-vim', ft='kotin' },
-    'wesQ3/vim-windowswap',
-    'tpope/vim-surround',
-    'scrooloose/nerdcommenter',
-
-    { 'vim-scripts/vcscommand.vim' },
-    {
-        'mhinz/vim-signify',
-        config= function() require('config.signify') end
-    },
-
-    {
-        'j-hui/fidget.nvim',
-        config = function()  require("fidget").setup() end
-    },
-    {
-        "iamcco/markdown-preview.nvim",
-        build = "cd app && npm install",
-        init = function() vim.g.mkdp_filetypes = { "markdown" } end,
-        ft = { "markdown" }
-    },
-
-    -- Google Plugins
-    {
-        url = 'sso://googler@user/piloto/cmp-nvim-ciderlsp',
-        enabled = use_google(),
-    },
-    {
-        url = 'sso://googler@user/kdark/ciderlsp-nvim',
-        enabled = use_google(),
-    },
-    {
-        url = "sso://googler@user/jackcogdill/nvim-figtree",
-        enabled = use_google(),
-    },
-    {
-        url = 'sso://googler@user/vintharas/telescope-codesearch.nvim',
-        enabled = use_google(),
-        dependencies = { 'nvim-telescope/telescope.nvim' }
-    },
-    {
-        url = 'sso://googler@user/aktau/telescope-citc.nvim',
-        enabled = use_google(),
-        dependencies = { 'nvim-telescope/telescope.nvim' }
-    },
-    {
-        url = 'sso://googler@user/tylersaunders/telescope-fig.nvim',
-        enabled = use_google(),
-        dependencies = { 'nvim-telescope/telescope.nvim' }
-    },
-
-    {
-        url = 'sso://googler@user/chmnchiang/google-comments',
-        -- '/google/src/head/depot/google3/experimental/users/chmnchiang/neovim/google-comments',
-        -- '/google/src/cloud/cnieves/google-comments/google3/experimental/users/chmnchiang/neovim/google-comments',
-        dependencies = {'rcarriga/nvim-notify', 'nvim-lua/plenary.nvim'},
-        enabled = use_google(),
-        config = function()  require("config.google-comments") end
-    },
-    --  {
-    --      dir = '/google/src/cloud/cnieves/google-comments/google3/experimental/users/cnieves/neovim/critique',
-    --      enabled = use_google(),
-    --      config = function()  require("critique").setup() end,
-    --  },
-    {
-        url = "sso://googler@user/smwang/hg.nvim",
-        dependencies =  { "ipod825/libp.nvim" },
-        enabled = use_google(),
-        config = function()
-            require("config.fig")
-            require("hg").setup()
-        end,
-    },
-},
-{ defaults = {lazy = false} })
-
--- CiderLSP
-vim.opt.completeopt = { "menu", "menuone", "noselect" }
--- Don't show the dumb matching stuff
-vim.opt.shortmess:append("c")
-
-vim.opt.spell = true
-vim.opt.spelllang = { 'en_us' }
-
-require("config.imp")

vim/.vim/lua/plugins/base.lua

@@ -0,0 +1,294 @@
+local use_google = require("utils").use_google
+
+return
+{
+    -- Pretty symbols
+    'kyazdani42/nvim-web-devicons',
+
+    'jghauser/mkdir.nvim',
+    'lewis6991/impatient.nvim',
+    'dstein64/vim-startuptime',
+    'will133/vim-dirdiff',
+    'renerocksai/calendar-vim',
+    'google/vim-searchindex',
+    'apalmer1377/factorus',
+    'hrsh7th/vim-vsnip',
+    'kosayoda/nvim-lightbulb',
+    'tpope/vim-surround',
+    'ntpeters/vim-better-whitespace',
+    'junegunn/fzf.vim',
+    'nathanaelkane/vim-indent-guides',
+    'tversteeg/registers.nvim',
+    'jremmen/vim-ripgrep',
+    'nvim-lua/plenary.nvim',
+
+    {
+        'scrooloose/nerdcommenter',
+        config = function()
+            require("config.nerdcommenter")
+        end,
+        keys = {
+            { "<leader>c<Space>", ":call nerdcommenter#Comment(0, 'toggle')<CR>" },
+            { "<leader>c<Space>", ":call nerdcommenter#Comment(0, 'toggle')<CR>", 'v' },
+            { "<leader>c$", ":call nerdcommenter#Comment(0, 'ToEOL')<CR>" },
+            { "<leader>c$", ":call nerdcommenter#Comment(0, 'ToEOL')<CR>", 'v' },
+        }
+    },
+    {
+        'nvim-treesitter/nvim-treesitter',
+        build = ':TSUpdate',
+        config = function()
+            require("config.nvim-treesitter")
+        end,
+        lazy = false,
+    },
+
+    {
+      "nvim-neo-tree/neo-tree.nvim",
+        branch = "v2.x",
+        config = function()
+            require("config.neotree")
+        end,
+        dependencies = {
+          "nvim-lua/plenary.nvim",
+          "MunifTanjim/nui.nvim",
+        },
+        keys = {
+          { "<C-n>", ":Neotree filesystem reveal toggle reveal_force_cwd<cr>", desc = "Open NeoTree" },
+        },
+      },
+
+    -- Undo tree
+    {
+        'mbbill/undotree',
+        cmd = 'UndotreeToggle',
+        config = function()
+            vim.g.undotree_SetFocusWhenToggle = 1
+        end
+    },
+
+    {
+        'renerocksai/telekasten.nvim',
+        config = function()
+            require("config.telekasten")
+        end,
+        keys = {
+          { "<leader>zf", ":lua require('telekasten').find_notes()<CR>", desc = "Find Notes" },
+        },
+    },
+    { 'ray-x/go.nvim',ft='go' },
+    { 'ray-x/guihua.lua',ft='go' },
+
+    "williamboman/mason.nvim",
+    "williamboman/mason-lspconfig.nvim",
+    'nvim-lua/lsp-status.nvim',
+    'VonHeikemen/lsp-zero.nvim',
+
+    -- Completion and linting
+    {
+        'hrsh7th/nvim-cmp',
+        event = "VimEnter",
+
+        dependencies = {
+            'onsails/lspkind.nvim',
+            'neovim/nvim-lspconfig',
+            'hrsh7th/cmp-nvim-lsp',
+            'hrsh7th/cmp-buffer',
+            'lukas-reineke/cmp-under-comparator',
+            'hrsh7th/cmp-cmdline',
+            'f3fora/cmp-spell',
+            'hrsh7th/cmp-nvim-lsp-document-symbol',
+            'hrsh7th/cmp-nvim-lsp-signature-help',
+            'hrsh7th/cmp-nvim-lua',
+            'hrsh7th/cmp-path',
+            'hrsh7th/cmp-vsnip',
+            'ray-x/cmp-treesitter',
+        },
+        config = function()
+            require("config.lsp")
+        end
+    },
+    {
+        "tzachar/cmp-tabnine", build = "./install.sh",
+        event = 'InsertEnter',
+        cond = not use_google(),
+    },
+    {
+        'ErichDonGubler/lsp_lines.nvim',
+        event = "VimEnter",
+        keys = {
+          { "<leader>l", function() require("lsp_lines").toggle() end, desc = "Toggle LSP Lines" },
+        },
+    },
+    {
+        'jose-elias-alvarez/null-ls.nvim',
+        event = "VimEnter",
+        config = function()
+            require("config.null-ls")
+        end
+    },
+
+    {
+        'nvim-telescope/telescope.nvim',
+        branch = '0.1.x',
+        config = function()
+            require("config.telescope")
+        end,
+        dependencies = {
+            "telescope_codesearch",
+            "telescope_citc",
+            "telescope_fig",
+            'nvim-telescope/telescope-file-browser.nvim',
+        },
+        keys = {
+            { '<leader>tb', ":Telescope file_buffers", desc = '[T]elescope [B]uffers' } ,
+            { '<leader>tf', [[:lua require('telescope.builtin').find_files{ find_command = {'rg', '--files', '--hidden', '-g', '!node_modules/**'} }<cr>]], desc = '[T]elescope [F]iles' },
+            { '<leader>th', [[:lua require('telescope.builtin').help_tags<cr>]],  desc = '[T]elescope [H]elp' },
+            { '<leader>tw', [[:lua require('telescope.builtin').grep_string<cr>]],  desc = '[T]elescope current [W]ord' },
+            { '<leader>tg', [[:lua require('telescope.builtin').live_grep<cr>]],  desc = '[T]elescope by [G]rep' },
+            -- Google mappings
+            { '<C-P>', [[:lua require('telescope').extensions.codesearch.find_files{}<CR>]],'n', { noremap = true, silent=true }},
+            { '<C-Space>', [[:lua require('telescope').extensions.codesearch.find_query{}<CR>]], { noremap = true, silent = true }},
+            { '<leader>cs', [[:lua require('telescope').extensions.codesearch.find_query{}<CR>]], { noremap = true, silent = true }},
+            { '<leader>cs', [[:lua require('telescope').extensions.codesearch.find_query{}<CR>]], 'v', { noremap = true, silent = true }},
+            { '<leader>CS', [[:lua require('telescope').extensions.codesearch.find_query{default_text_expand='<cword>'}<CR>]], { noremap = true, silent = true } },
+        },
+    },
+
+    -- Rust
+    {
+        'saecki/crates.nvim',
+        ft = 'rust',
+        version = 'v0.3.0',
+        dependencies = { 'nvim-lua/plenary.nvim' },
+        config = function()
+            require('crates').setup()
+        end
+    },
+
+    {'simrat39/rust-tools.nvim', ft = 'rust'},
+
+    {
+        'folke/trouble.nvim',
+        event = "VimEnter",
+        config = function()
+            require("config.trouble")
+        end,
+    },
+
+    {
+        'ThePrimeagen/refactoring.nvim',
+         dependencies = {
+            {"nvim-lua/plenary.nvim"},
+            {"nvim-treesitter/nvim-treesitter"}
+        },
+        config = function()
+            require("config.refactoring")
+        end
+    },
+    {'andymass/vim-matchup', event = 'VimEnter'},
+
+    { 'simrat39/symbols-outline.nvim',
+        config = function()
+            require("config.symbols-outline")
+        end
+    },
+    {
+        'petertriho/nvim-scrollbar',
+        config = function()
+            require("scrollbar").setup()
+        end,
+        lazy = false,
+    },
+
+    {
+        'rmagatti/auto-session',
+        config = function()
+            require("auto-session").setup {
+                log_level = "error",
+                auto_session_suppress_dirs = { "~/", "~/Downloads", "/", os.getenv("HOME")},
+            }
+        end
+    },
+
+    {
+        "ipod825/libp.nvim",
+        config = function()
+            require("libp").setup()
+        end,
+    },
+
+    {
+        'nvim-lualine/lualine.nvim',
+        lazy = false,
+        config = function()
+            require("config.lualine")
+        end
+    },
+    {
+        'rcarriga/nvim-notify',
+        config = function()
+            require("config.notify")
+        end
+    },
+
+    {
+        "catppuccin/nvim",
+    name = "catppuccin",
+        lazy = false, -- make sure we load this during startup if it is your main colorscheme
+    priority = 1000, -- make sure to load this before all the other start plugins
+    config = function()
+        require("config.catppuccin")
+        end
+    },
+    {
+        'ojroques/nvim-osc52',
+        config = function()
+            require("config.oscyank")
+        end
+    },
+
+    -- mine
+    {
+        'squk/java-syntax.vim',
+        lazy = false,
+    },
+
+    {
+        "folke/which-key.nvim",
+        config = function()
+            require("config.whichkey")
+        end
+    },
+    { 'junegunn/fzf', build = ":call fzf#install()" },
+
+    { 'udalov/kotlin-vim', ft='kotin' },
+
+    {
+        'wesQ3/vim-windowswap',
+        init = function()
+            vim.g.windowswap_map_keys = 0
+        end,
+    },
+
+    { 'vim-scripts/vcscommand.vim' },
+    {
+        'mhinz/vim-signify',
+        config= function()
+            require('config.signify')
+        end
+    },
+
+    {
+        'j-hui/fidget.nvim',
+        init = function() require("fidget").setup() end
+    },
+    {
+        "iamcco/markdown-preview.nvim",
+        build = "cd app && npm install",
+        setup = function()
+            vim.g.mkdp_filetypes = { "markdown" }
+        end,
+        ft = { "markdown" }
+    },
+}

vim/.vim/lua/plugins/git.lua

@@ -0,0 +1,16 @@
+return {
+    -- Git
+    {
+        'lewis6991/gitsigns.nvim',
+        dependencies = 'nvim-lua/plenary.nvim',
+        event = 'User ActuallyEditing',
+    },
+    {
+        'akinsho/git-conflict.nvim',
+        version = '*',
+        config = function()
+            require('git-conflict').setup()
+        end,
+    },
+    { 'rhysd/conflict-marker.vim' }
+}

vim/.vim/lua/plugins/google.lua

@@ -0,0 +1,90 @@
+local use_google = require("utils").use_google
+
+return {
+    {
+        name = "ai.nvim",
+        url = 'sso://googler@user/vvvv/ai.nvim',
+    },
+    {
+        name = "cmp_nvim_ciderlsp",
+        url = 'sso://googler@user/piloto/cmp-nvim-ciderlsp',
+        lazy = false;
+        dependencies = {
+            'hrsh7th/nvim-cmp',
+        }
+    },
+    {
+        name = "ciderlsp_nvim",
+        url = 'sso://googler@user/kdark/ciderlsp-nvim',
+        lazy = false;
+        dependencies = {
+            'hrsh7th/nvim-cmp',
+        }
+    },
+    {
+        name = "nvim_figtree",
+        url = "sso://googler@user/jackcogdill/nvim-figtree",
+    },
+    {
+        name = "telescope_codesearch",
+        url = 'sso://googler@user/vintharas/telescope-codesearch.nvim',
+        dependencies = { 'nvim-telescope/telescope.nvim' },
+    },
+    {
+        name = "telescope_citc",
+        url = 'sso://googler@user/aktau/telescope-citc.nvim',
+        dependencies = { 'nvim-telescope/telescope.nvim' }
+    },
+    {
+        name = "telescope_fig",
+        url = 'sso://googler@user/tylersaunders/telescope-fig.nvim',
+        dependencies = { 'nvim-telescope/telescope.nvim' }
+    },
+    {
+        name = "google_comments",
+        url = 'sso://googler@user/chmnchiang/google-comments',
+        -- '/google/src/head/depot/google3/experimental/users/chmnchiang/neovim/google-comments',
+        -- '/google/src/cloud/cnieves/google-comments/google3/experimental/users/chmnchiang/neovim/google-comments',
+        dependencies = {'rcarriga/nvim-notify', 'nvim-lua/plenary.nvim'},
+        config = function()
+            require("config.google-comments")
+        end,
+    },
+
+    -- {
+    --     '/google/src/cloud/cnieves/google-comments/google3/experimental/users/cnieves/neovim/critique',
+    --     config = [[ require("critique").setup() ]]
+    -- },
+
+    {
+        name = "hg",
+        url = "sso://googler@user/smwang/hg.nvim",
+        dependencies =  { "ipod825/libp.nvim" },
+        config = function()
+            require("config.fig")
+            require("hg").setup()
+        end,
+    }
+}
+    -- {
+    --     'google/vim-glaive',
+    --     after  =  {
+    --         'google/vim-maktaba',
+    --     }
+    --     -- disable = use_google(),
+    --     -- cond = not use_google(),
+    -- }
+    -- {
+    --     'google/vim-maktaba',
+    --     -- disable = use_google(),
+    --     -- cond = not use_google(),
+    -- }
+    -- {
+    --     'flwyd/vim-imp',
+    --     disable = use_google(),
+    --     -- cond = not use_google(),
+    --     after  =  {
+    --         'google/vim-maktaba',
+    --         'google/vim-glaive',
+    --     }
+    -- }

vim/.vim/lua/plugins/tmux.lua

@@ -0,0 +1,9 @@
+return {
+    'preservim/vimux',
+    'tmux-plugins/vim-tmux',
+    'christoomey/vim-tmux-navigator',
+    'whatyouhide/vim-tmux-syntax',
+    'tmux-plugins/vim-tmux-focus-events',
+    'jabirali/vim-tmux-yank',
+    'skywind3000/asyncrun.vim',
+}

vim/.vim/prefs/google.vim

@@ -7,8 +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
+" 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
@@ -158,14 +158,6 @@ endfunction
 
 com! -nargs=? -complete=file Blame :call G4Blame(<f-args>)
 
-" nnoremap <leader>cs :FzfCs<space>
-" The buffer n can be replaced by any other unused buffer.
-" <c-u> removes the visual range because csearch doesn't support ranges.
-" Removes newlines to allow the entire line search using V-LINE mode.
-" vnoremap <leader>cs "ny:<c-u>FzfCs "<c-r>=substitute(@n, '\n', '', '')<cr>"<cr>
-"
-" nnoremap <leader>CS :FzfCs<Space> <C-r><C-w> <cr>
-
 nnoremap <leader>cc :CritiqueUnresolvedComments<space><cr>
 
 " nnoremap <leader>ps :PiperSelectActiveFiles<CR>

vim/.vim/prefs/leader.vim

@@ -71,37 +71,6 @@ endfunction
 
 nmap <leader>toi :CocCommand tsserver.organizeImports<cr>
 
-"" --------- NERD Commenter
-" Create default mappings
-let g:NERDCreateDefaultMappings = 0
-
-" Add spaces after comment delimiters by default
-let g:NERDSpaceDelims = 1
-
-" Use compact syntax for prettified multi-line comments
-let g:NERDCompactSexyComs = 1
-
-" Align line-wise comment delimiters flush left instead of following code indentation
-let g:NERDDefaultAlign = 'left'
-
-" Set a language to use its alternate delimiters by default
-let g:NERDAltDelims_java = 1
-
-" Allow commenting and inverting empty lines (useful when commenting a region)
-let g:NERDCommentEmptyLines = 1
-
-" Enable trimming of trailing whitespace when uncommenting
-let g:NERDTrimTrailingWhitespace = 1
-
-"Enable NERDCommenterToggle to check all selected lines is commented or not
-let g:NERDToggleCheckAllLines = 1
-
-nnoremap <leader>c<Space> :call nerdcommenter#Comment(0,"toggle")<CR>
-vnoremap <leader>c<Space> :call nerdcommenter#Comment(0,"toggle")<CR>
-
-nnoremap <leader>c$ :call nerdcommenter#Comment(0,"ToEOL")<CR>
-vnoremap <leader>c$ :call nerdcommenter#Comment(0,"ToEOL")<CR>
-
 nmap <leader>yf :let @+ = expand("%")<cr>
 nmap <leader>ut :UndotreeToggle<cr>
 nmap <leader>e :e %%
@@ -122,7 +91,7 @@ function! <SID>SynStack()
   echo map(synstack(line('.'), col('.')), 'synIDattr(v:val, "name")')
 endfunc
 
-nnoremap <leader>s :SaveSession<CR>
+nnoremap <leader>s :SessionSave<CR>
 
 " copy to attached terminal using the yank(1) script:
 " https://github.com/sunaku/home/blob/master/bin/yank

vim/.vimrc

@@ -2,9 +2,11 @@ set nocompatible              " be iMproved, required
 
 let mapleader="," " BEST LEADER OF ALL TIME (BLOT)
 filetype off                  " required
-set rtp+=~/.vim
-set rtp+=~/.vim/after
-set rtp+=~/.config/nvim/after/
+set runtimepath+=,~/.vim
+set runtimepath+=,~/.vim/after
+set runtimepath+=,~/.vim/lua/
+set runtimepath+=,~/.config/nvim/after/
+let &runtimepath = &runtimepath
 
 set directory=/tmp
 set undodir=/tmp
@@ -19,7 +21,6 @@ let &t_8f = "\<Esc>[38;2;%lu;%lu;%lum"
 let &t_8b = "\<Esc>[48;2;%lu;%lu;%lum"
 let &t_AB="\e[48;5;%dm"
 let &t_AF="\e[38;5;%dm"
-syntax on
 
 set laststatus=2
 set cmdheight=1
@@ -79,13 +80,7 @@ set omnifunc= completeopt=menuone,noinsert,noselect
 
 set updatetime=100
 
-if filereadable(expand("~/.vimrc.local"))
-  source ~/.vimrc.local
-endif
-
-if filereadable(expand("~/use_google"))
-  source ~/.vim/prefs/google.vim
-endif
+lua require('plugin_init')
 
 source ~/.vim/prefs/mappings.vim
 source ~/.vim/prefs/leader.vim
@@ -191,5 +186,12 @@ function! s:AddBufferToTab()
   tabfirst
 endfun
 
+
 filetype plugin indent on
-lua require("plugins")
+syntax on
+
+if filereadable(expand("~/use_google"))
+  source ~/.vim/prefs/google.vim
+endif
+lua require("config.imp")
+

zsh/.bash_profile.google

@@ -70,6 +70,8 @@ alias hgd='source /google/src/head/depot/google3/experimental/fig_contrib/hgshor
 alias builddoctor=/google/bin/releases/build-doctor/builddoctor
 alias rudi=/google/data/ro/teams/lsc/bin/rudi-cli
 alias rudi-cli=/google/data/ro/teams/lsc/bin/rudi-cli
+alias tmux=tmx2
+compdef tmx2=tmux
 
 export ACID_STARTUP_SCRIPT_PATH=~/acid_startup.sh
 export PATH=$PATH:/usr/local/google/home/cnieves/.local/binexport PATH=$PATH:/usr/local/google/home/cnieves/.local/bin
@@ -180,8 +182,9 @@ to_mac(){
 }
 
 bdoctor() {
-    default=$(builddoctor analyze --blueprint //depot/google3/java/com/google/android/gmscore/tools/build_doctor/build_doctor.blueprint --cl $1 --analysis_type=PERIODIC --buildable_unit_type BUILD --buildable_unit gmscore.build_doctor.debug_container | grep http)
-    hourly=$(builddoctor analyze --blueprint //depot/google3/java/com/google/android/gmscore/tools/build_doctor/build_doctor.blueprint --cl $1 --analysis_type=PERIODIC --analysis_name=hourly --buildable_unit_type BUILD --buildable_unit gmscore.build_doctor.debug_container | grep http)
+    default=$(builddoctor analyze --blueprint //depot/google3/java/com/google/android/gmscore/tools/build_doctor/build_doctor.blueprint --cl $1 --analysis_type=PERIODIC --buildable_unit_type BUILD --buildable_unit gmscore.build_doctor.debug_container | grep http | sed 's/Created Analysis TaskSet (results will appear here): //')
+    hourly=$(builddoctor analyze --blueprint //depot/google3/java/com/google/android/gmscore/tools/build_doctor/build_doctor.blueprint --cl $1 --analysis_type=PERIODIC --analysis_name=hourly --buildable_unit_type BUILD --buildable_unit gmscore.build_doctor.debug_container | grep http | sed 's/Created Analysis TaskSet (results will appear here): //')
+
     echo "DEFAULT(ANALYSIS): $default"
     echo "HOURLY(EXECUTION): $hourly"
 }

zsh/.zshrc

@@ -266,3 +266,4 @@ source ~/.bash_profile
 
 alias luamake=/luamake
 export PATH="/opt/homebrew/opt/openjdk/bin:$PATH"
+export PATH="$HOME/.local/bin:$PATH"