stuff

2023-09-13 16:31:09 +00:00
parent 59b507b658
commit 31f07ddc5e
14 changed files with 77 additions and 46 deletions
--- a/config/.config/nvim/lazy-lock.json
+++ b/config/.config/nvim/lazy-lock.json
@ -3,10 +3,10 @@
  "aerial.nvim": { "branch": "master", "commit": "fb1f08c9f90e8b0c04b2f2c5d95d06288a14c5b2" },
  "ai.nvim": { "branch": "main", "commit": "604713b1a223a6ca9e04a4d0dbbd4b0670c46fd1" },
  "asyncrun.vim": { "branch": "master", "commit": "42385d54b8546c163b946fd50eed2103ef7993c9" },
-  "auto-session": { "branch": "main", "commit": "f6d111f3c7ff2fb89c8a39b6280c8f90234196d9" },
+  "auto-session": { "branch": "main", "commit": "3eb26b949e1b90798e84926848551046e2eb0721" },
  "bufferline.nvim": { "branch": "main", "commit": "d24378edc14a675c820a303b4512af3bbc5761e9" },
  "calendar-vim": { "branch": "master", "commit": "a7e73e02c92566bf427b2a1d6a61a8f23542cc21" },
-  "catppuccin": { "branch": "main", "commit": "b573866ef64122119668f375ebb794bcb3b518e2" },
+  "catppuccin": { "branch": "main", "commit": "85e93601e0f0b48aa2c6bbfae4d0e9d7a1898280" },
  "ciderlsp-nvim": { "branch": "main", "commit": "45ee3634c6d4224c6981825da5bde39804addc71" },
  "cmp-async-path": { "branch": "main", "commit": "d8229a93d7b71f22c66ca35ac9e6c6cd850ec61d" },
  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
@ -25,66 +25,68 @@
  "conflict-marker.vim": { "branch": "master", "commit": "11a4d42244755505b66b15cd4496a150432eb5e3" },
  "crates.nvim": { "branch": "main", "commit": "1dffccc0a95f656ebe00cacb4de282473430c5a1" },
  "formatter.nvim": { "branch": "master", "commit": "44c89f09dcc220dc2a9b056e93c3a87c86e79804" },
-  "friendly-snippets": { "branch": "main", "commit": "377d45475b49e37460a902d6d569d2093d4037d0" },
-  "fzf": { "branch": "master", "commit": "11e56403dda81b2226c138606f02fd49a31a6cf4" },
-  "fzf.vim": { "branch": "master", "commit": "811f34b70b60b4df2997e3ba8cd109e7d06d683b" },
+  "friendly-snippets": { "branch": "main", "commit": "ebf6d6e83494cdd88a54a429340256f4dbb6a052" },
+  "fzf": { "branch": "master", "commit": "eb4bbf32948303e326a2791c6a875f32d7b5c97f" },
+  "fzf.vim": { "branch": "master", "commit": "587f55bf5051ff40600837778ea01ead6283f399" },
  "git-conflict.nvim": { "branch": "main", "commit": "f83d81e706d7ebfb914457ea72eee159e0e16fae" },
-  "gitsigns.nvim": { "branch": "main", "commit": "749267aaa863c30d721c9913699c5d94e0c07dd3" },
-  "go.nvim": { "branch": "master", "commit": "a370cb932749d071a6bca20211533044c262e66d" },
+  "gitsigns.nvim": { "branch": "main", "commit": "907ae8636016aab2f283576fc60d46ca3427e579" },
+  "go.nvim": { "branch": "master", "commit": "5e9e083f4927402eab6ab233e970b397daa2e826" },
  "guihua.lua": { "branch": "master", "commit": "5ad8dba19ce9b9fd8965598984dfdc9c119f97e4" },
  "hg": { "branch": "main", "commit": "1c4bdf80174ec840ba76c4dc7032c4313db62199" },
  "java-syntax.vim": { "branch": "master", "commit": "9a3d76a8c6cd7765ba93a7bdd9280594167e3f1b" },
  "kotlin-vim": { "branch": "master", "commit": "53fe045906df8eeb07cb77b078fc93acda6c90b8" },
