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,12 +108,12 @@ require('packer').startup(function(use)
     }
     use 'apalmer1377/factorus'
 
-    use {
+    -- use {
-        'mfussenegger/nvim-dap',
+        --     'mfussenegger/nvim-dap',
-        'mfussenegger/nvim-jdtls',
+        --     'mfussenegger/nvim-jdtls',
-        ft = {'java','kotlin'},
+        --     ft = {'java','kotlin'},
-        config = [[ require("config.dap")]],
+        --     config = [[ require("config.dap")]],
-    }
+        -- }
 
         use 'hrsh7th/vim-vsnip'
         use 'kosayoda/nvim-lightbulb'
@@ -147,24 +147,44 @@ require('packer').startup(function(use)
             'sso://googler@user/aktau/telescope-citc.nvim',
             'sso://googler@user/tylersaunders/telescope-fig.nvim',
 
-        disable = not use_google(),
+            cond = 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(),
+            cond = 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(),
+            cond = use_google(),
             config = [[ require("critique").setup() ]]
         }
 
+        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 'nvim-lua/lsp-status.nvim'
         use {
             'nvim-lualine/lualine.nvim',
@@ -246,12 +266,12 @@ require('packer').startup(function(use)
         if packer_bootstrap then
             require('packer').sync()
         end
-end)
+    end)
 
--- CiderLSP
+    -- CiderLSP
-vim.opt.completeopt = { "menu", "menuone", "noselect" }
+    vim.opt.completeopt = { "menu", "menuone", "noselect" }
--- Don't show the dumb matching stuff
+    -- Don't show the dumb matching stuff
-vim.opt.shortmess:append("c")
+    vim.opt.shortmess:append("c")
 
-vim.opt.spell = true
+    vim.opt.spell = true
-vim.opt.spelllang = { 'en_us' }
+    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