stuff

vim/.vim/lua/config/dap.lua

@@ -193,4 +193,3 @@ dap.configurations.java = {
 
 -- Server
 require('jdtls').start_or_attach(config)
-

vim/.vim/lua/config/fig.lua

@@ -0,0 +1,34 @@
+local map = require("utils").map
+local use_google = require("utils").use_google
+
+if use_google() then
+    map("n", "<leader>tw", ":Telescope citc workspaces<CR>")
+    map("n", "<leader>tm", ":Telescope citc modified<CR>")
+    map("n", "<leader>tb", ":Telescope file_browser<CR>")
+
+    -- [F]ig [S]tatus
+    map('n', '<leader>fs', [[<cmd>lua require('telescope').extensions.fig.status{}<CR>]])
+
+    -- [F]ig [X]l
+    map('n', '<leader>fx', [[<cmd>lua require('telescope').extensions.fig.xl{}<CR>]])
+
+    -- [F]ig [W]hatsout
+    map('n', '<leader>fw', [[<cmd>lua require('telescope').extensions.fig.status{whatsout=true}<CR>]])
+
+    -- [F]ig [A]mend
+    map('n', '<leader>fa', [[<cmd>Hg amend<CR>]])
+
+    -- [F]ig [A]mend
+    map('n', '<leader>fe', [[<cmd>Hg evolve<CR>]])
+
+    -- [F]ig [N]ext
+    map('n', '<leader>fn', [[<cmd>Hg next<CR>]])
+    --
+    -- [F]ig [P]rev
+    map('n', '<leader>fp', [[<cmd>Hg prev<CR>]])
+    --
+    -- [F]ig [U]pload
+    map('n', '<leader>fu', [[<cmd>Hg upload tree<CR>]])
+
+    map('n', '<Leader>f', ':Figtree<CR>', { silent = true })
+end

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

@@ -76,18 +76,4 @@ if use_google() then
     -- map("n",
     -- "<leader>ps",
     -- [[:Telescope find_files find_command=hg,pstatus,-ma,-n,--template=<CR>]])
-
-    map("n", "<leader>tw", ":Telescope citc workspaces<CR>")
-    map("n", "<leader>tm", ":Telescope citc modified<CR>")
-    map("n", "<leader>tb", ":Telescope file_browser<CR>")
-
-    -- [F]ig [S]tatus
-    map('n', '<leader>fs', [[<cmd>lua require('telescope').extensions.fig.status{}<CR>]])
-
-    -- [F]ig [X]l
-    map('n', '<leader>fx', [[<cmd>lua require('telescope').extensions.fig.xl{}<CR>]])
-
-    -- [F]ig [W]hatsout
-    map('n', '<leader>fw', [[<cmd>lua require('telescope').extensions.fig.status{whatsout=true}<CR>]])
-
 end

vim/.vim/lua/plugins.lua

@@ -74,7 +74,7 @@ require('packer').startup(function(use)
     }
     use {
         "tzachar/cmp-tabnine", run = "./install.sh",
-        disable = use_google(),
+        cond = not use_google(),
     }
     use { 'ErichDonGubler/lsp_lines.nvim', config = [[ require("lsp_lines").setup() ]] }
     use {
@@ -108,150 +108,170 @@ require('packer').startup(function(use)
     }
     use 'apalmer1377/factorus'
 
-    use {
-        'mfussenegger/nvim-dap',
-        'mfussenegger/nvim-jdtls',
-        ft = {'java','kotlin'},
-        config = [[ require("config.dap")]],
-    }
+    -- use {
+        --     'mfussenegger/nvim-dap',
+        --     'mfussenegger/nvim-jdtls',
+        --     ft = {'java','kotlin'},
+        --     config = [[ require("config.dap")]],
+        -- }
 
-    use 'hrsh7th/vim-vsnip'
-    use 'kosayoda/nvim-lightbulb'
-    use {'andymass/vim-matchup', event = 'VimEnter'}
+        use 'hrsh7th/vim-vsnip'
+        use 'kosayoda/nvim-lightbulb'
+        use {'andymass/vim-matchup', event = 'VimEnter'}
 
-    use 'jghauser/mkdir.nvim'
-    use { 'simrat39/symbols-outline.nvim', config = [[ require("config.symbols-outline") ]]  }
-    use { 'petertriho/nvim-scrollbar', config = [[ require("scrollbar").setup() ]] }
+        use 'jghauser/mkdir.nvim'
+        use { 'simrat39/symbols-outline.nvim', config = [[ require("config.symbols-outline") ]]  }
+        use { 'petertriho/nvim-scrollbar', config = [[ require("scrollbar").setup() ]] }
 
-    use {
-        'nvim-telescope/telescope.nvim',
-        branch = '0.1.x',
-        config = [[ require("config.telescope") ]]
-    }
-    use 'nvim-telescope/telescope-file-browser.nvim'
-
-    use {
-        'rmagatti/auto-session',
-        config = function()
-            require("auto-session").setup {
-                log_level = "error",
-                auto_session_suppress_dirs = { "~/", "~/Downloads", "/", os.getenv("HOME")},
-            }
-        end
-    }
-
-    use {
-        'sso://googler@user/piloto/cmp-nvim-ciderlsp',
-        'sso://googler@user/kdark/ciderlsp-nvim',
-        'sso://googler@user/vintharas/telescope-codesearch.nvim',
-        'sso://googler@user/aktau/telescope-citc.nvim',
-        'sso://googler@user/tylersaunders/telescope-fig.nvim',
-
-        disable = not use_google(),
-    }
-
-    use {
-        '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',
-        disable = not use_google(),
-        requires = {'rcarriga/nvim-notify', 'nvim-lua/plenary.nvim'},
-        config = [[ require("config.google-comments") ]]
-    }
-
-    use {
-        '/google/src/cloud/cnieves/google-comments/google3/experimental/users/cnieves/neovim/critique',
-        disable = not use_google(),
-        config = [[ require("critique").setup() ]]
-    }
-
-    use 'nvim-lua/lsp-status.nvim'
-    use {
-        'nvim-lualine/lualine.nvim',
-        config = [[ require("config.lualine") ]]
-    }
-    use {
-        'rcarriga/nvim-notify',
-        config = [[ require("config.notify") ]]
-    }
-
-    -- Git
-    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()]]
+        use {
+            'nvim-telescope/telescope.nvim',
+            branch = '0.1.x',
+            config = [[ require("config.telescope") ]]
         }