-  "lazy.nvim": { "branch": "main", "commit": "dac844ed617dda4f9ec85eb88e9629ad2add5e05" },
+  "lazy.nvim": { "branch": "main", "commit": "2a9354c7d2368d78cbd5575a51a2af5bd8a6ad01" },
  "leap.nvim": { "branch": "main", "commit": "5efe985cf68fac3b6a6dfe7a75fbfaca8db2af9c" },
  "libp.nvim": { "branch": "main", "commit": "636b1748e92f66022c1763f32b2ded6b8606eda5" },
+  "litee-calltree.nvim": { "branch": "main", "commit": "e2dffec35740032258fee3a3c7f30123226f2271" },
+  "litee.nvim": { "branch": "main", "commit": "bf366a1414fd0f9401631ac8884f2f9fa4bf18d2" },
  "lsp-lens.nvim": { "branch": "main", "commit": "13d25ad8bd55aa34cc0aa3082e78a4157c401346" },
  "lsp-status.nvim": { "branch": "master", "commit": "54f48eb5017632d81d0fd40112065f1d062d0629" },
-  "lsp-zero.nvim": { "branch": "v2.x", "commit": "4a2125e8848950c65b5e12f98e2d13e3390ed7ae" },
+  "lsp-zero.nvim": { "branch": "v2.x", "commit": "73b6ab549f3f374b2917227bfec5c27f2caf1b82" },
  "lsp_lines.nvim": { "branch": "main", "commit": "f53af96d4789eef39a082dbcce078d2bfc384ece" },
  "lspkind.nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" },
  "lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" },
  "luasnip-google.nvim": { "branch": "main", "commit": "5fd7feb144de0ecea837618c9c9e1bbecc0e3243" },
  "markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "2997f467881ac4faa6f8c5e7065e3a672297c8ad" },
-  "mason.nvim": { "branch": "main", "commit": "a51c2d063c5377ee9e58c5f9cda7c7436787be72" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "01b4b6724ebcf5b43fc021486f6a260f1d09311e" },
+  "mason.nvim": { "branch": "main", "commit": "d66c60e17dd6fd8165194b1d14d21f7eb2c1697a" },
  "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" },
  "neo-tree.nvim": { "branch": "v2.x", "commit": "80dc74d081823649809f78370fa5b204aa9a853a" },
  "neoscopes": { "branch": "main", "commit": "88ca15efcc20b267789d74ca483cc8bac85b3083" },
  "nerdcommenter": { "branch": "master", "commit": "d2e21d417f6c788b11ae3b90d7ac478930dead36" },
-  "nui.nvim": { "branch": "main", "commit": "9e3916e784660f55f47daa6f26053ad044db5d6a" },
-  "nvim-cmp": { "branch": "main", "commit": "51f1e11a89ec701221877532ee1a23557d291dd5" },
+  "nui.nvim": { "branch": "main", "commit": "c8de23342caf8d50b15d6b28368d36a56a69d76f" },
+  "nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" },
  "nvim-cmp-buffer-lines": { "branch": "master", "commit": "2036e6fbb40c770eb82f1940a0ce0b2988f8ef32" },
  "nvim-lightbulb": { "branch": "master", "commit": "8f00b89dd1b1dbde16872bee5fbcee2e58c9b8e9" },
-  "nvim-lint": { "branch": "master", "commit": "8864e99d560bbb7eefcdab21c105be91161af0ba" },
-  "nvim-lspconfig": { "branch": "master", "commit": "1cfb96490c3889a2c57d1ef5e1acc59e9b47c455" },
-  "nvim-notify": { "branch": "master", "commit": "ea9c8ce7a37f2238f934e087c255758659948e0f" },
+  "nvim-lint": { "branch": "master", "commit": "73682da41b74c9c35f33b1b2dbd0cc02cc59452f" },
+  "nvim-lspconfig": { "branch": "master", "commit": "360a895125ac4f39df6aa8f763635eff07e69fff" },
+  "nvim-notify": { "branch": "master", "commit": "94859430020f5cf32a1b97ddd9e596fed9db7981" },
  "nvim-osc52": { "branch": "main", "commit": "3e96035d62290183fe7a11418db2b254fcfcaee3" },
  "nvim-scrollbar": { "branch": "main", "commit": "35f99d559041c7c0eff3a41f9093581ceea534e8" },
  "nvim-surround": { "branch": "main", "commit": "0d6882635817a2677749a330127d12ac30a4f3c8" },
