christian/dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

allthethings

Browse Source
This commit is contained in:
Christian Nieves
2023-08-17 20:23:08 +00:00
parent 3d73b4fed7
commit de5d5c3271
12 changed files with 110 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
vim/.vim/lua/config/google.lua
View File

@ -130,9 +130,6 @@ endfunction
com! -nargs=? -complete=file Blame :call G4Blame(<f-args>)
nnoremap <leader>cc :CritiqueUnresolvedComments<space><cr>
nmap <leader>rbs ss <leader>rb
nmap <leader>yb :let @+ = join(blaze#GetTargets(), ' ')<cr>
]])
end

2
vim/.vim/lua/plugins/cmp.lua
View File

@ -85,7 +85,7 @@ return {
mapping = cmp.mapping.preset.cmdline(),
sources = cmp.config.sources({
{ name = "async_path", priority = 9 },
{ name = "treesitter", priority = 7 },
-- { name = "treesitter", priority = 7 },
{ name = "cmdline", priority = 8 },
}),
})

17
vim/.vim/lua/plugins/floaterm.lua Normal file
View File

@ -0,0 +1,17 @@
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" },
}
if use_google() then
TableConcat(keys, {
-- { "<leader>br", ":FloatermSend blaze run blaze#GetTargets()<CR>" },
})
end
return {
"voldikss/vim-floaterm",
keys = keys,
}

42
vim/.vim/lua/plugins/formatter.lua
View File