-    }
+        use 'nvim-telescope/telescope-file-browser.nvim'
 
-    -- use { "catppuccin/nvim", as = "catppuccin" }
-    use { "catppuccin/nvim", as = "catppuccin", config = [[require("config.catppuccin")]]}
-    -- Tmux
-    use {
-        'preservim/vimux',
-        'tmux-plugins/vim-tmux',
-        'christoomey/vim-tmux-navigator',
-        'whatyouhide/vim-tmux-syntax',
-        'tmux-plugins/vim-tmux-focus-events',
-        'skywind3000/asyncrun.vim',
-    }
+        use {
+            'rmagatti/auto-session',
+            config = function()
+                require("auto-session").setup {
+                    log_level = "error",
+                    auto_session_suppress_dirs = { "~/", "~/Downloads", "/", os.getenv("HOME")},
+                }
+            end
+        }
 
-    -- mine
-    use {
-        'squk/java-syntax.vim', ft='java'
-    }
+        use {
+            'sso://googler@user/piloto/cmp-nvim-ciderlsp',
+            'sso://googler@user/kdark/ciderlsp-nvim',
+            'sso://googler@user/vintharas/telescope-codesearch.nvim',
+            'sso://googler@user/aktau/telescope-citc.nvim',
+            'sso://googler@user/tylersaunders/telescope-fig.nvim',
 
-    use {
-        "folke/which-key.nvim",
-        config = [[require("config.whichkey")]]
-    }
+            cond = use_google(),
+        }
 
-    use 'ntpeters/vim-better-whitespace'
-    use 'junegunn/fzf.vim'
-    use { 'junegunn/fzf', run = ":call fzf#install()" }
+        use {
+            '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',
+            cond = use_google(),
+            requires = {'rcarriga/nvim-notify', 'nvim-lua/plenary.nvim'},
+            config = [[ require("config.google-comments") ]]
+        }
 
-    vim.opt.rtp:append(os.getenv("HOME") .. "/.fzf")
+        use {
+            '/google/src/cloud/cnieves/google-comments/google3/experimental/users/cnieves/neovim/critique',
+            cond = use_google(),
+            config = [[ require("critique").setup() ]]
+        }
 