-  "nvim-treesitter": { "branch": "master", "commit": "9ea7559ea99701c900b08c1f977eca6ca57eadd2" },
-  "nvim-web-devicons": { "branch": "master", "commit": "cfc8824cc1db316a276b36517f093baccb8e799a" },
-  "nvim_figtree": { "branch": "main", "commit": "13a627633d224b157843405371113b4c1259793f" },
-  "plenary.nvim": { "branch": "master", "commit": "267282a9ce242bbb0c5dc31445b6d353bed978bb" },
-  "refactoring.nvim": { "branch": "master", "commit": "b1cc851bcb4e3c624abbe2a725237eef6bea765c" },
-  "registers.nvim": { "branch": "main", "commit": "2ab8372bb837f05fae6b43091f10a0b725d113ca" },
+  "nvim-treesitter": { "branch": "master", "commit": "9567185621e532a9e29a671c66a11011334b80ea" },
+  "nvim-web-devicons": { "branch": "master", "commit": "925e2aa30dc9fe9332060199c19f132ec0f3d493" },
+  "nvim_figtree": { "branch": "main", "commit": "b6dc477fa79e55c1b436b2893582134803ec22f3" },
+  "plenary.nvim": { "branch": "master", "commit": "9ce85b0f7dcfe5358c0be937ad23e456907d410b" },
+  "refactoring.nvim": { "branch": "master", "commit": "2ec9bc0fb5f3c8c6a0f776f0159dd2a3b1663554" },
+  "registers.nvim": { "branch": "main", "commit": "f7f7b8a55de10293e2af6002d4da98cbeffc6333" },
  "rust-tools.nvim": { "branch": "master", "commit": "0cc8adab23117783a0292a0c8a2fbed1005dc645" },
-  "telekasten.nvim": { "branch": "main", "commit": "584783fdbdd13bb691a435f86ed10a3717fa9e9a" },
-  "telescope.nvim": { "branch": "master", "commit": "2d92125620417fbea82ec30303823e3cd69e90e8" },
+  "telekasten.nvim": { "branch": "main", "commit": "bd5d323581f24ee124b33688287e6a22244c6f2a" },
+  "telescope.nvim": { "branch": "master", "commit": "a19770625aed49ad2a9f591a5e3946707f7359f6" },
  "telescope_citc": { "branch": "main", "commit": "d6421d5bfe058915ece0daec55e488f8ea05f207" },
  "telescope_codesearch": { "branch": "main", "commit": "a26077ad3c68cf897ae1c31da903d6516ebb9c92" },
  "telescope_fig": { "branch": "main", "commit": "f6122fe82417ebeaddb9343cfd5584f62a4b8df8" },
  "time-ago.vim": { "branch": "master", "commit": "be978d5c790cfcc41f524205f28783b9937fd0ee" },
-  "trouble.nvim": { "branch": "main", "commit": "40aad004f53ae1d1ba91bcc5c29d59f07c5f01d3" },
+  "trouble.nvim": { "branch": "main", "commit": "3f85d8ed30e97ceeddbbcf80224245d347053711" },
  "undotree": { "branch": "master", "commit": "0e11ba7325efbbb3f3bebe06213afa3e7ec75131" },
  "vcscommand.vim": { "branch": "master", "commit": "2fb32681361f37533455d20aaa7fc6eb11b0fa4b" },
  "vim-bazel": { "branch": "master", "commit": "31b0d5e4f51da1aeb56d65bf505a744e6de405de" },
  "vim-better-whitespace": { "branch": "master", "commit": "1b22dc57a2751c7afbc6025a7da39b7c22db635d" },
  "vim-dirdiff": { "branch": "master", "commit": "84bc8999fde4b3c2d8b228b560278ab30c7ea4c9" },
