cleanup

tmux/.tmux.conf

@@ -28,6 +28,7 @@ set-window-option -g pane-base-index 1
 
 # enable OSC 52 clipboard
 set -s set-clipboard external
+set-option -ag terminal-overrides ",xterm-256color:Ms=\\E]52;c;%p2%s\\7"
 
 # tmux-256color instead of screen-256color enables italics
 set -g default-terminal "tmux-256color"

vim/.vim/lua/config/catppuccin.lua

@@ -17,11 +17,11 @@ require("catppuccin").setup({
 		-- lightspeed = false,
 		-- lsp_saga = false,
 		lsp_trouble = true,
-		-- mason = true,
+        mason = true,
-		-- markdown = true,
+        markdown = true,
 		-- neogit = false,
 		-- neotest = false,
-		-- neotree = false,
+        neotree = true,
 		notify = true,
 		-- nvimtree = true,
 		-- overseer = false,
@@ -29,11 +29,11 @@ require("catppuccin").setup({
         symbols_outline = true,
 		telescope = true,
 		treesitter = true,
-		-- treesitter_context = false,
+        treesitter_context = false,
 		-- ts_rainbow = false,
 		-- vim_sneak = false,
 		-- vimwiki = false,
-		-- which_key = false,
+        which_key = true,
 
 		-- Special integrations, see https://github.com/catppuccin/nvim#special-integrations
 		dap = {

vim/.vim/lua/config/lualine.lua

@@ -66,33 +66,8 @@ require('lualine').setup {
         lualine_z = {'location'}
     },
     tabline = {
-        lualine_a = {{'tabs', mode = 1}},
+        lualine_a = {
-        -- lualine_b = {'branch'},
+            {'tabs', mode = 1},
-        -- lualine_c = {'filename'},
-        lualine_c = {
-            { 'diagnostics', sources = {"nvim_lsp", "nvim_workspace_diagnostic"}, symbols = {error = ' ', warn = ' ', info = ' ', hint = ' '} },
         },
-        -- lualine_y = { getLGTMs }
     },
-    -- default
+}
-    -- sections = {
-        --   lualine_a = {'mode'},
-        --   lualine_b = {'branch', 'diff', 'diagnostics'},
-        --   lualine_c = {'filename'},
-        --   lualine_x = {'encoding', 'fileformat', 'filetype'},
-        --   lualine_y = {'progress'},
-        --   lualine_z = {'location'}
-        -- },
-        inactive_sections = {
-            lualine_a = {},
-            lualine_b = {},
-            -- lualine_c = {'filename'},
-            lualine_x = {'location'},
-            lualine_y = {},
-            lualine_z = {}
-        },
-        -- tabline = {},
-        -- winbar = {},
-        -- inactive_winbar = {},
-        -- extensions = {}
-    }

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/nerdtree.lua

@@ -0,0 +1,4 @@
+local map = require("utils").map
+
+map('n', '<C-n>', ':NERDTreeToggle<cr>')
+map('n', '<C-f>', ':NERDTreeFind<cr>')

vim/.vim/lua/config/nvim-tree.lua

@@ -1,5 +1,75 @@
 local map = require("utils").map
 
-require("nvim-tree").setup()
+local api = require("nvim-tree.api")
+
+local function opts(desc)
+    return { desc = 'nvim-tree: ' .. desc, buffer = bufnr, noremap = true, silent = true, nowait = true }
+end
+
+function on_attach(bufnr)
+	vim.keymap.set('n', 'O', api.tree.change_root_to_node,          opts('CD'))
+	vim.keymap.set('n', '?', api.tree.toggle_help,   opts('Help'))
+
+    -- put some default mappings here
+    vim.keymap.set('n', '<C-e>', api.node.open.replace_tree_buffer,     opts('Open: In Place'))
+    vim.keymap.set('n', '<C-k>', api.node.show_info_popup,              opts('Info'))
+    vim.keymap.set('n', '<C-r>', api.fs.rename_sub,                     opts('Rename: Omit Filename'))
+    vim.keymap.set('n', '<C-t>', api.node.open.tab,                     opts('Open: New Tab'))
+    vim.keymap.set('n', '<C-v>', api.node.open.vertical,                opts('Open: Vertical Split'))
+    vim.keymap.set('n', '<C-x>', api.node.open.horizontal,              opts('Open: Horizontal Split'))
+    vim.keymap.set('n', '<BS>',  api.node.navigate.parent_close,        opts('Close Directory'))
+    vim.keymap.set('n', '<CR>',  api.node.open.edit,                    opts('Open'))
+    vim.keymap.set('n', '<Tab>', api.node.open.preview,                 opts('Open Preview'))
+    vim.keymap.set('n', '>',     api.node.navigate.sibling.next,        opts('Next Sibling'))
+    vim.keymap.set('n', '<',     api.node.navigate.sibling.prev,        opts('Previous Sibling'))
+    vim.keymap.set('n', '.',     api.node.run.cmd,                      opts('Run Command'))
+    vim.keymap.set('n', '-',     api.tree.change_root_to_parent,        opts('Up'))
+    vim.keymap.set('n', 'a',     api.fs.create,                         opts('Create'))
+    vim.keymap.set('n', 'bmv',   api.marks.bulk.move,                   opts('Move Bookmarked'))
+    vim.keymap.set('n', 'B',     api.tree.toggle_no_buffer_filter,      opts('Toggle No Buffer'))
+    vim.keymap.set('n', 'c',     api.fs.copy.node,                      opts('Copy'))
+    -- vim.keymap.set('n', 'C',     api.tree.toggle_git_clean_filter,      opts('Toggle Git Clean'))
+    -- vim.keymap.set('n', '[c',    api.node.navigate.git.prev,            opts('Prev Git'))
+    -- vim.keymap.set('n', ']c',    api.node.navigate.git.next,            opts('Next Git'))
+    vim.keymap.set('n', 'd',     api.fs.remove,                         opts('Delete'))
+    vim.keymap.set('n', 'D',     api.fs.trash,                          opts('Trash'))
+    vim.keymap.set('n', 'E',     api.tree.expand_all,                   opts('Expand All'))
+    vim.keymap.set('n', 'e',     api.fs.rename_basename,                opts('Rename: Basename'))
+    vim.keymap.set('n', ']e',    api.node.navigate.diagnostics.next,    opts('Next Diagnostic'))
+    vim.keymap.set('n', '[e',    api.node.navigate.diagnostics.prev,    opts('Prev Diagnostic'))
+    vim.keymap.set('n', 'F',     api.live_filter.clear,                 opts('Clean Filter'))
+    vim.keymap.set('n', 'f',     api.live_filter.start,                 opts('Filter'))
+    vim.keymap.set('n', 'g?',    api.tree.toggle_help,                  opts('Help'))
+    vim.keymap.set('n', 'gy',    api.fs.copy.absolute_path,             opts('Copy Absolute Path'))
+    vim.keymap.set('n', 'H',     api.tree.toggle_hidden_filter,         opts('Toggle Dotfiles'))
+    vim.keymap.set('n', 'I',     api.tree.toggle_gitignore_filter,      opts('Toggle Git Ignore'))
+    vim.keymap.set('n', 'J',     api.node.navigate.sibling.last,        opts('Last Sibling'))
+    vim.keymap.set('n', 'K',     api.node.navigate.sibling.first,       opts('First Sibling'))
+    vim.keymap.set('n', 'm',     api.marks.toggle,                      opts('Toggle Bookmark'))
+    vim.keymap.set('n', 'o',     api.node.open.edit,                    opts('Open'))
+    -- vim.keymap.set('n', 'O',     api.node.open.no_window_picker,        opts('Open: No Window Picker'))
+    vim.keymap.set('n', 'p',     api.fs.paste,                          opts('Paste'))
+    vim.keymap.set('n', 'P',     api.node.navigate.parent,              opts('Parent Directory'))
+    vim.keymap.set('n', 'q',     api.tree.close,                        opts('Close'))
+    vim.keymap.set('n', 'r',     api.fs.rename,                         opts('Rename'))
+    vim.keymap.set('n', 'R',     api.tree.reload,                       opts('Refresh'))
+    vim.keymap.set('n', 's',     api.node.run.system,                   opts('Run System'))
+    vim.keymap.set('n', 'S',     api.tree.search_node,                  opts('Search'))
+    vim.keymap.set('n', 'U',     api.tree.toggle_custom_filter,         opts('Toggle Hidden'))
+    vim.keymap.set('n', 'W',     api.tree.collapse_all,                 opts('Collapse'))
+    vim.keymap.set('n', 'x',     api.fs.cut,                            opts('Cut'))
+    vim.keymap.set('n', 'y',     api.fs.copy.filename,                  opts('Copy Name'))
+    vim.keymap.set('n', 'Y',     api.fs.copy.relative_path,             opts('Copy Relative Path'))
+end
+
+require("nvim-tree").setup({
+    on_attach = on_attach,
+    update_focused_file = {
+        enable = true,
+        update_root = false,
+        ignore_list = {},
+    },
+})
 
 map("n", "<C-T>", ":NvimTreeToggle<CR>")
+map("n", "<C-F>", ":NvimTreeFindFileToggle<CR>")

vim/.vim/lua/config/symbols-outline.lua

@@ -20,5 +20,4 @@ require("symbols-outline").setup(
 
 local map = require("utils").map
 
-
 map('n', '<leader>so', ':SymbolsOutline<cr>')

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

@@ -42,8 +42,11 @@ require('telescope').setup {
 
 local map = require("utils").map
 
-map('n', '<leader><space>', [[ <cmd>lua require('telescope.builtin').buffers ]], { desc = '[ ] Find existing buffers' })
+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:
@@ -75,8 +78,4 @@ if use_google() then
     [[<cmd>lua require('telescope').extensions.codesearch.find_query{}<CR>]],
     { noremap = true, silent = true }
     )
-
-    -- map("n",
-    -- "<leader>ps",
-    -- [[:Telescope find_files find_command=hg,pstatus,-ma,-n,--template=<CR>]])
 end

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,13 +47,22 @@ 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
+    vim.cmd([[ let g:neo_tree_remove_legacy_commands = 1 ]])
+
     use {
-        'nvim-tree/nvim-tree.lua',
+      "nvim-neo-tree/neo-tree.nvim",
-        config =[[ require("config.nvim-tree") ]]
+        branch = "v2.x",
-    }
+        config = [[ require("config.neotree") ]],
+        requires = {
+          "nvim-lua/plenary.nvim",
+          "nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
+          "MunifTanjim/nui.nvim",
+        }
+      }
 
     -- Undo tree
     use {
@@ -102,10 +107,10 @@ require('packer').startup(function(use)
             { 'saadparwaiz1/cmp_luasnip', after = {'LuaSnip'} },
         },
         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() ]] }
@@ -116,9 +121,15 @@ require('packer').startup(function(use)
     }
     use {
         'jose-elias-alvarez/null-ls.nvim',
-        config = [[ require("config.null-ls") ]]
+        config = [[ require("config.null-ls") ]],
     }
 
+    if use_google() then
+        require 'config.google'.config(use)
+    end
+
+    use { 'vim-scripts/vcscommand.vim' }
+
     -- Rust
     use {
         'saecki/crates.nvim',
@@ -131,12 +142,12 @@ require('packer').startup(function(use)
 
     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'
 
@@ -145,8 +156,8 @@ 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',
@@ -180,7 +191,7 @@ require('packer').startup(function(use)
     }
     use {
         'rcarriga/nvim-notify',
-        config = [[ require("config.notify") ]]
+        config = [[require("config.notify")]]
     }
 
     -- Git
@@ -188,20 +199,18 @@ require('packer').startup(function(use)
         {
             'lewis6991/gitsigns.nvim',
             requires = 'nvim-lua/plenary.nvim',
-            config = [[require('config.gitsigns')]],
             event = 'User ActuallyEditing',
         },
-        -- { 'TimUntersberger/neogit', cmd = 'Neogit', config = [[require('config.neogit')]] },
         {
             '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 +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'
@@ -238,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 {
@@ -257,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/mappings.vim

@@ -44,8 +44,9 @@ nnoremap <silent> vv <C-w>v
 nnoremap <silent> ss <C-w>s
 
 " always use very magic mode when searching
-"nnoremap / /\v
+nnoremap / /\v
-"vnoremap / /\v
+vnoremap / /\v
+
 nnoremap <silent> <leader>ww :call WindowSwap#EasyWindowSwap()<CR>
 
 function! s:createHabitsMappings(keys, message) abort

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,22 +84,18 @@ lua require('impatient')
 " lua require'impatient'.enable_profile()
 
 
-call plug#begin('~/.vim/plugged')
+if filereadable(expand("~/.vimrc.local"))
-  if filereadable(expand("~/.vimrc.local"))
+  source ~/.vimrc.local
-      source ~/.vimrc.local
+endif
-  endif
 
-  if filereadable(expand("~/use_google"))
+if filereadable(expand("~/use_google"))
-      source ~/.vim/prefs/google.vim
+  source ~/.vim/prefs/google.vim
-  endif
+endif
 
-   source ~/.vim/prefs/mappings.vim
+source ~/.vim/prefs/mappings.vim
-   source ~/.vim/prefs/leader.vim
+source ~/.vim/prefs/leader.vim
-   source ~/.vim/prefs/ui.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")