-    use 'nathanaelkane/vim-indent-guides'
-    use 'tversteeg/registers.nvim'
+        use {
+            "ipod825/libp.nvim",
+            config = function()
+                require("libp").setup()
+            end,
+        }
+        use {
+            "sso://googler@user/jackcogdill/nvim-figtree",
+            cond = use_google(),
+        }
+        use {
+            "sso://googler@user/smwang/hg.nvim",
+            requires =  { "ipod825/libp.nvim" },
+            config = function()
+                require("config.fig")
+                require("hg").setup()
+            end,
+            cond = use_google(),
+        }
 
-    use 'jremmen/vim-ripgrep'
+        use 'nvim-lua/lsp-status.nvim'
+        use {
+            'nvim-lualine/lualine.nvim',
+            config = [[ require("config.lualine") ]]
+        }
+        use {
+            'rcarriga/nvim-notify',
+            config = [[ require("config.notify") ]]
+        }
 
-    use 'preservim/nerdtree'
-    use 'tiagofumo/vim-nerdtree-syntax-highlight'
+        -- Git
+        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()]]
+            }
+        }
 
-    use { 'udalov/kotlin-vim', ft='kotin' }
+        -- use { "catppuccin/nvim", as = "catppuccin" }
+        use { "catppuccin/nvim", as = "catppuccin", config = [[require("config.catppuccin")]]}
+        -- Tmux
+        use {
+            'preservim/vimux',
+            'tmux-plugins/vim-tmux',
+            'christoomey/vim-tmux-navigator',
+            'whatyouhide/vim-tmux-syntax',
+            'tmux-plugins/vim-tmux-focus-events',
+            'skywind3000/asyncrun.vim',
+        }
 
-    use {
-        'wesQ3/vim-windowswap',
-        setup = [[ vim.g.windowswap_map_keys = 0 ]]
-    }
+        -- mine
+        use {
+            'squk/java-syntax.vim', ft='java'
+        }
 
-    use 'tpope/vim-surround'
-    use 'scrooloose/nerdcommenter'
-    use 'mhinz/vim-signify'
-    use { 'j-hui/fidget.nvim', config = [[require("fidget").setup()]] }
-    use({ "iamcco/markdown-preview.nvim", run = "cd app && npm install", setup = function() vim.g.mkdp_filetypes = { "markdown" } end, ft = { "markdown" }, })
+        use {
+            "folke/which-key.nvim",
+            config = [[require("config.whichkey")]]
+        }
+
+        use 'ntpeters/vim-better-whitespace'
+        use 'junegunn/fzf.vim'
+        use { 'junegunn/fzf', run = ":call fzf#install()" }
+
+        vim.opt.rtp:append(os.getenv("HOME") .. "/.fzf")
+
+        use 'nathanaelkane/vim-indent-guides'
+        use 'tversteeg/registers.nvim'
+
+        use 'jremmen/vim-ripgrep'
+
+        use 'preservim/nerdtree'
+        use 'tiagofumo/vim-nerdtree-syntax-highlight'
+
+        use { 'udalov/kotlin-vim', ft='kotin' }
+
+        use {
+            'wesQ3/vim-windowswap',
+            setup = [[ vim.g.windowswap_map_keys = 0 ]]
+        }
+
+        use 'tpope/vim-surround'
+        use 'scrooloose/nerdcommenter'
+        use 'mhinz/vim-signify'
+        use { 'j-hui/fidget.nvim', config = [[require("fidget").setup()]] }
+        use({ "iamcco/markdown-preview.nvim", run = "cd app && npm install", setup = function() vim.g.mkdp_filetypes = { "markdown" } end, ft = { "markdown" }, })
 
 
-    -- Automatically set up your configuration after cloning packer.nvim
-    -- Put this at the end after all plugins
-    if packer_bootstrap then
-        require('packer').sync()
-    end
-end)
+        -- Automatically set up your configuration after cloning packer.nvim
+        -- Put this at the end after all plugins
+        if packer_bootstrap then
+            require('packer').sync()
+        end
+    end)
 
--- CiderLSP
-vim.opt.completeopt = { "menu", "menuone", "noselect" }
--- Don't show the dumb matching stuff
-vim.opt.shortmess:append("c")
+    -- 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' }
+    vim.opt.spell = true
+    vim.opt.spelllang = { 'en_us' }

vim/.vimrc

@@ -73,6 +73,7 @@ let g:clipboard = #{
       \   cache_enabled: 1,
       \ }
 set shortmess=A
+set shortmess+=O
 set modifiable
 set omnifunc= completeopt=menuone,noinsert,noselect