@ -44,27 +44,27 @@ return {
html = {
require("formatter.defaults").prettier,
},
xml = {
function()
return {
exe = "tidy",
args = {
"-quiet",
"-xml",
"--wrap yes",
"--indent yes",
"--indent-spaces 2",
"--indent-attributes yes",
"--sort-attributes alpha",
"--wrap-attributes yes",
"--vertical-space yes",
"--tidy-mark no",
},
stdin = true,
try_node_modules = true,
}
end,
},
-- xml = {
-- function()
-- return {
-- exe = "tidy",
-- args = {
-- "-quiet",
-- "-xml",
-- "--wrap yes",
-- "--indent yes",
-- "--indent-spaces 2",
-- "--indent-attributes yes",
-- "--sort-attributes alpha",
-- "--wrap-attributes yes",
-- "--vertical-space yes",
-- "--tidy-mark no",
-- },
-- stdin = true,
-- try_node_modules = true,
-- }
-- end,
-- },
-- java = {
-- function()
-- return {

4
vim/.vim/lua/plugins/google.lua
View File

@ -86,7 +86,7 @@ return {
"flwyd/vim-imp",
dependencies = { "imp-google" },
keys = {
{ "<leader>ii", ":ImpSuggest <C-r><C-w><cr>" },
{ "<leader>i", ":ImpSuggest <C-r><C-w><cr>" },
},
},
{
@ -132,7 +132,7 @@ 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 = { "rcarriga/nvim-notify", "nvim-lua/plenary.nvim" },
dependencies = { "rktjmp/time-ago.vim", "rcarriga/nvim-notify", "nvim-lua/plenary.nvim" },
config = function()
-- Here are all the options and their default values:
require("google.comments").setup({

13
vim/.vim/lua/plugins/lsp.lua
View File

@ -125,9 +125,14 @@ return {
local my_on_attach = function(client, bufnr)
require("lualine").refresh()
vim.api.nvim_command("autocmd CursorHold <buffer> lua vim.lsp.buf.document_highlight()")
vim.api.nvim_command("autocmd CursorHoldI <buffer> lua vim.lsp.buf.document_highlight()")
vim.api.nvim_command("autocmd CursorMoved <buffer> lua vim.lsp.util.buf_clear_references()")
-- vim.api.nvim_command("augroup LSP")
-- vim.api.nvim_command("autocmd!")
-- if client.server_capabilities.documentFormattingProvider then
-- vim.api.nvim_command("autocmd CursorHold <buffer> lua vim.lsp.buf.document_highlight()")
-- vim.api.nvim_command("autocmd CursorHoldI <buffer> lua vim.lsp.buf.document_highlight()")
-- vim.api.nvim_command("autocmd CursorMoved <buffer> lua vim.lsp.util.buf_clear_references()")
-- end
-- vim.api.nvim_command("augroup END")
vim.api.nvim_buf_set_option(bufnr, "omnifunc", "v:lua.vim.lsp.omnifunc")
if vim.lsp.formatexpr then -- Neovim v0.6.0+ only.
@ -163,7 +168,7 @@ return {
end
end
require("cmp_nvim_ciderlsp").setup({
multiline_summary_symbol = "…",
-- multiline_summary_symbol = "…",
})
capabilities = require("cmp_nvim_ciderlsp").update_capabilities(capabilities)
capabilities.workspace.codeLens = { refreshSupport = true }

4
vim/.vim/lua/plugins/lsp_lines.lua
View File

@ -7,12 +7,12 @@ return {
virtual_lines = { only_current_line = true },
-- virtual_lines = true,
update_in_insert = true,
update_in_insert = false,
virtual_text = false,
})
require("lsp_lines").setup()
require("lsp_lines").toggle()
-- require("lsp_lines").toggle()
end,
keys = {
{

23
vim/.vim/lua/plugins/neoscopes.lua Normal file
View File

@ -0,0 +1,23 @@
return {
"smartpde/neoscopes",
config = function()
require("neoscopes").setup({
scopes = {
{
name = "apkdiff",
dirs = {
"java/com/google/android/gmscore/tools/earlycheckin/apkdiff",
"javatests/com/google/android/gmscore/tools/earlycheckin/apkdiff",
},
},
{ name = "experimental", dirs = { "experimental/users/cnieves" } },
},
-- add_dirs_to_all_scopes = {
-- "~/dotfiles",
-- },
})
local scopes = require("neoscopes")
scopes.add_startup_scope()
end,
}

24
vim/.vim/lua/plugins/telescope.lua
View File

@ -1,11 +1,29 @@
local use_google = require("utils").use_google
local TableConcat = require("utils").TableConcat
local scopes = require("neoscopes")
scopes.add_startup_scope()
-- Helper functions to fetch the current scope and set `search_dirs`
_G.find_files = function()
require("telescope.builtin").find_files({
search_dirs = scopes.get_current_dirs(),
})
end
_G.live_grep = function()
require("telescope.builtin").live_grep({
search_dirs = scopes.get_current_dirs(),
})
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>th", ":lua require('telescope.builtin').help_tags{}<CR>", desc = "[T]elescope [H]elp" },
{ "<leader>t*", ":lua require('telescope.builtin').grep_string{}<CR>", desc = "[T]elescope current [W]ord" },
{ "<leader>tf", ":lua require('telescope.builtin').live_grep{}<CR>", desc = "[T]elescope by [G]rep" },
{ "<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>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" },
}
if use_google() then

4
vim/.vim/prefs/leader.vim
View File

@ -52,6 +52,8 @@ nmap <leader>e :e %%
" without yanking it
vnoremap <leader>p "_dP
nnoremap <leader>rp :VimuxOpenRunner<cr> :VimuxRunCommand '!!'<cr> :call VimuxSendKeys("Enter")<cr>
nnoremap <leader>rp :lua vim.notify("use <leader><leader>")
nnoremap <leader><leader> :VimuxOpenRunner<cr> :VimuxRunCommand '!!'<cr> :call VimuxSendKeys("Enter")<cr>
nnoremap <leader>s :SessionSave<CR>

12
vim/.vimrc
View File

@ -141,12 +141,12 @@ let g:loaded_remote_plugins = 1
" Permanent "very magic" mode
nnoremap / /\v
vnoremap / /\v
cnoremap %s/ %smagic/
cnoremap \>s/ \>smagic/
nnoremap :g/ :g/\v
nnoremap :g// :g//
" nnoremap / /\v
" vnoremap / /\v
" cnoremap %s/ %smagic/
" cnoremap \>s/ \>smagic/
" nnoremap :g/ :g/\v
" nnoremap :g// :g//
function! TabMultiDiff()
let s:tab_multi_diff = 0