Plugins

config/.config/nvim/lazy-lock.json

@@ -71,6 +71,7 @@
   "refactoring.nvim": { "branch": "master", "commit": "2ec9bc0fb5f3c8c6a0f776f0159dd2a3b1663554" },
   "registers.nvim": { "branch": "main", "commit": "f7f7b8a55de10293e2af6002d4da98cbeffc6333" },
   "rust-tools.nvim": { "branch": "master", "commit": "0cc8adab23117783a0292a0c8a2fbed1005dc645" },
+  "scss-syntax.vim": { "branch": "master", "commit": "bda22a93d1dcfcb8ee13be1988560d9bb5bd0fef" },
   "telekasten.nvim": { "branch": "main", "commit": "bd5d323581f24ee124b33688287e6a22244c6f2a" },
   "telescope.nvim": { "branch": "master", "commit": "a19770625aed49ad2a9f591a5e3946707f7359f6" },
   "telescope_citc": { "branch": "main", "commit": "d6421d5bfe058915ece0daec55e488f8ea05f207" },

tmux/.tmux.conf

@@ -30,17 +30,14 @@ set -g pane-base-index 1
 set-option -g base-index 1
 set-window-option -g pane-base-index 1
 
-# enable OSC 52 clipboard
-# set -as terminal-overrides ',tmux*:Ms=\\E]52;%p1%s;%p2%s\\007'
-# set -as terminal-overrides ',screen*:Ms=\\E]52;%p1%s;%p2%s\\007'
 set -g @thumbs-osc52 '1'
 
 # tmux-256color instead of screen-256color enables italics
 set -g default-terminal "tmux-256color"
 
 # Tc enables true color
-# set -ag terminal-overrides ",*256col*:colors=256:Tc"
-# set -as terminal-features ',rxvt-unicode-256color:clipboard'
+set -ag terminal-overrides ",*256col*:colors=256:Tc"
+set -as terminal-features ',rxvt-unicode-256color:clipboard'
 # set -g default-shell zsh
 
 # force a reload of the config file
@@ -137,6 +134,11 @@ set -g @plugin 'tmux-plugins/tmux-cpu'
 set -g @plugin 'tmux-plugins/tmux-battery'
 set -g @plugin 'tmux-plugins/tmux-cowboy' # Kill process in pane w/ prefix+*
 set -g @plugin 'catppuccin/tmux'
+set -g @plugin 'tmux-plugins/tmux-resurrect'
+set -g @plugin 'tmux-plugins/tmux-continuum'
+
+set -g @continuum-restore 'on'
+
 #set -g @plugin 'odedlaz/tmux-onedark-theme'
 
 set -g @catppuccin_flavour 'macchiato' # or frappe, macchiato, mocha

vim/.vim/lua/config/google.lua

@@ -88,6 +88,7 @@ augroup autoformat_settings
   autocmd FileType proto AutoFormatBuffer protofmt
   autocmd FileType sql AutoFormatBuffer format_sql
   autocmd FileType kotlin AutoFormatBuffer ktfmt
+  autocmd FileType soy AutoFormatBuffer soyfmt
   " autocmd FileType html,css,json AutoFormatBuffer js-beautify
 augroup END
 
@@ -130,6 +131,6 @@ endfunction
 com! -nargs=? -complete=file Blame :call G4Blame(<f-args>)
 
 nnoremap <leader>cc :CritiqueUnresolvedComments<space><cr>
-nmap <leader>yb :let @+ = join(blaze#GetTargets(), ' ')<cr>
+nmap <leader>yb :let t = join(blaze#GetTargets(), ' ') \| echo t \| let @+ = t \| let @* = t<cr>
 ]])
 end

vim/.vim/lua/plugins/base.lua

@@ -7,6 +7,7 @@ return {
 		lazy = false,
 	},
 	"ldelossa/litee.nvim",
+	"cakebaker/scss-syntax.vim",
 	"ldelossa/litee-calltree.nvim",
 	"jghauser/mkdir.nvim",
 	"will133/vim-dirdiff",

vim/.vim/lua/plugins/google.lua

@@ -31,8 +31,12 @@ return {
 	goog("googlepaths"),
 	goog("google-filetypes"),
 	goog("ft-java"),
+	goog("ft-soy"),
+	goog("ft-gss"),
+	goog("ft-javascript"),
 	goog("ft-kotlin"),
 	goog("ft-proto"),
+	goog("google-logo"),
 	goog("critique"),
 	goog("piper"),
 	goog("gtimporter"),

vim/.vim/lua/plugins/neoscopes.lua

@@ -4,10 +4,10 @@ return {
 		require("neoscopes").setup({
 			scopes = {
 				{
-					name = "apkdiff",
+					name = "earlycheckin",
 					dirs = {
-						"java/com/google/android/gmscore/tools/earlycheckin/apkdiff",
-						"javatests/com/google/android/gmscore/tools/earlycheckin/apkdiff",
+						"java/com/google/android/gmscore/tools/earlycheckin/",
+						"javatests/com/google/android/gmscore/tools/earlycheckin/",
 					},
 				},
 				{ name = "experimental", dirs = { "experimental/users/cnieves" } },

zsh/.bash_profile.google

@@ -74,6 +74,7 @@ alias builddoctor=/google/bin/releases/build-doctor/builddoctor
 alias rudi=/google/data/ro/teams/lsc/bin/rudi-cli
 alias rudi-cli=/google/data/ro/teams/lsc/bin/rudi-cli
 alias tmux=tmx2
+alias graphviz=/google/data/ro/projects/graphviz-server/graphviz
 compdef tmx2=tmux
 
 export ACID_STARTUP_SCRIPT_PATH=~/acid_startup.sh

zsh/g3path.zsh

@@ -13,7 +13,7 @@ autoload -Uz add-zsh-hook
 add-zsh-hook chpwd g3path::hook
 
 g3path::zle::accept-line () {
-  if [[ -n $GOOGLE3_ROOT && ! $BUFFER =~ \\s*(blaze|g4|p4|g4d|add_dep|buildozer|build_cleaner|debug_android_lint|rabbit|hb|gqui|builddoctor|unused_deps|clipper|blaze_lint_refactoring) ]]; then
+  if [[ -n $GOOGLE3_ROOT && ! $BUFFER =~ \\s*(blaze|g4|p4|g4d|add_dep|buildozer|build_cleaner|debug_android_lint|rabbit|hb|gqui|builddoctor|unused_deps|clipper|blaze_lint_refactoring|migrants_sh.sar) ]]; then
     BUFFER=${BUFFER// \/\// $GOOGLE3_ROOT\/}
   fi
   zle .accept-line