-  "vim-floaterm": { "branch": "master", "commit": "bcaeabf89a92a924031d471395054d84bd88ce2f" },
+  "vim-floaterm": { "branch": "master", "commit": "eeb3f6b5c98bde26752ebe0fbe1359fc974cbdcd" },
  "vim-imp": { "branch": "main", "commit": "394e926ce62010443731f3923031e5afa1279f3e" },
  "vim-maktaba": { "branch": "master", "commit": "fe95bb10f6bb250943a44632107f6a3d76ce5f28" },
-  "vim-matchup": { "branch": "master", "commit": "582cbc8c2dc311deb7a03f7d505d52544c36d4b6" },
+  "vim-matchup": { "branch": "master", "commit": "6dbe108230c7dbbf00555b7d4d9f6a891837ef07" },
  "vim-ripgrep": { "branch": "master", "commit": "2bb2425387b449a0cd65a54ceb85e123d7a320b8" },
  "vim-searchindex": { "branch": "master", "commit": "b0788c8213210b3bd23b62847dd5a9ebbe4ad648" },
  "vim-signify": { "branch": "master", "commit": "7d538b77a5a8806e344b057f8846f6d0c035efa9" },
--- a/google/.hgrc
+++ b/google/.hgrc
@ -65,6 +65,9 @@ mdiff = ! HG_ROOT=$(hg root) hg _real_multidiff "$@"
 mdiffp4 = ! HG_ROOT=$(hg root) hg _real_multidiff --rev p4base "$@"
 mdiffup = ! HG_ROOT=$(hg root) hg _real_multidiff --rev .^ "$@"

+depotpath = !realpath -m $@ | sed s#`hg root`#//depot#
+filelog = !p4 filelog `$HG depotpath $@`
+
 [trainingwheels]
 warn-head-paths=False
 prevent-push-dirty=false
--- a/vim/.vim/lua/config/google.lua
+++ b/vim/.vim/lua/config/google.lua
@ -112,7 +112,7 @@ function! G4Blame(...)
  " Get the output, split it on newline and keep empty lines, skip the first 2
  " lines because they're headers we don't need, and put it in starting on line
  " 1 of the left pane
-  call setline(1, split(system('g4 blame ' . file), '\n', 1)[2:])
+  call setline(1, split(system('hg blame ' . file), '\n', 1)[2:])
  " Lock scrolling in left pane, turn off word wrap, set the buffer as
  " not-modified, remove any listchars highlighting (common in google code), set
  " it readonly (to make modifications slightly more annoying).
--- a/vim/.vim/lua/plugins/base.lua
+++ b/vim/.vim/lua/plugins/base.lua
@ -6,6 +6,8 @@ return {
 		"nvim-tree/nvim-web-devicons",
 		lazy = false,
 	},
+	"ldelossa/litee.nvim",
+	"ldelossa/litee-calltree.nvim",
 	"jghauser/mkdir.nvim",
 	"will133/vim-dirdiff",
 	"renerocksai/calendar-vim",
--- a/vim/.vim/lua/plugins/floaterm.lua
+++ b/vim/.vim/lua/plugins/floaterm.lua
@ -1,8 +1,8 @@
 local use_google = require("utils").use_google
 local TableConcat = require("utils").TableConcat
 local keys = {
-	{ "<leader>f", ":FloatermToggle<CR>" },
-	{ "<leader>f", "<C-\\><C-n>:FloatermToggle<CR>", mode = "t" },
+	-- { "<leader>f", ":FloatermToggle<CR>" },
+	-- { "<leader>f", "<C-\\><C-n>:FloatermToggle<CR>", mode = "t" },
 }

 if use_google() then
