diff --git a/config/.config/nvim/lua/lsp.lua b/config/.config/nvim/lua/lsp.lua index 03d1fbe..96214c2 100644 --- a/config/.config/nvim/lua/lsp.lua +++ b/config/.config/nvim/lua/lsp.lua @@ -30,6 +30,7 @@ cmp.setup({ [""] = cmp.mapping.close(), [""] = cmp.mapping(cmp.mapping.complete(), { "i", "c" }), [""] = cmp.mapping.confirm({ select = true }), + [""] = cmp.mapping.confirm({ select = true }), [""] = cmp.mapping(function(fallback) if cmp.visible() then cmp.select_next_item() diff --git a/config/.config/nvim/lua/telescope_config.lua b/config/.config/nvim/lua/telescope_config.lua index 29abd95..b108471 100644 --- a/config/.config/nvim/lua/telescope_config.lua +++ b/config/.config/nvim/lua/telescope_config.lua @@ -74,20 +74,10 @@ vim.api.nvim_set_keymap('v', 'sd', { noremap = true, silent=true } ) - - - -vim.api.nvim_set_keymap( - "n", - "cs", - [[lua require('telescope').extensions.codesearch.find_files{}]], - { noremap = true, silent = true } -) - -- Search using codesearch queries. vim.api.nvim_set_keymap( "n", - "csd", + "cs", [[lua require('telescope').extensions.codesearch.find_query{}]], { noremap = true, silent = true } ) @@ -111,7 +101,7 @@ vim.api.nvim_set_keymap( -- Search for text selected in Visual mode. vim.api.nvim_set_keymap( "v", - "csd", + "cs", [[lua require('telescope').extensions.codesearch.find_query{}]], { noremap = true, silent = true } ) diff --git a/fzf/fzf-at-google.zsh b/fzf/fzf-at-google.zsh index cf0fb3a..523cd8a 100644 --- a/fzf/fzf-at-google.zsh +++ b/fzf/fzf-at-google.zsh @@ -233,7 +233,7 @@ awk -v match_prefix=${match_prefix} ' { for (i = 1; i <= NF; i++) { } -# CTRL-Q - Paste the selected flags into the command line. Copied from CTRL-T +# CTRL-F - Paste the selected flags into the command line. Copied from CTRL-T # bindings shown here: # https://github.com/junegunn/fzf/blob/master/shell/key-bindings.zsh __flagsel() { @@ -270,4 +270,4 @@ fzf-flag-widget() { return $ret } zle -N fzf-flag-widget -bindkey '^Q' fzf-flag-widget +bindkey '^F' fzf-flag-widget diff --git a/vim/.vim/prefs/google_comments.vim b/vim/.vim/prefs/google_comments.vim index a438632..2924ccd 100644 --- a/vim/.vim/prefs/google_comments.vim +++ b/vim/.vim/prefs/google_comments.vim @@ -3,8 +3,8 @@ lua << EOF require('google.comments').setup { -- The command for fetching comments, refer to `get_comments.par --help` to -- see all the options. - -- command = {'/google/bin/releases/editor-devtools/get_comments.par', '--full', '--noresolved', '--json', "-x=''"}, - command = {'/google/bin/releases/editor-devtools/get_comments.par', '--nofull', '-u', '--json', "-x=''"}, + -- command = {'/google/bin/releases/editor-devtools/get_comments.par', '--nofull', '-u', '--json', "-x=''"}, + command = {'/google/bin/releases/editor-devtools/get_comments.par', '--nofull', '--json', '--noresolved', '--cl_comments', '--file_comments', '--unreplied_only'}, -- Define your own icon by `vim.fn.sign_define('ICON_NAME', {text = ' '})`. -- See :help sign_define -- The sign property passed to setup should be the 'ICON_NAME' in the define @@ -37,4 +37,3 @@ vim.fn.sign_define('COMMENT_ICON', {text = ''}) EOF autocmd InsertLeave * :lua require('google.comments').update_signs() -autocmd FileType * :lua require('google.comments').fetch_comments() diff --git a/vim/.vimrc b/vim/.vimrc index fadaf39..f6a7588 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -65,12 +65,12 @@ set foldmethod=syntax let g:clipboard = #{ \ name: 'xsel', \ copy: { - \ '+': ['xsel', '--nodetach', '-i', '-b'], - \ '*': ['xsel', '--nodetach', '-i', '-p'], + \ '+': ['xclip', '--nodetach', '-i', '-b'], + \ '*': ['xclip', '--nodetach', '-i', '-p'], \ }, \ paste: { - \ '+': ['xsel', '-o', '-b'], - \ '*': ['xsel', '-o', '-p'], + \ '+': ['xclip', '-o', '-b'], + \ '*': ['xclip', '-o', '-p'], \ }, \ cache_enabled: 1, \ } @@ -100,6 +100,7 @@ call plug#end() " required " IMPORTANT: Must come after plugins are loaded lua << EOF -- CiderLSP + vim.lsp.set_log_level("trace") vim.opt.completeopt = { "menu", "menuone", "noselect" } require 'lspconfig' @@ -154,3 +155,6 @@ colorscheme quantum let g:airline_theme='quantum' set modifiable set omnifunc= completeopt=menuone,noinsert,noselect + +let g:lsp_log_verbose = 1 +let g:lsp_log_file = expand('~/vim-lsp.log') diff --git a/zsh/.aliases.sh b/zsh/.aliases.sh index 26fac20..ff35b24 100644 --- a/zsh/.aliases.sh +++ b/zsh/.aliases.sh @@ -119,3 +119,4 @@ alias jadep=/google/data/ro/teams/jade/jadep alias replace_string=/google/src/head/depot/google3/devtools/scripts/replace_string alias safergcp=/google/bin/releases/safer-gcp/tools/safergcp alias add_deps_to_usages='/google/src/head/depot/google3/apps/framework/tools/add_deps_to_usages.sh' +alias plxutil='/google/data/ro/teams/plx/plxutil' diff --git a/zsh/.zshrc b/zsh/.zshrc index a689e42..e51aaa3 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -248,3 +248,19 @@ source ~/zsh-async/async.zsh export FZF_DEFAULT_OPTS="--preview 'echo {}' --preview-window down:3:wrap --bind ?:toggle-preview" [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh + +fixup_ssh_auth_sock() { + if [[ -n ${SSH_AUTH_SOCK} && ! -e ${SSH_AUTH_SOCK} ]] + then + local new_sock=$(echo /tmp/ssh-*/agent.*(=UNom[1])) + if [[ -n ${new_sock} ]] + then + export SSH_AUTH_SOCK=${new_sock} + fi + fi +} +if [[ -n ${SSH_AUTH_SOCK} ]] +then + autoload -U add-zsh-hook + add-zsh-hook preexec fixup_ssh_auth_sock +fi diff --git a/zsh/g3path.zsh b/zsh/g3path.zsh index 88b2985..4977ae6 100644 --- a/zsh/g3path.zsh +++ b/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) ]]; then + if [[ -n $GOOGLE3_ROOT && ! $BUFFER =~ \\s*(blaze|g4|p4|g4d|add_dep|buildozer|build_cleaner|debug_android_lint|rabbit|hb|gqui) ]]; then BUFFER=${BUFFER// \/\// $GOOGLE3_ROOT\/} fi zle .accept-line