From 76ebaa0210eb5a5cf0dbec06e37fd657fbc84359 Mon Sep 17 00:00:00 2001
From: Christian Nieves <cnieves@google.com>
Date: Tue, 26 Sep 2023 20:26:24 +0000
Subject: [PATCH] bleh

---
 tmux/.tmux.conf                 |  9 ++++-----
 tmux/.tmuxinator/dev.yml        |  9 ++++++---
 vim/.vim/lua/plugins/google.lua | 36 +++++++++++----------------------
 zsh/.bash_profile.google        |  1 +
 4 files changed, 23 insertions(+), 32 deletions(-)

diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index a494c1c..4a556a7 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -69,17 +69,16 @@ set -s set-clipboard on
 setw -g mode-keys vi
 
 # Setup 'v' to begin selection as in Vim
-bind-key -Tcopy-mode-vi 'v' send -X begin-selection
+bind-key -T copy-mode-vi 'v' send -X begin-selection
 
-# bind-key -T copy-mode-vi y send-keys -X copy-pipe 'yank > #{pane_tty}'
 # transfer copied text to attached terminal with yank
-bind-key -T copy-mode-vi Y send-keys -X copy-pipe 'yank > #{pane_tty}'
+bind-key -T copy-mode-vi Y send-keys -X copy-pipe 'tmux save-buffer - | yank > #{pane_tty}'
 
 # transfer most-recently copied text to attached terminal with yank
-bind-key -n M-y run-shell 'tmux save-buffer - | yank > #{pane_tty}'
+# bind-key -n M-y run-shell 'tmux save-buffer - | yank > #{pane_tty}'
 
 # transfer previously copied text (chosen from a menu) to attached terminal
-bind-key -n M-Y choose-buffer 'run-shell "tmux save-buffer -b \"%%%\" - | yank > #{pane_tty}"'
+# bind-key -n M-Y choose-buffer 'run-shell "tmux save-buffer -b \"%%%\" - | yank > #{pane_tty}"'
 
 # allowd pane-navigation while in copy-mode
 bind-key -T copy-mode-vi C-h select-pane -L
diff --git a/tmux/.tmuxinator/dev.yml b/tmux/.tmuxinator/dev.yml
index 8a232f1..09dc3bd 100644
--- a/tmux/.tmuxinator/dev.yml
+++ b/tmux/.tmuxinator/dev.yml
@@ -20,11 +20,14 @@ windows:
         - other:
           - hgd experiments
 
-  - notes:
+  - critique:
+      layout: main-horizontal
       panes:
         - main:
-          - cd ~/zettelkasten
-          - vim ~/zettelkasten/Todo.md
+          - hgd google-comments
+          - vim
+        - other:
+          - hgd google-comments
 
   - dotfiles:
       layout: main-horizontal
diff --git a/vim/.vim/lua/plugins/google.lua b/vim/.vim/lua/plugins/google.lua
index 13a5f89..725b8bb 100644
--- a/vim/.vim/lua/plugins/google.lua
+++ b/vim/.vim/lua/plugins/google.lua
@@ -129,45 +129,33 @@ return {
 		dependencies = { "nvim-telescope/telescope.nvim" },
 	},
 	{
-		name = "google_comments",
-		-- url = "sso://googler@user/chmnchiang/google-comments",
-		dir = "/google/src/cloud/cnieves/google-comments/google3/experimental/users/chmnchiang/neovim/google-comments/",
+		name = "critique_nvim",
+		dir = "/google/src/cloud/cnieves/google-comments/google3/experimental/users/cnieves/neovim/critique-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:
-			require("google.comments").setup({
-				-- command = {'/google/bin/releases/editor-devtools/get_comments.par', '--full', '--json', "-x=''"},
-				stubby = true,
-				command = {
-					'stubby --output_json call blade:codereview-rpc CodereviewRpcService.GetComments "changelist_number: $(/google/data/ro/teams/fig/bin/vcstool pending-change-number)"',
-				},
-				sign = "COMMENT_ICON",
+			require("critique.comments").setup({
+				-- sign = "COMMENT_ICON",
 				-- Fetch the comments after calling `setup`.
 				auto_fetch = true,
-				display = {
-					-- The width of the comment display window.
-					width = 50,
-					-- When showing file paths, use relative paths or not.
-					relative_path = true,
-				},
+				render_resolved_threads = true,
 			})
 			local map = require("utils").map
 			-- here are some mappings you might want:
-			map("n", "]c", [[<Cmd>GoogleCommentsGotoNextComment<CR>]])
-			map("n", "[c", [[<Cmd>GoogleCommentsGotoPrevComment<CR>]])
+			map("n", "]c", [[<Cmd>CritiqueGotoNextComment<CR>]])
+			map("n", "[c", [[<Cmd>CritiqueGotoPrevComment<CR>]])
 
-			map("n", "<Leader>lc", [[<Cmd>GoogleCommentsToggleLineComments<CR>]])
-			map("n", "<Leader>ac", [[<Cmd>GoogleCommentsToggleAllComments<CR>]])
-			map("n", "<Leader>fc", [[<Cmd>GoogleCommentsFetchComments<CR>]])
-			map("n", "<Leader>tc", [[<Cmd>GoogleCommentsTelescope<CR>]])
+			map("n", "<Leader>lc", [[<Cmd>CritiqueToggleLineComments<CR>]])
+			map("n", "<Leader>ac", [[<Cmd>CritiqueToggleAllComments<CR>]])
+			map("n", "<Leader>fc", [[<Cmd>CritiqueFetchComments<CR>]])
+			map("n", "<Leader>tc", [[<Cmd>CritiqueCommentsTelescope<CR>]])
 
-			vim.fn.sign_define("COMMENT_ICON", { text = "" })
+			-- vim.fn.sign_define("COMMENT_ICON", { text = "" })
 		end,
 	},
 	{
diff --git a/zsh/.bash_profile.google b/zsh/.bash_profile.google
index a528bb3..d7c78a4 100644
--- a/zsh/.bash_profile.google
+++ b/zsh/.bash_profile.google
@@ -199,3 +199,4 @@ bdoctor_modules() {
     echo "HOURLY(EXECUTION): $hourly"
 }
 alias bisect=/google/data/ro/teams/tetralight/bin/bisect
+alias copybara='/google/bin/releases/copybara/public/copybara/copybara'