--- a/vim/.vim/lua/plugins/google.lua
+++ b/vim/.vim/lua/plugins/google.lua
@ -132,7 +132,12 @@ return {
 		name = "google_comments",
 		-- url = "sso://googler@user/chmnchiang/google-comments",
 		dir = "/google/src/cloud/cnieves/google-comments/google3/experimental/users/chmnchiang/neovim/google-comments/",
-		dependencies = { "rktjmp/time-ago.vim", "rcarriga/nvim-notify", "nvim-lua/plenary.nvim" },
+		dependencies = {
+			"rktjmp/time-ago.vim",
+			"rcarriga/nvim-notify",
+			"nvim-lua/plenary.nvim",
+			"nvim-telescope/telescope.nvim",
+		},
 		config = function()
 			-- vim.notify = require("notify")
 			-- Here are all the options and their default values:
--- a/vim/.vim/lua/plugins/lsp.lua
+++ b/vim/.vim/lua/plugins/lsp.lua
@ -7,12 +7,15 @@ return {
 			"nvim-lua/lsp-status.nvim",
 			"VonHeikemen/lsp-zero.nvim",
 			"rcarriga/nvim-notify",
+			"ldelossa/litee.nvim",
+			"ldelossa/litee-calltree.nvim",
 		},
 		keys = {
 			{ "<leader>rn", "<cmd>lua vim.lsp.buf.rename()<CR>" },
 			{ "<leader>ca", "<cmd>lua vim.lsp.buf.code_action()<CR>" },
 			{ "L", "<cmd>lua vim.lsp.buf.hover()<CR>" },
 			{ "g0", "<cmd>lua vim.lsp.buf.document_symbol()<CR>" },
+			{ "gr", "<Cmd>Telescope lsp_references<CR>" },
 			{ "gW", "<cmd>lua vim.lsp.buf.workspace_symbol()<CR>" },
 			{ "gd", "<cmd>lua vim.lsp.buf.definition()<CR>" },
 			{ "gD", "<cmd>tab split | lua vim.lsp.buf.definition()<CR>" },
@ -33,19 +36,11 @@ return {
 			local lsp_status = require("lsp-status")
 			lsp_status.register_progress()

+			require("litee.lib").setup({})
+			require("litee.calltree").setup({})
+
 			vim.opt.spell = true
 			vim.opt.spelllang = { "en_us" }
-			vim.lsp.handlers["window/showMessage"] = function(_, result, ctx)
-				local client = vim.lsp.get_client_by_id(ctx.client_id)
-				local lvl = ({ "ERROR", "WARN", "INFO", "DEBUG" })[result.type]
-				notify({ result.message }, lvl, {
-					title = "LSP | " .. client.name,
-					timeout = 1000,
-					keep = function()
-						return lvl == "ERROR" or lvl == "WARN"
-					end,
-				})
-			end

 			if use_google() then
 				configs.ciderlsp = {
@ -167,6 +162,18 @@ return {
 						require("lualine").refresh()
 					end
 				end
+				cider_lsp_handlers["window/showMessage"] = function(_, result, ctx)
+					local client = vim.lsp.get_client_by_id(ctx.client_id)
+					local lvl = ({ "ERROR", "WARN", "INFO", "DEBUG" })[result.type]
+					notify({ result.message }, lvl, {
+						title = "LSP | " .. client.name,
+						timeout = 1000,
+						keep = function()
+							return lvl == "ERROR" or lvl == "WARN"
+						end,
+					})
+				end
+
 				capabilities = require("cmp_nvim_ciderlsp").update_capabilities(capabilities)
 				capabilities.workspace.codeLens = { refreshSupport = true }
 				capabilities.workspace.diagnostics = { refreshSupport = true }
--- a/vim/.vim/lua/plugins/neotree.lua
+++ b/vim/.vim/lua/plugins/neotree.lua
@ -4,6 +4,11 @@ return {
 	config = function()
 		require("neo-tree").setup({
 			hijack_netrw_behavior = "open_current",
+			window = {
+				mappings = {
+					["O"] = "expand_all_nodes",
+				},
+			},
 		})
 	end,
 	dependencies = {
--- a/vim/.vim/lua/plugins/notify.lua
+++ b/vim/.vim/lua/plugins/notify.lua
@ -10,5 +10,6 @@ return {
 			stages = "slide", -- default fade_in_slide_out
 			timeout = 5000, -- default 5000
 		})
+		vim.notify = require("notify")
 	end,
 }
--- a/vim/.vim/lua/plugins/telescope.lua
+++ b/vim/.vim/lua/plugins/telescope.lua
@ -1,5 +1,6 @@
 local use_google = require("utils").use_google
 local TableConcat = require("utils").TableConcat
+local scopes = require("neoscopes")

 -- Helper functions to fetch the current scope and set `search_dirs`
 _G.find_files = function()
@ -15,9 +16,10 @@ end

 local keys = {
 	{ "<leader>ts", [[<cmd>lua require("neoscopes").select()<CR>]], desc = "NeoScopes" },
-	{ "<leader>tb", ":Telescope file_buffers<CR>", desc = "[T]elescope [B]uffers" },
 	{ "<leader>tf", ":lua find_files()<CR>", desc = "[T]elescope [F]ind Files" },
 	{ "<leader>tl", ":lua live_grep()<CR>", desc = "[T]elescope [L]ive Grep" },
+
+	{ "<leader>ff", ":Telescope current_buffer_fuzzy_find<CR>", desc = "[T]elescope [F]uzzy [F]ind" },
 	{ "<leader>tg", ":Telescope git_files<CR>", desc = "[T]elescope [G]it Files" },
 	{ "<leader>t*", ":lua require('telescope.builtin').grep_string{}<CR>", desc = "[T]elescope current [W]ord" },
 	{ "<leader>th", ":lua require('telescope.builtin').help_tags{}<CR>", desc = "[T]elescope [H]elp" },
--- a/vim/.vim/lua/plugins/trouble.lua
+++ b/vim/.vim/lua/plugins/trouble.lua
@ -16,7 +16,6 @@ return {
 		})
 	end,
 	keys = {
-		{ "gr", "<Cmd>Trouble lsp_references<CR>" },
 		{ "<Leader>xx", "<Cmd>Trouble<CR>" },
 		{ "<Leader>xw", "<Cmd>Trouble workspace_diagnostics<CR>" },
 		{ "<Leader>xd", "<Cmd>Trouble document_diagnostics<CR>" },
--- a/vim/.vim/prefs/mappings.vim
+++ b/vim/.vim/prefs/mappings.vim
@ -39,6 +39,8 @@ nnoremap <S-D> <C-D>
 nnoremap [e  :<c-u>execute 'move -1-'. v:count1<cr>
 nnoremap ]e  :<c-u>execute 'move +'. v:count1<cr>

+nnoremap <space><space> :w<CR>
+
 " Create window splits easier
 nnoremap <silent> vv <C-w>v
 nnoremap <silent> ss <C-w>s
@ -105,6 +107,6 @@ function! BreakHabitsWindow(message) abort
    call nvim_win_set_option(win, 'winhl', 'Normal:CustomFloatingWindow')
 endfunction

-" let windowHabitsKeys = [",tm"]
-" let windowHabitsMessage = ["USE < ,fw > INSTEAD", "BREAK BAD HABITS"]
+" let windowHabitsKeys = [":w<cr>"]
+" let windowHabitsMessage = ["USE < SPACE SPACE > INSTEAD", "BREAK BAD HABITS"]
 " call s:createHabitsMappings(windowHabitsKeys, windowHabitsMessage)
--- a/vim/.vimrc
+++ b/vim/.vimrc
@ -63,6 +63,7 @@ set scrolloff=3    " Minumum lines to keep above and below cursor
 set shortmess=A " disable swap
 set shortmess+=O
 set modifiable
+set noscrollbind

 set updatetime=100

--- a/zsh/.aliases.sh
+++ b/zsh/.aliases.sh
@ -46,3 +46,5 @@ swap_files () {
  mv -f -- "$2" "$1" &&
  mv -f -- "$tmp_name" "$2"
 }
+
+function zipdiff() { diff -W200 -y <(unzip -vql "$1" | sort -k8) <(unzip -vql "$2" | sort -k8); }