stuff

2022-11-30 16:43:48 +00:00
parent 27b63b8a41
commit 8eb418bd82
8 changed files with 59 additions and 41 deletions
--- a/config/.config/nvim/plugin/packer_compiled.lua
+++ b/config/.config/nvim/plugin/packer_compiled.lua
@ -197,7 +197,7 @@ _G.packer_plugins = {
    needs_bufread = false,
    only_cond = true,
    path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/opt/google-comments",
-    url = "/google/src/cloud/cnieves/google-comments/google3/experimental/users/chmnchiang/neovim/google-comments"
+    url = "sso://googler@user/chmnchiang/google-comments"
  },
  ["java-syntax.vim"] = {
    loaded = true,
@ -382,6 +382,11 @@ _G.packer_plugins = {
    path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/vim-ripgrep",
    url = "https://github.com/jremmen/vim-ripgrep"
  },
+  ["vim-searchindex"] = {
+    loaded = true,
+    path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/vim-searchindex",
+    url = "https://github.com/google/vim-searchindex"
+  },
  ["vim-signify"] = {
    loaded = true,
    path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/vim-signify",
@ -435,49 +440,49 @@ _G.packer_plugins = {
 }

 time([[Defining packer_plugins]], false)
-- Config for: auto-session
-time([[Config for auto-session]], true)
-try_loadstring("\27LJ\2\n<EFBFBD>\1\0\0\4\0\6\0\t6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0005\3\4\0=\3\5\2B\0\2\1K\0\1\0\31auto_session_suppress_dirs\1\4\0\0\a~/\16~/Downloads\6/\1\0\1\14log_level\nerror\nsetup\17auto-session\frequire\0", "config", "auto-session")
-time([[Config for auto-session]], false)
-- Config for: lsp_lines.nvim
-time([[Config for lsp_lines.nvim]], true)
-require("lsp_lines").setup()
-time([[Config for lsp_lines.nvim]], false)
 -- Config for: nvim-notify
 time([[Config for nvim-notify]], true)
 require("notify_config") 
 time([[Config for nvim-notify]], false)
-- Config for: catppuccin
-time([[Config for catppuccin]], true)
-require("catppuccin-config")
-time([[Config for catppuccin]], false)
-- Config for: lualine.nvim
-time([[Config for lualine.nvim]], true)
- require("lualine_config") 
-time([[Config for lualine.nvim]], false)
-- Config for: git-conflict.nvim
-time([[Config for git-conflict.nvim]], true)
-require('git-conflict').setup()
-time([[Config for git-conflict.nvim]], false)
-- Config for: nvim-scrollbar
-time([[Config for nvim-scrollbar]], true)
-require("scrollbar").setup()
-time([[Config for nvim-scrollbar]], false)
-- Config for: fidget.nvim
-time([[Config for fidget.nvim]], true)
-require("fidget").setup()
-time([[Config for fidget.nvim]], false)
 -- Config for: critique
 time([[Config for critique]], true)
 require("critique").setup() 
 time([[Config for critique]], false)
+-- Config for: fidget.nvim
+time([[Config for fidget.nvim]], true)
+require("fidget").setup()
+time([[Config for fidget.nvim]], false)
+-- Config for: lualine.nvim
+time([[Config for lualine.nvim]], true)
+ require("lualine_config") 
+time([[Config for lualine.nvim]], false)
+-- Config for: nvim-scrollbar
+time([[Config for nvim-scrollbar]], true)
+require("scrollbar").setup()
+time([[Config for nvim-scrollbar]], false)
+-- Config for: lsp_lines.nvim
+time([[Config for lsp_lines.nvim]], true)
+require("lsp_lines").setup()
+time([[Config for lsp_lines.nvim]], false)
+-- Config for: git-conflict.nvim
+time([[Config for git-conflict.nvim]], true)
+require('git-conflict').setup()
+time([[Config for git-conflict.nvim]], false)
+-- Config for: auto-session
+time([[Config for auto-session]], true)
+try_loadstring("\27LJ\2\n<EFBFBD>\1\0\0\4\0\6\0\t6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0005\3\4\0=\3\5\2B\0\2\1K\0\1\0\31auto_session_suppress_dirs\1\4\0\0\a~/\16~/Downloads\6/\1\0\1\14log_level\nerror\nsetup\17auto-session\frequire\0", "config", "auto-session")
+time([[Config for auto-session]], false)
+-- Config for: catppuccin
+time([[Config for catppuccin]], true)
+require("catppuccin-config")
+time([[Config for catppuccin]], false)
 -- Conditional loads
-time([[Conditional loading of telescope-codesearch.nvim]], true)
-  require("packer.load")({"telescope-codesearch.nvim"}, {}, _G.packer_plugins)
-time([[Conditional loading of telescope-codesearch.nvim]], false)
 time([[Conditional loading of google-comments]], true)
  require("packer.load")({"google-comments"}, {}, _G.packer_plugins)
 time([[Conditional loading of google-comments]], false)
+time([[Conditional loading of telescope-codesearch.nvim]], true)
+  require("packer.load")({"telescope-codesearch.nvim"}, {}, _G.packer_plugins)
+time([[Conditional loading of telescope-codesearch.nvim]], false)
 -- Load plugins in order defined by `after`
 time([[Sequenced loading]], true)
 vim.cmd [[ packadd LuaSnip ]]
@ -486,8 +491,8 @@ time([[Sequenced loading]], false)

 -- Command lazy-loads
 time([[Defining lazy-load commands]], true)
-pcall(vim.cmd, [[command -nargs=* -range -bang -complete=file UndotreeToggle lua require("packer.load")({'undotree'}, { cmd = "UndotreeToggle", l1 = <line1>, l2 = <line2>, bang = <q-bang>, args = <q-args>, mods = "<mods>" }, _G.packer_plugins)]])
 pcall(vim.cmd, [[command -nargs=* -range -bang -complete=file Neogit lua require("packer.load")({'neogit'}, { cmd = "Neogit", l1 = <line1>, l2 = <line2>, bang = <q-bang>, args = <q-args>, mods = "<mods>" }, _G.packer_plugins)]])
+pcall(vim.cmd, [[command -nargs=* -range -bang -complete=file UndotreeToggle lua require("packer.load")({'undotree'}, { cmd = "UndotreeToggle", l1 = <line1>, l2 = <line2>, bang = <q-bang>, args = <q-args>, mods = "<mods>" }, _G.packer_plugins)]])
 time([[Defining lazy-load commands]], false)

 vim.cmd [[augroup packer_load_aucmds]]
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@ -1,4 +1,5 @@
 unbind C-b
+set-option -g update-environment "SSH_ASKPASS SSH_AUTH_SOCK SSH_AGENT_PID SSH_CONNECTION WINDOWID XAUTHORITY"

 set -g prefix C-a
 bind C-a send-prefix
--- a/vim/.vim/lua/google_comments.lua
+++ b/vim/.vim/lua/google_comments.lua
@ -5,7 +5,8 @@ require('google.comments').setup {
    -- command = {'/google/bin/releases/editor-devtools/get_comments.par', '--full', '--json', "-x=''"},
    stubby = true,
    --
-    command = {'/google/bin/releases/editor-devtools/get_comments.par', '--json', '--full', '--resolved', '--cl_comments', '--file_comments'},
+    command = {'/google/bin/releases/editor-devtools/get_comments.par', '--json', '--full', '--noresolved', '--cl_comments', '--file_comments'},
+    -- /google/bin/releases/editor-devtools/get_comments.par --json --full --noresolved --cl_comments --file_comments  -x "" --cl 487267122
    -- command = {'stubby --output_json call blade:codereview-rpc CodereviewRpcService.GetComments "changelist_number: $(/google/data/ro/teams/fig/bin/vcstool pending-change-number)"'},
    -- Define your own icon by `vim.fn.sign_define('ICON_NAME', {text = ' '})`.
    -- See :help sign_define
--- a/vim/.vim/lua/lsp.lua
+++ b/vim/.vim/lua/lsp.lua
@ -4,7 +4,7 @@ local configs = require("lspconfig.configs")
 local notify = require 'notify'
 configs.ciderlsp = {
    default_config = {
-        cmd = { "/google/bin/releases/cider/ciderlsp/ciderlsp", "--tooltag=nvim-cmp", "--forward_sync_responses", "--enable_semantic_tokens", "--relay_mode=true", "--hub_addr=blade:languageservices-staging" ,"--enable_document_highlight"},
+        cmd = { "/google/bin/releases/cider/ciderlsp/ciderlsp", "--tooltag=nvim-cmp", "--forward_sync_responses" },
        -- cmd = {'/google/bin/releases/cider/ciderlsp/ciderlsp', '--forward_sync_responses', '--enable_document_highlight'};
        filetypes = { "c", "cpp", "java", "kotlin", "objc", "proto", "textproto", "go", "python", "bzl" },
        root_dir = lspconfig.util.root_pattern("BUILD"),
--- a/vim/.vim/lua/plugins.lua
+++ b/vim/.vim/lua/plugins.lua
@ -30,6 +30,8 @@ require('packer').startup(function(use)

    use 'nvim-lua/plenary.nvim'

+    use 'google/vim-searchindex'
+
    -- Pretty symbols
    use 'kyazdani42/nvim-web-devicons'

@ -89,9 +91,9 @@ require('packer').startup(function(use)
    }

    use {
-        -- 'sso://googler@user/chmnchiang/google-comments',
+        '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',
+        -- '/google/src/cloud/cnieves/google-comments/google3/experimental/users/chmnchiang/neovim/google-comments',
        cond = file_exists(os.getenv("HOME").."/use_google"),
        requires = {'rcarriga/nvim-notify', 'nvim-lua/plenary.nvim'},
        config = [[ require("google_comments") ]]
--- a/zsh/.aliases.sh
+++ b/zsh/.aliases.sh
@ -133,8 +133,15 @@ to_mac(){
 }

 bdoctor() {
-    hourly=$(builddoctor analyze --blueprint //depot/google3/java/com/google/android/gmscore/tools/build_doctor/build_doctor.blueprint --cl $1 --analysis_type=PERIODIC --analysis_name=hourly --buildable_unit_type BUILD --buildable_unit gmscore.build_doctor.debug_container | grep http)
    default=$(builddoctor analyze --blueprint //depot/google3/java/com/google/android/gmscore/tools/build_doctor/build_doctor.blueprint --cl $1 --analysis_type=PERIODIC --buildable_unit_type BUILD --buildable_unit gmscore.build_doctor.debug_container | grep http)
-    echo "DEFAULT: $default"
-    echo "HOURLY: $hourly"
+    hourly=$(builddoctor analyze --blueprint //depot/google3/java/com/google/android/gmscore/tools/build_doctor/build_doctor.blueprint --cl $1 --analysis_type=PERIODIC --analysis_name=hourly --buildable_unit_type BUILD --buildable_unit gmscore.build_doctor.debug_container | grep http)
+    echo "DEFAULT(ANALYSIS): $default"
+    echo "HOURLY(EXECUTION): $hourly"
+}
+
+bdoctor_modules() {
+    default=$(builddoctor analyze --blueprint //depot/google3/java/com/google/android/gmscore/tools/build_doctor/build_doctor.blueprint --cl $1 --analysis_type=PERIODIC --buildable_unit_type BUILD --buildable_unit gmscore.build_doctor.large.chimera.modules | grep http)
+    hourly=$(builddoctor analyze --blueprint //depot/google3/java/com/google/android/gmscore/tools/build_doctor/build_doctor.blueprint --cl $1 --analysis_type=PERIODIC --analysis_name=hourly --buildable_unit_type BUILD --buildable_unit gmscore.build_doctor.large.chimera.modules | grep http)
+    echo "DEFAULT(ANALYSIS): $default"
+    echo "HOURLY(EXECUTION): $hourly"
 }
--- a/zsh/.bash_profile
+++ b/zsh/.bash_profile
@ -18,8 +18,8 @@ export NVM_DIR="$HOME/.nvm"
 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
 [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion

+source ~/.aliases.sh

 if [[ -f "$HOME/use_google" ]]; then
    source $HOME/.bash_profile.google
 fi
-source ~/.aliases.sh
--- a/zsh/.bash_profile.google
+++ b/zsh/.bash_profile.google
@ -65,6 +65,8 @@ alias vim="source $HGSHORT_DIR/tobashargs.sh nvim"
 source /etc/bash_completion.d/hgd
 alias hgd='source /google/src/head/depot/google3/experimental/fig_contrib/hgshort/hgd-local.sh'
 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

 export ACID_STARTUP_SCRIPT_PATH=~/acid_startup.sh
 export PATH=$PATH:/usr/local/google/home/cnieves/.local/binexport PATH=$PATH:/usr/local/google/home/cnieves/.local/bin