Compare commits

..

1 Commits

Author SHA1 Message Date
25e6ad92d6 comments 2024-12-11 17:13:19 +00:00
76 changed files with 1713 additions and 38397 deletions

View File

@ -1,6 +1,6 @@
[font] [font]
size = 14 size = 12
normal = { family = "CommitMono Nerd Font" } normal = { family = "ComicCodeLigatures Nerd Font Light" }
[window] [window]
option_as_alt = "OnlyLeft" option_as_alt = "OnlyLeft"
@ -13,37 +13,35 @@ decorations = "None"
[colors] [colors]
draw_bold_text_with_bright_colors = true draw_bold_text_with_bright_colors = true
# Default colors
[colors.primary]
background = '#1e2024'
foreground = '#a1a3a8'
# Normal colors
[colors.normal]
black = '#27272a'
blue = '#5e7fdd'
cyan = '#97c3fa'
green = '#90b99f'
magenta = '#e29eca'
red = '#d45d9e'
white = '#c9c7cd'
yellow = '#f0ea2d'
# Bright colors
[colors.bright] [colors.bright]
black = '#353539' black = "#949494"
blue = '#a7b3dd' blue = "#74b2ff"
cyan = '#6de6fc' cyan = "#85dc85"
green = '#a8fc8d' green = "#36c692"
magenta = '#eb4cce' magenta = "#ae81ff"
red = '#ca72de' red = "#ff5189"
white = '#c9c7cd' white = "#e4e4e4"
yellow = '#f7f48d' yellow = "#c6c684"
[colors.cursor] [colors.cursor]
cursor = "#8e8e8e" cursor = "#8e8e8e"
text = "#080808" text = "#080808"
[colors.normal]
black = "#323437"
blue = "#80a0ff"
cyan = "#79dac8"
green = "#8cc85f"
magenta = "#cf87e8"
red = "#ff5454"
white = "#c6c6c6"
yellow = "#e3c78a"
[colors.primary]
background = "#080808"
bright_foreground = "#eeeeee"
foreground = "#bdbdbd"
[colors.selection] [colors.selection]
background = "#b2ceee" background = "#b2ceee"
text = "#080808" text = "#080808"

View File

@ -1,9 +0,0 @@
<KeyPair>
<Properties>
<Provider Type="1" />
<Container Name="98f3a7e3-0d6e-f432-8a18-e1144b53633f" />
</Properties>
<KeyValue>
<RSAKeyValue><Modulus>l97jvAiPd88/KZ5NjMGFg+EaAC9rk50nPVJPlX+cGX6irHt+haXvMJ+b/Lh8JFtSw01cf+TJJwNmO0Hzdv0tF35CmXuOkeJAXVa0JNoGLaXxtdqO2ZxD8Lt8OYj/ueAX/zKiWmet3DP4gT1qTXn/mON+hFB6sZ2f2MLwadm7joCTPPsxZxAluxjk+XGajBFKRp3/u8CYRu5C98K7QUU0RwSBiccFUrUytqBz4Dsn8a1YakwcApmCl+sJF7RW6obf</Modulus><Exponent>AQAB</Exponent><P>sJS6yQDEMEdlmtWW8mPx7ZEEu/Zn8ahkJoAas7AToNNUaunZv+PpDS9K0dQO6sPOG/Dvwgm9AtHYrswUIRI0ts84PNvvt4yJfDXVUOFgnCuv6v71yhbxlRkbWGdBeyB3</P><Q>3C0NJwOEZ1yE8piwHm1n3fEaB5tRBYFyEZ309OjBPmbUiaq1Cx/lV2LzEFrQ0RSNpWhijBk8nObwzoBDi1gkFmen9i5STX5nHQiwUnuCZfhShxOvL/yMD7R8qZ/fRo7Z</Q><DP>hciZX7KR8ZYWV+HdVFX+tKP7t0Dv7bpL7pN+J4eOx3l1au80B9tv9YpQIHuOtbWWEbtQm21vY5SDm6OI2KmHgL2s+QcVLrZub8oFjRrEbG35AY0bwXnynKkB+893YAbv</DP><DQ>ctw5yUmHcBiO7rQC5My0a88UgjVfbhzaciBSItWtwi0I4Yyhh90q2oyvOq/10a0EO+8ZwfaEbWH46/FzyyS/JsUKlV4S54RyrG3U9iKioymJfBgjw0fflW3VvvO9GeT5</DQ><InverseQ>U0UtjaLfCsBcJcSLlZWX9Ziovt9iFjF8JnpN+lk2C8Uz4I4y62xMZmazEf5G/liEsL1SKNFdSWfRyZdzS7e6/tcNhc72bfSCldXRB2mrwfl2YRw3bVdSMoKUBqdpWVs6</InverseQ><D>KttNLLzFr6ueSWJQxA3AXaziJ3c6RleswRM/PhLavB8OTNo0pAZlbzU7UZ/F+ISE4HQuTDEFyqqc6M/9onBjjyOkK6fAXc6ZFz3mbBfScoNHqGfas/HzAjYGIj5U2+EutHDAUhFmfGiiZ1DmwrFcyI5X9Q5foPwXw+uDOUXVU1TtnSzJanvZEaPB90Bvc179gEIXJr26Dbl7ZGGQTGtOUBsFEnMGMh5/tcby8d5PWcFJr1iYDKG1N93xEYrlo7Th</D></RSAKeyValue>
</KeyValue>
</KeyPair>

View File

@ -1,4 +0,0 @@
<LocationServerMappings>
<ServerMapping location="https://app.vssps.visualstudio.com/" guid="a5ca35eb-148e-4ccd-bbb3-d31576d75958" owner="951917ac-a960-4999-8464-e3f0aa25b381" />
<ServerMapping location="https://api.vstsusers.visualstudio.com/" guid="2dba3f49-86e9-f22a-b81f-b604f401cfbe" owner="00000038-0000-8888-8000-000000000000" />
</LocationServerMappings>

View File

@ -1,11 +0,0 @@
[Filechooser Settings]
LocationMode=path-bar
ShowHidden=false
ShowSizeColumn=true
GeometryX=540
GeometryY=351
GeometryWidth=720
GeometryHeight=540
SortColumn=name
SortOrder=ascending
StartupMode=recent

View File

@ -3,4 +3,4 @@ set nowrap
set tabstop=4 set tabstop=4
set softtabstop=4 set softtabstop=4
set shiftwidth=4 set shiftwidth=4
set expandtab set noexpandtab

View File

@ -1,7 +1,3 @@
set tabstop=2 set tabstop=2
set shiftwidth=2
set softtabstop=2 set softtabstop=2
set expandtab set shiftwidth=2
set textwidth=80
set colorcolumn=80

View File

@ -1,6 +1,6 @@
vim.cmd("source " .. vim.env.HOME .. "/.vimrc") vim.cmd("source " .. vim.fn.expand("$HOME") .. "/.vimrc")
vim.g.maplocalleader = "," local use_google = require("utils").use_google
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
if not vim.loop.fs_stat(lazypath) then if not vim.loop.fs_stat(lazypath) then
vim.fn.system({ vim.fn.system({
@ -12,19 +12,15 @@ if not vim.loop.fs_stat(lazypath) then
}) })
end end
vim.opt.rtp:prepend(lazypath) vim.opt.rtp:prepend(lazypath)
vim.opt.rtp:prepend(vim.env.HOME .. "/.vim")
local luahome = vim.env.HOME .. "/.vim/lua"
vim.opt.rtp:prepend(luahome)
package.path = package.path .. ";" .. vim.env.HOME .. "/.vim/lua/?.lua" package.path = package.path .. ";" .. vim.env.HOME .. "/.vim/lua/?.lua"
for _, file in ipairs(vim.fn.readdir(luahome .. "/config", [[v:val =~ '\.lua$']])) do local plugins = {
require("config" .. "." .. file:gsub("%.lua$", ""))
end
require("lazy").setup({
-- this entry tells lazy.nvim to load the list of of *.lua files from plugins/ -- this entry tells lazy.nvim to load the list of of *.lua files from plugins/
import = "plugins", { import = "plugins" },
}) }
require("lazy").setup(plugins)
require("config.clipboard")
require("config.zip")
vim.opt.undodir = vim.fn.expand("$HOME") .. "/.undo/" vim.opt.undodir = vim.fn.expand("$HOME") .. "/.undo/"

View File

@ -1,3 +1,120 @@
{ {
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" } "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
"LuaSnip": { "branch": "master", "commit": "ce0a05ab4e2839e1c48d072c5236cce846a387bc" },
"actions-preview.nvim": { "branch": "master", "commit": "9f52a01c374318e91337697ebed51c6fae57f8a4" },
"aerial.nvim": { "branch": "master", "commit": "fd7fbe36772d7a955815c90ff9b58523bfdb410d" },
"asyncrun.vim": { "branch": "master", "commit": "78dc9277f2b989553861ee7c35b640112d95e1b5" },
"auto-session": { "branch": "main", "commit": "021b64ed7d4ac68a37be3ad28d8e1cba5bec582c" },
"bigfile.nvim": { "branch": "main", "commit": "33eb067e3d7029ac77e081cfe7c45361887a311a" },
"bufferline.nvim": { "branch": "main", "commit": "5726c4e291224181903e960119a11e20ac677a0a" },
"cmp-async-path": { "branch": "main", "commit": "9d581eec5acf812316913565c135b0d1ee2c9a71" },
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
"cmp-calc": { "branch": "main", "commit": "5947b412da67306c5b68698a02a846760059be2e" },
"cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
"cmp-cmdline-history": { "branch": "master", "commit": "003573b72d4635ce636234a826fa8c4ba2895ffe" },
"cmp-emoji": { "branch": "main", "commit": "e8398e2adf512a03bb4e1728ca017ffeac670a9f" },
"cmp-nerdfont": { "branch": "main", "commit": "e97482344ebed29093015a18c155057adf5c842b" },
"cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
"cmp-nvim-lsp-document-symbol": { "branch": "main", "commit": "f94f7ba948e32cd302caba1c2ca3f7c697fb4fcf" },
"cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
"cmp-spell": { "branch": "master", "commit": "694a4e50809d6d645c1ea29015dad0c293f019d6" },
"cmp-treesitter": { "branch": "master", "commit": "958fcfa0d8ce46d215e19cc3992c542f576c4123" },
"cmp-under-comparator": { "branch": "master", "commit": "6857f10272c3cfe930cece2afa2406e1385bfef8" },
"cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
"codeium.nvim": { "branch": "main", "commit": "27d2b1ce8c7ba14dbf6e4504bdea8e5548be5476" },
"conflict-marker.vim": { "branch": "master", "commit": "62742b2ffe7a433988759c67b5c5a22eff74a14b" },
"conform.nvim": { "branch": "master", "commit": "02fd64fb3d4b18ec029c0e0683c3dc3ec6d2c5b8" },
"crates.nvim": { "branch": "main", "commit": "8bf8358ee326d5d8c11dcd7ac0bcc9ff97dbc785" },
"dashboard-nvim": { "branch": "master", "commit": "ae309606940d26d8c9df8b048a6e136b6bbec478" },
"debugprint.nvim": { "branch": "main", "commit": "74c01be25b8251f30b130ce0ad3425ecb1bad4da" },
"diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
"dropbar.nvim": { "branch": "master", "commit": "e94f33b5eba0be7e89b2a868d0d1770ba09eb17b" },
"firenvim": { "branch": "master", "commit": "64f9389b88c8b0c7667d45c171a5f25c42d852fb" },
"flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" },
"friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
"gdrama-syntax.vim": { "branch": "main", "commit": "004eda58d6e3ce3d1b46bbf257bd99784c475a0e" },
"git-conflict.nvim": { "branch": "main", "commit": "4bbfdd92d547d2862a75b4e80afaf30e73f7bbb4" },
"go.nvim": { "branch": "master", "commit": "c6d5ca26377d01c4de1f7bff1cd62c8b43baa6bc" },
"grug-far.nvim": { "branch": "main", "commit": "3707c4fb6ac982a1ca013c1b3bffa8e396f775cc" },
"guihua.lua": { "branch": "master", "commit": "d783191eaa75215beae0c80319fcce5e6b3beeda" },
"harpoon": { "branch": "harpoon2", "commit": "a84ab829eaf3678b586609888ef52f7779102263" },
"hlchunk.nvim": { "branch": "main", "commit": "5465dd33ade8676d63f6e8493252283060cd72ca" },
"java-syntax.vim": { "branch": "master", "commit": "9a3d76a8c6cd7765ba93a7bdd9280594167e3f1b" },
"kotlin-vim": { "branch": "master", "commit": "53fe045906df8eeb07cb77b078fc93acda6c90b8" },
"lazy.nvim": { "branch": "main", "commit": "014d1d6d78df4e58f962158e6e00261d8632612c" },
"lazygit.nvim": { "branch": "main", "commit": "02a7a2789fe9e660ef72bec27df342b15bcca6b7" },
"leap.nvim": { "branch": "main", "commit": "c6bfb191f1161fbabace1f36f578a20ac6c7642c" },
"lsp-status.nvim": { "branch": "master", "commit": "54f48eb5017632d81d0fd40112065f1d062d0629" },
"lsp-timeout.nvim": { "branch": "main", "commit": "6325906730330105a9adc41d0ceb8499b3072e2b" },
"lsp-virtual-improved.nvim": { "branch": "master", "commit": "79354d877c3e8bd9da0a9757abc3d7443dc01da5" },
"lsp-zero.nvim": { "branch": "v3.x", "commit": "ab2a3413646fedd77aa0eab4214a6473e62f6a64" },
"lsp_lines.nvim": { "branch": "main", "commit": "dbfd8e96ec2696e1ceedcd23fd70e842256e3dea" },
"lsp_signature.nvim": { "branch": "master", "commit": "fc38521ea4d9ec8dbd4c2819ba8126cea743943b" },
"lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" },
"lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "8e46de9241d3997927af12196bd8faa0ed08c29a" },
"mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
"mini.icons": { "branch": "main", "commit": "54686be7d58807906cb2c8c2216e0bf9c044f19a" },
"mini.notify": { "branch": "main", "commit": "a933dc637b84314976d6482449f9f51ecd02d2b3" },
"mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" },
"moonfly": { "branch": "master", "commit": "49701afd56b6ad7877dd20a192016f74f518e291" },
"neo-tree.nvim": { "branch": "main", "commit": "42caaf5c3b7ca346ab278201151bb878006a6031" },
"neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" },
"neogen": { "branch": "main", "commit": "37dd095892e3f846418c465852f7b21f81d0f46c" },
"neoscopes": { "branch": "main", "commit": "d9655aa272f22378c1cfccce2a4e9d53f986e414" },
"nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" },
"nvim-cmp": { "branch": "main", "commit": "ca4d3330d386e76967e53b85953c170658255ecb" },
"nvim-cmp-buffer-lines": { "branch": "master", "commit": "924ccc04dc5c919b6baa05d45818025baa82699a" },
"nvim-colorizer.lua": { "branch": "master", "commit": "4acf88d31b3a7a1a7f31e9c30bf2b23c6313abdb" },
"nvim-dap": { "branch": "master", "commit": "580d6e526358afd0e4bba053e68fd59cf581a161" },
"nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" },
"nvim-dap-virtual-text": { "branch": "master", "commit": "76d80c3d171224315b61c006502a1e30c213a9ab" },
"nvim-jdtls": { "branch": "master", "commit": "ece818f909c6414cbad4e1fb240d87e003e10fda" },
"nvim-lightbulb": { "branch": "master", "commit": "1cae7b7153ae98dcf1b11173a443ac1b6d8e3d49" },
"nvim-lint": { "branch": "master", "commit": "6b46370d02cd001509a765591a3ffc481b538794" },
"nvim-lspconfig": { "branch": "master", "commit": "47f236c058f0511702286a21ba53bbf42abbd8a8" },
"nvim-luapad": { "branch": "master", "commit": "176686eb616a5ada5dfc748f2b5109194bbe8a71" },
"nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
"nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" },
"nvim-scrollbar": { "branch": "main", "commit": "6994eb9f73d5fdc36ee2c8717940e8c853e51a49" },
"nvim-surround": { "branch": "main", "commit": "9f0cb495f25bff32c936062d85046fbda0c43517" },
"nvim-treesitter": { "branch": "master", "commit": "894cb3cebbad0535fb4e319ada5d875dbc48d8b9" },
"omnisharp-extended-lsp.nvim": { "branch": "main", "commit": "4916fa12e5b28d21a1f031f0bdd10aa15a75d85d" },
"paint.nvim": { "branch": "main", "commit": "ef6f717a8669619ebbd098fb72f85115d64c6c92" },
"persistence.nvim": { "branch": "main", "commit": "f6aad7dde7fcf54148ccfc5f622c6d5badd0cc3d" },
"plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
"presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" },
"refactoring.nvim": { "branch": "master", "commit": "2db6d378e873de31d18ade549c2edba64ff1c2e3" },
"rustaceanvim": { "branch": "master", "commit": "bf3d8c7bcbf20a7e7f4af36c2d5390ca6ad43281" },
"sonokai": { "branch": "master", "commit": "fd42b20963c34dfc1744ac31f6a6efe78f4edad2" },
"tagalong.vim": { "branch": "main", "commit": "5a2bbf2b1d5b657685a49d48d98a4aa921c1fde3" },
"telescope-dap.nvim": { "branch": "master", "commit": "783366bd6c1e7fa0a5c59c07db37f49c805a28df" },
"telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
"telescope-import.nvim": { "branch": "main", "commit": "6ccc0ad05b2906e04c5ba415a7f973229efc6dbc" },
"telescope-recent-files": { "branch": "main", "commit": "3a7a1b9c6b52b6ff7938c59f64c87a05e013dff8" },
"telescope.nvim": { "branch": "master", "commit": "2eca9ba22002184ac05eddbe47a7fe2d5a384dfc" },
"text-case.nvim": { "branch": "main", "commit": "e898cfd46fa6cde0e83abb624a16e67d2ffc6457" },
"todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },
"tree-sitter-gdscript": { "branch": "master", "commit": "bf39f1b38a234d79940fd8866abb0b132ab51b1e" },
"trouble.nvim": { "branch": "main", "commit": "46cf952fc115f4c2b98d4e208ed1e2dce08c9bf6" },
"undotree": { "branch": "master", "commit": "78b5241191852ffa9bb5da5ff2ee033160798c3b" },
"vcscommand.vim": { "branch": "master", "commit": "2fb32681361f37533455d20aaa7fc6eb11b0fa4b" },
"vim-abolish": { "branch": "master", "commit": "dcbfe065297d31823561ba787f51056c147aa682" },
"vim-bazel": { "branch": "master", "commit": "31b0d5e4f51da1aeb56d65bf505a744e6de405de" },
"vim-better-whitespace": { "branch": "master", "commit": "86a0579b330b133b8181b8e088943e81c26a809e" },
"vim-conjoin": { "branch": "master", "commit": "2ea3b8ed994d12bbf255825d973d865621c64860" },
"vim-floaterm": { "branch": "master", "commit": "4e28c8dd0271e10a5f55142fb6fe9b1599ee6160" },
"vim-godot": { "branch": "master", "commit": "1c8385789f7f4558bdbbf6e75033b34b4727944b" },
"vim-illuminate": { "branch": "master", "commit": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa" },
"vim-maktaba": { "branch": "master", "commit": "fe95bb10f6bb250943a44632107f6a3d76ce5f28" },
"vim-matchup": { "branch": "master", "commit": "5fb083de1e06fdd134c6ad8d007d4b5576b25ba7" },
"vim-signify": { "branch": "master", "commit": "8670143f9e12ed1cd3c9b2c54f345cdd9a4baac3" },
"vim-tmux": { "branch": "master", "commit": "cfe76281efc29890548cf9eedd42ad51c7a1faf0" },
"vim-tmux-focus-events": { "branch": "master", "commit": "b1330e04ffb95ede8e02b2f7df1f238190c67056" },
"vim-tmux-navigator": { "branch": "master", "commit": "424b5caa154bff34dc258ee53cec5a8e36cf7ea8" },
"vim-tmux-syntax": { "branch": "master", "commit": "1b6a6a5beb96fa232c8d35d305f77496b12678a9" },
"vimux": { "branch": "master", "commit": "7db6b2f79d432ee3820668b1d4625311dbe1d0ad" },
"which-key.nvim": { "branch": "main", "commit": "9b365a6428a9633e3eeb34dbef1b791511c54f70" },
"yankwin.vim": { "branch": "master", "commit": "d3e3bbb0f785115c2f24b44ddf12e9378a1c1266" },
"zen-mode.nvim": { "branch": "main", "commit": "29b292bdc58b76a6c8f294c961a8bf92c5a6ebd6" }
} }

View File

@ -1,83 +0,0 @@
" Copyright 2011 The Go Authors. All rights reserved.
" Use of this source code is governed by a BSD-style
" license that can be found in the LICENSE file.
"
" gotpl.vim: Vim syntax file for Go templates.
" Quit when a (custom) syntax file was already loaded
if exists("b:current_syntax")
finish
endif
syn case match
" Go escapes
syn match goEscapeOctal display contained "\\[0-7]\{3}"
syn match goEscapeC display contained +\\[abfnrtv\\'"]+
syn match goEscapeX display contained "\\x\x\{2}"
syn match goEscapeU display contained "\\u\x\{4}"
syn match goEscapeBigU display contained "\\U\x\{8}"
syn match goEscapeError display contained +\\[^0-7xuUabfnrtv\\'"]+
hi def link goEscapeOctal goSpecialString
hi def link goEscapeC goSpecialString
hi def link goEscapeX goSpecialString
hi def link goEscapeU goSpecialString
hi def link goEscapeBigU goSpecialString
hi def link goSpecialString Special
hi def link goEscapeError Error
" Strings and their contents
syn cluster goStringGroup contains=goEscapeOctal,goEscapeC,goEscapeX,goEscapeU,goEscapeBigU,goEscapeError
syn region goString contained start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=@goStringGroup
syn region goRawString contained start=+`+ end=+`+
hi def link goString String
hi def link goRawString String
" Characters; their contents
syn cluster goCharacterGroup contains=goEscapeOctal,goEscapeC,goEscapeX,goEscapeU,goEscapeBigU
syn region goCharacter start=+'+ skip=+\\\\\|\\'+ end=+'+ contains=@goCharacterGroup
hi def link goCharacter Character
" Integers
syn match goDecimalInt contained "\<\d\+\([Ee]\d\+\)\?\>"
syn match goHexadecimalInt contained "\<0x\x\+\>"
syn match goOctalInt contained "\<0\o\+\>"
syn match goOctalError contained "\<0\o*[89]\d*\>"
syn cluster goInt contains=goDecimalInt,goHexadecimalInt,goOctalInt
" Floating point
syn match goFloat contained "\<\d\+\.\d*\([Ee][-+]\d\+\)\?\>"
syn match goFloat contained "\<\.\d\+\([Ee][-+]\d\+\)\?\>"
syn match goFloat contained "\<\d\+[Ee][-+]\d\+\>"
" Imaginary literals
syn match goImaginary contained "\<\d\+i\>"
syn match goImaginary contained "\<\d\+\.\d*\([Ee][-+]\d\+\)\?i\>"
syn match goImaginary contained "\<\.\d\+\([Ee][-+]\d\+\)\?i\>"
syn match goImaginary contained "\<\d\+[Ee][-+]\d\+i\>"
hi def link goInt Number
hi def link goFloat Number
hi def link goImaginary Number
" Token groups
syn cluster gotplLiteral contains=goString,goRawString,goCharacter,@goInt,goFloat,goImaginary
syn keyword gotplControl contained if else end range with template
syn keyword gotplFunctions contained and html index js len not or print printf println urlquery eq ne lt le gt ge
syn match gotplVariable contained /\$[^ ]*\>/
syn match goTplIdentifier contained /\.[^ ]*\>/
hi def link gotplControl Keyword
hi def link gotplFunctions Function
hi def link goTplVariable Special
syn region gotplAction start="{{" end="}}" contains=@gotplLiteral,gotplControl,gotplFunctions,gotplVariable,goTplIdentifier display
syn region gotplAction start="\[\[" end="\]\]" contains=@gotplLiteral,gotplControl,gotplFunctions,gotplVariable display
syn region goTplComment start="{{/\*" end="\*/}}" display
syn region goTplComment start="\[\[/\*" end="\*/\]\]" display
hi def link gotplAction PreProc
hi def link goTplComment Comment
let b:current_syntax = "gotmpl"

File diff suppressed because one or more lines are too long

View File

@ -1,112 +0,0 @@
<PcFileCache>
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/mono-options.pc" lastWriteTime="2022-06-14T14:13:23-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/mono.pc" lastWriteTime="2022-06-14T14:13:23-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/expat.pc" lastWriteTime="2022-06-14T12:57:28-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/glade-sharp-2.0.pc" lastWriteTime="2022-06-14T14:25:49-05:00" name="glade-sharp-2.0" version="2.12.45" description="Glade# - Glade .NET Binding" requires="gtk-sharp-2.0" targetFramework=".NETFramework,Version=v4.0">
<Assembly name="glade-sharp" version="2.12.0.0" culture="neutral" publicKeyToken="35e10195dab3c99f" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/gtk-sharp-2.0/glade-sharp.dll" />
</File>
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/monodoc.pc" lastWriteTime="2022-06-14T14:13:23-05:00" name="monodoc" version="6.12.0" description="Monodoc - Mono Documentation Tools" targetFramework=".NETFramework,Version=v4.0">
<Assembly name="monodoc" version="1.0.0.0" culture="neutral" publicKeyToken="0738eb9f132ed756" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/monodoc/monodoc.dll" />
</File>
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/librsvg-2.0.pc" lastWriteTime="2022-06-14T12:58:20-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/cairo-ft.pc" lastWriteTime="2022-06-14T12:48:13-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/system.web.mvc3.pc" lastWriteTime="2022-06-14T14:13:23-05:00" name="system.web.mvc3" version="3.0.0.0" description="System.Web.Mvc - ASP.NET MVC v3" targetFramework=".NETFramework,Version=v4.0">
<Assembly name="System.Web.Mvc" version="3.0.0.0" culture="neutral" publicKeyToken="31bf3856ad364e35" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/gac/System.Web.Mvc/3.0.0.0__31bf3856ad364e35/System.Web.Mvc.dll" />
</File>
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/xsp-2.pc" lastWriteTime="2022-06-14T14:24:43-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/gapi-2.0.pc" lastWriteTime="2022-06-14T14:25:45-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/gio-2.0.pc" lastWriteTime="2022-06-14T12:51:10-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/system.web.mvc2.pc" lastWriteTime="2022-06-14T14:13:23-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/gio-unix-2.0.pc" lastWriteTime="2022-06-14T12:51:10-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/wcf.pc" lastWriteTime="2022-06-14T14:13:23-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/cairo-quartz-image.pc" lastWriteTime="2022-06-14T12:48:13-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/pango.pc" lastWriteTime="2022-06-14T12:52:07-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/gdk-quartz-2.0.pc" lastWriteTime="2022-06-14T12:56:30-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/gobject-2.0.pc" lastWriteTime="2022-06-14T12:51:10-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/xbuild12.pc" lastWriteTime="2022-06-14T14:13:23-05:00" name="xbuild12" version="12.0" description="XBuild/MSBuild 12.0" targetFramework=".NETFramework,Version=v4.0">
<Assembly name="Microsoft.Build.Engine" version="12.0.0.0" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/xbuild/12.0/bin/Microsoft.Build.Engine.dll" />
<Assembly name="Microsoft.Build.Framework" version="12.0.0.0" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/xbuild/12.0/bin/Microsoft.Build.Framework.dll" />
<Assembly name="Microsoft.Build.Tasks.v12.0" version="12.0.0.0" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/xbuild/12.0/bin/Microsoft.Build.Tasks.v12.0.dll" />
<Assembly name="Microsoft.Build.Utilities.v12.0" version="12.0.0.0" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/xbuild/12.0/bin/Microsoft.Build.Utilities.v12.0.dll" />
<Assembly name="Microsoft.Build" version="12.0.0.0" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/xbuild/12.0/bin/Microsoft.Build.dll" />
</File>
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/gtk+-quartz-2.0.pc" lastWriteTime="2022-06-14T12:56:30-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/cairo-pdf.pc" lastWriteTime="2022-06-14T12:48:13-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/libcroco-0.6.pc" lastWriteTime="2022-06-14T12:57:56-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/gdk-pixbuf-2.0.pc" lastWriteTime="2022-06-14T12:52:49-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/gtk-dotnet-2.0.pc" lastWriteTime="2022-06-14T14:25:50-05:00" name="gtk-dotnet-2.0" version="2.12.45" description=".NET Extensions for Gtk" requires="gtk-sharp-2.0" targetFramework=".NETFramework,Version=v4.0">
<Assembly name="gtk-dotnet" version="2.12.0.0" culture="neutral" publicKeyToken="35e10195dab3c99f" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/gtk-sharp-2.0/gtk-dotnet.dll" />
</File>
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/mono-lineeditor.pc" lastWriteTime="2022-06-14T14:13:23-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/system.web.mvc.pc" lastWriteTime="2022-06-14T14:13:23-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/atk.pc" lastWriteTime="2022-06-14T12:52:21-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/glib-2.0.pc" lastWriteTime="2022-06-14T12:51:10-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/reactive.pc" lastWriteTime="2022-06-14T14:13:23-05:00" name="reactive" version="6.12.0" description="Reactive Extensions" targetFramework=".NETFramework,Version=v4.0">
<Assembly name="System.Reactive.Interfaces" version="2.2.0.0" culture="neutral" publicKeyToken="31bf3856ad364e35" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/4.5/System.Reactive.Interfaces.dll" />
<Assembly name="System.Reactive.Core" version="2.2.0.0" culture="neutral" publicKeyToken="31bf3856ad364e35" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/4.5/System.Reactive.Core.dll" />
<Assembly name="System.Reactive.Linq" version="2.2.0.0" culture="neutral" publicKeyToken="31bf3856ad364e35" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/4.5/System.Reactive.Linq.dll" />
<Assembly name="System.Reactive.PlatformServices" version="2.2.0.0" culture="neutral" publicKeyToken="31bf3856ad364e35" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/4.5/System.Reactive.PlatformServices.dll" />
<Assembly name="System.Reactive.Providers" version="2.2.0.0" culture="neutral" publicKeyToken="31bf3856ad364e35" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/4.5/System.Reactive.Providers.dll" />
<Assembly name="System.Reactive.Debugger" version="2.2.0.0" culture="neutral" publicKeyToken="31bf3856ad364e35" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/4.5/System.Reactive.Debugger.dll" />
<Assembly name="System.Reactive.Experimental" version="2.2.0.0" culture="neutral" publicKeyToken="31bf3856ad364e35" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/4.5/System.Reactive.Experimental.dll" />
<Assembly name="System.Reactive.Runtime.Remoting" version="2.2.0.0" culture="neutral" publicKeyToken="31bf3856ad364e35" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/4.5/System.Reactive.Runtime.Remoting.dll" />
</File>
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/cairo-fc.pc" lastWriteTime="2022-06-14T12:48:13-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/freetype2.pc" lastWriteTime="2022-06-14T12:46:29-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/system.web.extensions_1.0.pc" lastWriteTime="2022-06-14T14:13:23-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/cairo.pc" lastWriteTime="2022-06-14T12:48:13-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/system.web.extensions.design_1.0.pc" lastWriteTime="2022-06-14T14:13:23-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/gdk-2.0.pc" lastWriteTime="2022-06-14T12:56:30-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/monosgen-2.pc" lastWriteTime="2022-06-14T14:13:23-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/gtk+-unix-print-2.0.pc" lastWriteTime="2022-06-14T12:56:30-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/libffi.pc" lastWriteTime="2022-06-14T12:48:31-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/pangocairo.pc" lastWriteTime="2022-06-14T12:52:07-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/aspnetwebstack.pc" lastWriteTime="2022-06-14T14:13:23-05:00" name="aspnetwebstack" version="6.12.0" description="References Microsoft ASP.NET Web Stack" targetFramework=".NETFramework,Version=v4.0">
<Assembly name="System.Web.Razor" version="2.0.0.0" culture="neutral" publicKeyToken="31bf3856ad364e35" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/gac/System.Web.Razor/2.0.0.0__31bf3856ad364e35/System.Web.Razor.dll" />
<Assembly name="System.Web.Http" version="4.0.0.0" culture="neutral" publicKeyToken="31bf3856ad364e35" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/gac/System.Web.Http/4.0.0.0__31bf3856ad364e35/System.Web.Http.dll" />
<Assembly name="System.Web.WebPages" version="2.0.0.0" culture="neutral" publicKeyToken="31bf3856ad364e35" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/gac/System.Web.WebPages/2.0.0.0__31bf3856ad364e35/System.Web.WebPages.dll" />
<Assembly name="System.Web.WebPages.Razor" version="2.0.0.0" culture="neutral" publicKeyToken="31bf3856ad364e35" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/gac/System.Web.WebPages.Razor/2.0.0.0__31bf3856ad364e35/System.Web.WebPages.Razor.dll" />
<Assembly name="System.Web.WebPages.Deployment" version="2.0.0.0" culture="neutral" publicKeyToken="31bf3856ad364e35" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/gac/System.Web.WebPages.Deployment/2.0.0.0__31bf3856ad364e35/System.Web.WebPages.Deployment.dll" />
</File>
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/ige-mac-integration.pc" lastWriteTime="2022-06-14T12:57:43-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/mono-cairo.pc" lastWriteTime="2022-06-14T14:13:23-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/gmodule-export-2.0.pc" lastWriteTime="2022-06-14T12:51:10-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/dotnet35.pc" lastWriteTime="2022-06-14T14:13:23-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/cairo-png.pc" lastWriteTime="2022-06-14T12:48:13-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/libtiff-4.pc" lastWriteTime="2022-06-14T12:45:34-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/glib-sharp-2.0.pc" lastWriteTime="2022-06-14T14:25:46-05:00" name="glib-sharp-2.0" version="2.12.45" description="GLib# - .NET Binding for the glib library." targetFramework=".NETFramework,Version=v4.0">
<Assembly name="glib-sharp" version="2.12.0.0" culture="neutral" publicKeyToken="35e10195dab3c99f" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/gtk-sharp-2.0/glib-sharp.dll" />
</File>
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/gthread-2.0.pc" lastWriteTime="2022-06-14T12:51:10-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/cairo-svg.pc" lastWriteTime="2022-06-14T12:48:13-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/gtk-sharp-2.0.pc" lastWriteTime="2022-06-14T14:25:48-05:00" name="gtk-sharp-2.0" version="2.12.45" description="Gtk# - GNOME .NET Binding" requires="glib-sharp-2.0" targetFramework=".NETFramework,Version=v4.0">
<Assembly name="pango-sharp" version="2.12.0.0" culture="neutral" publicKeyToken="35e10195dab3c99f" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/gtk-sharp-2.0/pango-sharp.dll" />
<Assembly name="atk-sharp" version="2.12.0.0" culture="neutral" publicKeyToken="35e10195dab3c99f" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/gtk-sharp-2.0/atk-sharp.dll" />
<Assembly name="gdk-sharp" version="2.12.0.0" culture="neutral" publicKeyToken="35e10195dab3c99f" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/gtk-sharp-2.0/gdk-sharp.dll" />
<Assembly name="gtk-sharp" version="2.12.0.0" culture="neutral" publicKeyToken="35e10195dab3c99f" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/gtk-sharp-2.0/gtk-sharp.dll" />
</File>
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/pixman-1.pc" lastWriteTime="2022-06-14T12:47:09-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/gail.pc" lastWriteTime="2022-06-14T12:56:30-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/libpng14.pc" lastWriteTime="2022-06-14T12:45:02-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/libgdiplus.pc" lastWriteTime="2022-06-14T14:24:25-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/cairo-quartz.pc" lastWriteTime="2022-06-14T12:48:13-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/sqlite3.pc" lastWriteTime="2022-06-14T12:57:17-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/gmodule-no-export-2.0.pc" lastWriteTime="2022-06-14T12:51:10-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/cairo-quartz-font.pc" lastWriteTime="2022-06-14T12:48:13-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/gtk-engines-2.pc" lastWriteTime="2022-06-14T12:58:49-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/fontconfig.pc" lastWriteTime="2022-06-14T12:46:46-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/libxml-2.0.pc" lastWriteTime="2022-06-14T12:46:13-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/xsp-4.pc" lastWriteTime="2022-06-14T14:24:43-05:00" name="xsp-4" version="4.6" description="Mono.WebServer2.dll - ASP.NET hosting support classes for .NET 4.0" targetFramework=".NETFramework,Version=v4.0">
<Assembly name="Mono.WebServer2" version="0.4.0.0" culture="neutral" publicKeyToken="0738eb9f132ed756" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/4.5/Mono.WebServer2.dll" />
</File>
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/libglade-2.0.pc" lastWriteTime="2022-06-14T12:57:04-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/mono-2.pc" lastWriteTime="2022-06-14T14:13:23-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/cecil.pc" lastWriteTime="2022-06-14T14:13:23-05:00" name="cecil" version="6.12.0" description="Mono Internal Libraries -- Do not use" targetFramework=".NETFramework,Version=v4.0">
<Assembly name="Mono.Cecil" version="0.9.5.0" culture="neutral" publicKeyToken="0738eb9f132ed756" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/gac/Mono.Cecil/0.9.5.0__0738eb9f132ed756/Mono.Cecil.dll" />
</File>
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/cairo-ps.pc" lastWriteTime="2022-06-14T12:48:13-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/cairo-script.pc" lastWriteTime="2022-06-14T12:48:13-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/gmodule-2.0.pc" lastWriteTime="2022-06-14T12:51:10-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/dotnet.pc" lastWriteTime="2022-06-14T14:13:23-05:00" />
<File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/gtk+-2.0.pc" lastWriteTime="2022-06-14T12:56:30-05:00" />
</PcFileCache>

View File

@ -4,6 +4,5 @@ abbr "bq"="blaze query"
abbr "br"="blaze run" abbr "br"="blaze run"
abbr "bt"="blaze test" abbr "bt"="blaze test"
abbr "ds_clean"="find ./ -name \".DS_Store\" -depth -exec rm {} \;" abbr "ds_clean"="find ./ -name \".DS_Store\" -depth -exec rm {} \;"
abbr "gdvim"="nvim --listen /tmp/godot.pipe"
abbr "mux"="tmuxinator" abbr "mux"="tmuxinator"
abbr "replace_string"="replace_string --disable_p4 \"%\" \"%\"" abbr "replace_string"="replace_string --disable_p4 \"%\" \"%\""

View File

@ -1,9 +0,0 @@
# add gdscript type
--type-add
gd:*.{gd,gdscript}*
# Search hidden files / directories (e.g. dotfiles) by default
--hidden
# Because who cares about case!?
--smart-case

View File

@ -1,12 +1,12 @@
[user] [user]
name = Christian Nieves name = Christian Nieves
email = cnieves@google.com email = cnieves@google.com
[color] [color]
ui = auto ui = auto
[url "ssh://git@github.com/"] [url "ssh://git@github.com/"]
insteadOf = https://github.com/ insteadOf = https://github.com/
[alias] [alias]
gr = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all gr = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all
# one-line log # one-line log
l = log --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=short l = log --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=short
@ -34,69 +34,17 @@
la = "!git config -l | grep alias | cut -c 7-" la = "!git config -l | grep alias | cut -c 7-"
po = push origin po = push origin
[core] [core]
autocrlf = false autocrlf = false
excludesfile = /Users/christian/.gitignore_global
[icdiff] [icdiff]
options = --highlight --line-numbers options = --highlight --line-numbers
[merge] [merge]
tool = "nvim" tool = "nvim"
[mergetool "nvim"] [mergetool "nvim"]
cmd = nvim -d -c \"wincmd l\" \"$LOCAL\" \"$MERGED\" \"$REMOTE\" cmd = nvim -d -c \"wincmd l\" \"$LOCAL\" \"$MERGED\" \"$REMOTE\"
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
# clearly makes git better
[column]
ui = auto
[branch]
sort = -committerdate
[tag]
sort = version:refname
[init]
defaultBranch = main
[diff] [diff]
algorithm = histogram
colorMoved = plain
mnemonicPrefix = true
renames = true
tool = icdiff tool = icdiff
[push] [filter "lfs"]
default = simple clean = git-lfs clean -- %f
autoSetupRemote = true smudge = git-lfs smudge -- %f
followTags = true process = git-lfs filter-process
[fetch] required = true
prune = true
pruneTags = true
all = true
# why the hell not?
[help]
autocorrect = prompt
[commit]
verbose = true
[rerere]
enabled = true
autoupdate = true
[core]
excludesfile = ~/.gitignore
[rebase]
autoSquash = true
autoStash = true
updateRefs = true
# a matter of taste (uncomment if you dare)
[core]
# fsmonitor = true
# untrackedCache = true
[merge]
# (just 'diff3' if git version < 2.3)
# conflictstyle = zdiff3
[pull]
# rebase = true

View File

@ -1,19 +0,0 @@
# OS generated files #
######################
.DS_Store
.DS_Store?
._*
.Spotlight-V100
.Trashes
ehthumbs.db
Thumbs.db
# Compiled source #
###################
*.com
*.class
*.dll
*.exe
*.o
*.so

View File

@ -16,15 +16,15 @@ opts.vimdiff = -d
# opts.vimdiff = -c ':call ShowMercurialDiff(argv(0), argv(1))' # opts.vimdiff = -c ':call ShowMercurialDiff(argv(0), argv(1))'
[extensions] [extensions]
# unsupported.tree = unsupported.tree =
# unsupported.alices = unsupported.alices =
extdiff = extdiff =
# color = color =
beautifygraph = beautifygraph =
# [alices] [alices]
# findings.extra_args = --proxy findings.extra_args = --proxy
# summarize.extra_args = --proxy summarize.extra_args = --proxy
[merge-tools] [merge-tools]
vimdiff.executable = nvim vimdiff.executable = nvim
@ -51,7 +51,6 @@ dt = icdiff --pager=on
dtex = dt -r exported(.) dtex = dt -r exported(.)
dtp4 = dt -r p4base dtp4 = dt -r p4base
dtup = dt -r .^ dtup = dt -r .^
ra = revert --all
whatsout = status -n --change . --template=hgshort_status whatsout = status -n --change . --template=hgshort_status
what = status -n --change . --template=hgshort_status what = status -n --change . --template=hgshort_status

View File

@ -88,8 +88,6 @@ bind-key s split-window -v -c '#{pane_current_path}'
bind -n M-s set-window-option synchronize-panes\; display-message "synchronize-panes is now #{?pane_synchronized,on,off}" bind -n M-s set-window-option synchronize-panes\; display-message "synchronize-panes is now #{?pane_synchronized,on,off}"
# bind -n C-Space select-pane -D \; resize-pane -Z
bind -n M-z resize-pane -Z bind -n M-z resize-pane -Z
bind -n M-j resize-pane -D 5 bind -n M-j resize-pane -D 5
@ -124,7 +122,7 @@ bind-key C-a set-option -g prefix C-a
# No delay for escape key press # No delay for escape key press
set -sg escape-time 0 set -sg escape-time 0
run ~/.tmux/plugins/tmux/catppuccin.tmux set -g status-right '#{prefix_highlight} | %a %Y-%m-%d %H:%M'
# text for the window when inactive # text for the window when inactive
set -g @catppuccin_window_default_fill "number" set -g @catppuccin_window_default_fill "number"
@ -133,27 +131,30 @@ set -g @catppuccin_window_default_text '#{?#{m/r:^(/google/src)?/cloud/,#{pane_c
set -g @catppuccin_window_current_fill "number" set -g @catppuccin_window_current_fill "number"
set -g @catppuccin_window_current_text '#{?#{m/r:^(/google/src)?/cloud/,#{pane_current_path}},#{s|^(/google/src)?/cloud/[^/]+/([^/]+).+$|\2|:pane_current_path},#{b:pane_current_path}}' set -g @catppuccin_window_current_text '#{?#{m/r:^(/google/src)?/cloud/,#{pane_current_path}},#{s|^(/google/src)?/cloud/[^/]+/([^/]+).+$|\2|:pane_current_path},#{b:pane_current_path}}'
set -g @catppuccin_pane_status_enabled "yes"
set -g @catppuccin_pane_border_status "top"
set -g @catppuccin_pane_left_separator ""
set -g @catppuccin_pane_right_separator ""
set -g @catppuccin_pane_middle_separator "█ "
set -g @catppuccin_pane_number_position "left"
set -g @catppuccin_pane_default_fill "number"
set -g @catppuccin_status_modules_right "host cpu weather date_time"
set -g @catppuccin_status_left_separator ""
set -g @catppuccin_status_right_separator " "
set -g @catppuccin_status_right_separator_inverse "yes"
set -g @catppuccin_status_fill "all"
set -g @catppuccin_status_connect_separator "no"
set -g @catppuccin_window_status_icon_enable "yes"
set -g @catppuccin_icon_window_last "󰖰"
set -g @catppuccin_icon_window_current "󰖯"
set -g @catppuccin_icon_window_zoom "󰁌"
set -g @catppuccin_icon_window_mark "󰃀"
set -g @catppuccin_icon_window_silent "󰂛"
set -g @catppuccin_icon_window_activity "󰖲"
set -g @catppuccin_icon_window_bell "󰂞" set -g @catppuccin_icon_window_bell "󰂞"
# Make the status line pretty and add some modules
set -g status-right-length 100
set -g status-left-length 100
set -g status-left ""
set -g status-right "#{E:@catppuccin_status_application}"
set -agF status-right "#{E:@catppuccin_status_cpu}"
set -ag status-right "#{E:@catppuccin_status_session}"
set -ag status-right "#{E:@catppuccin_status_uptime}"
set -agF status-right "#{E:@catppuccin_status_battery}"
# List of plugins # List of plugins
set -g @plugin 'tmux-plugins/tpm' set -g @plugin 'tmux-plugins/tpm'
set -g @plugin 'tmux-plugins/tmux-sensible' set -g @plugin 'tmux-plugins/tmux-sensible'
@ -167,7 +168,6 @@ set -g @plugin 'catppuccin/tmux'
set -g @plugin 'tmux-plugins/tmux-resurrect' set -g @plugin 'tmux-plugins/tmux-resurrect'
set -g @plugin 'tmux-plugins/tmux-continuum' set -g @plugin 'tmux-plugins/tmux-continuum'
set -g @plugin 'tmux-plugins/tmux-prefix-highlight' set -g @plugin 'tmux-plugins/tmux-prefix-highlight'
set -g @plugin 'catppuccin/tmux#v2.1.2'
set -g @continuum-restore 'on' set -g @continuum-restore 'on'
set -g @resurrect-dir '$HOME/.tmux/resurrect' set -g @resurrect-dir '$HOME/.tmux/resurrect'

View File

@ -0,0 +1,7 @@
vim.cmd([[
function UnusedDeps() abort
exe VimuxRunCommand("unused_deps --nouse_build_api --blaze_options='--config=gmscore_tap' " . join(blaze#GetTargets(), ' '))
endfunction
nnoremap <Leader>ud :call UnusedDeps()<cr>
]])

View File

@ -1,33 +1,18 @@
local map = require("utils").map local map = require("utils").map
if vim.fn.hostname() == "goblin" then if vim.env.SSH_TTY or vim.env.SSH_CLIENT or vim.env.SSH_CONNECTION then
vim.g.clipboard = { vim.g.clipboard = {
name = "wayland", name = "lemonade",
copy = { copy = {
["+"] = { "wl-copy" }, ["+"] = { "lemonade", "copy" },
["*"] = { "wl-copy" }, ["*"] = { "lemonade", "copy" },
}, },
paste = { paste = {
["+"] = { "wl-paste" }, ["+"] = { "lemonade", "paste" },
["*"] = { "wl-paste" }, ["*"] = { "lemonade", "paste" },
}, },
cache_enabled = false, cache_enabled = false,
} }
else
if vim.env.SSH_TTY or vim.env.SSH_CLIENT or vim.env.SSH_CONNECTION then
vim.g.clipboard = {
name = "lemonade",
copy = {
["+"] = { "lemonade", "copy" },
["*"] = { "lemonade", "copy" },
},
paste = {
["+"] = { "lemonade", "paste" },
["*"] = { "lemonade", "paste" },
},
cache_enabled = false,
}
end
end end
map("v", "<leader>y", '"+y') map("v", "<leader>y", '"+y')

View File

@ -0,0 +1,30 @@
local map = require("utils").map
local use_google = require("utils").use_google
if use_google() then
-- [F]ig [S]tatus
map("n", "<leader>fs", [[<cmd>lua require('telescope').extensions.fig.status{}<CR>]])
-- [F]ig [X]l
map("n", "<leader>fx", [[<cmd>lua require('telescope').extensions.fig.xl{}<CR>]])
-- [F]ig [W]hatsout
map("n", "<leader>fw", [[<cmd>lua require('telescope').extensions.fig.status{whatsout=true}<CR>]])
-- [F]ig [A]mend
map("n", "<leader>fa", [[<cmd>Hg amend<CR>]])
-- [F]ig [A]mend
map("n", "<leader>fe", [[<cmd>Hg evolve<CR>]])
-- [F]ig [N]ext
map("n", "<leader>fn", [[<cmd>Hg next<CR>]])
--
-- [F]ig [P]rev
map("n", "<leader>fp", [[<cmd>Hg prev<CR>]])
--
-- [F]ig [U]pload
map("n", "<leader>fu", [[<cmd>Hg upload tree<CR>]])
-- map('n', '<Leader>f', ':Figtree<CR>', { silent = true })
end

View File

View File

@ -0,0 +1,77 @@
local use_google = require("utils").use_google
local M = {}
function M.setup(capabilities)
if use_google() then
local lspconfig = require("lspconfig")
local configs = require("lspconfig.configs")
configs.ciderlsp = {
default_config = {
offset_encoding = "utf-16",
cmd = {
"/google/bin/releases/cider/ciderlsp/ciderlsp",
"--tooltag=nvim-lsp",
"--forward_sync_responses",
-- "--debug_relay",
},
filetypes = {
"c",
"cpp",
"java",
"kotlin",
"objc",
"proto",
"textproto",
"go",
"python",
"bzl",
"typescript",
},
root_dir = require("lspconfig").util.root_pattern(".citc"),
settings = {},
},
}
local my_on_attach = function(client, bufnr)
require("lualine").refresh()
vim.api.nvim_buf_set_option(bufnr, "omnifunc", "v:lua.vim.lsp.omnifunc")
if vim.lsp.formatexpr then -- Neovim v0.6.0+ only.
vim.api.nvim_buf_set_option(bufnr, "formatexpr", "v:lua.vim.lsp.formatexpr")
end
if vim.lsp.tagfunc then
vim.api.nvim_buf_set_option(bufnr, "tagfunc", "v:lua.vim.lsp.tagfunc")
end
local lsp_status = require("lsp-status")
lsp_status.on_attach(client)
end
local cider_on_attach = function(client, bufnr)
my_on_attach(client, bufnr)
vim.b["is_cider_lsp_attached"] = "no"
end
local cider_lsp_handlers = {
["textDocument/signatureHelp"] = vim.lsp.with(vim.lsp.handlers.signature_help, {
focusable = false,
}),
}
cider_lsp_handlers["$/syncResponse"] = function(_, result, ctx)
local first_fire = vim.b["is_cider_lsp_attached"] == "no"
vim.b["is_cider_lsp_attached"] = "yes"
if first_fire then
vim.notify("CiderLSP attached")
require("lualine").refresh()
end
end
lspconfig.ciderlsp.setup({
capabilities = require("cmp_nvim_lsp").default_capabilities(vim.lsp.protocol.make_client_capabilities()),
on_attach = cider_on_attach,
handlers = cider_lsp_handlers,
})
end
end
return M

View File

@ -0,0 +1,24 @@
--------- NERD Commenter
-- Create default mappings
vim.g.NERDCreateDefaultMappings = 0
-- Add spaces after comment delimiters by default
vim.g.NERDSpaceDelims = 1
-- Use compact syntax for prettified multi-line comments
vim.g.NERDCompactSexyComs = 1
-- Align line-wise comment delimiters flush left instead of following code indentation
vim.g.NERDDefaultAlign = "left"
-- Set a language to use its alternate delimiters by default
vim.g.NERDAltDelims_java = 1
-- Allow commenting and inverting empty lines (useful when commenting a region)
vim.g.NERDCommentEmptyLines = 1
-- Enable trimming of trailing whitespace when uncommenting
vim.g.NERDTrimTrailingWhitespace = 1
--Enable NERDCommenterToggle to check all selected lines is commented or not
vim.g.NERDToggleCheckAllLines = 1

View File

@ -0,0 +1,75 @@
local map = require("utils").map
local api = require("nvim-tree.api")
local function opts(desc)
return { desc = "nvim-tree: " .. desc, buffer = bufnr, noremap = true, silent = true, nowait = true }
end
function on_attach(bufnr)
vim.keymap.set("n", "O", api.tree.change_root_to_node, opts("CD"))
vim.keymap.set("n", "?", api.tree.toggle_help, opts("Help"))
-- put some default mappings here
vim.keymap.set("n", "<C-e>", api.node.open.replace_tree_buffer, opts("Open: In Place"))
vim.keymap.set("n", "<C-k>", api.node.show_info_popup, opts("Info"))
vim.keymap.set("n", "<C-r>", api.fs.rename_sub, opts("Rename: Omit Filename"))
vim.keymap.set("n", "<C-t>", api.node.open.tab, opts("Open: New Tab"))
vim.keymap.set("n", "<C-v>", api.node.open.vertical, opts("Open: Vertical Split"))
vim.keymap.set("n", "<C-x>", api.node.open.horizontal, opts("Open: Horizontal Split"))
vim.keymap.set("n", "<BS>", api.node.navigate.parent_close, opts("Close Directory"))
vim.keymap.set("n", "<CR>", api.node.open.edit, opts("Open"))
vim.keymap.set("n", "<Tab>", api.node.open.preview, opts("Open Preview"))
vim.keymap.set("n", ">", api.node.navigate.sibling.next, opts("Next Sibling"))
vim.keymap.set("n", "<", api.node.navigate.sibling.prev, opts("Previous Sibling"))
vim.keymap.set("n", ".", api.node.run.cmd, opts("Run Command"))
vim.keymap.set("n", "-", api.tree.change_root_to_parent, opts("Up"))
vim.keymap.set("n", "a", api.fs.create, opts("Create"))
vim.keymap.set("n", "bmv", api.marks.bulk.move, opts("Move Bookmarked"))
vim.keymap.set("n", "B", api.tree.toggle_no_buffer_filter, opts("Toggle No Buffer"))
vim.keymap.set("n", "c", api.fs.copy.node, opts("Copy"))
-- vim.keymap.set('n', 'C', api.tree.toggle_git_clean_filter, opts('Toggle Git Clean'))
-- vim.keymap.set('n', '[c', api.node.navigate.git.prev, opts('Prev Git'))
-- vim.keymap.set('n', ']c', api.node.navigate.git.next, opts('Next Git'))
vim.keymap.set("n", "d", api.fs.remove, opts("Delete"))
vim.keymap.set("n", "D", api.fs.trash, opts("Trash"))
vim.keymap.set("n", "E", api.tree.expand_all, opts("Expand All"))
vim.keymap.set("n", "e", api.fs.rename_basename, opts("Rename: Basename"))
vim.keymap.set("n", "]e", api.node.navigate.diagnostics.next, opts("Next Diagnostic"))
vim.keymap.set("n", "[e", api.node.navigate.diagnostics.prev, opts("Prev Diagnostic"))
vim.keymap.set("n", "F", api.live_filter.clear, opts("Clean Filter"))
vim.keymap.set("n", "f", api.live_filter.start, opts("Filter"))
vim.keymap.set("n", "g?", api.tree.toggle_help, opts("Help"))
vim.keymap.set("n", "gy", api.fs.copy.absolute_path, opts("Copy Absolute Path"))
vim.keymap.set("n", "H", api.tree.toggle_hidden_filter, opts("Toggle Dotfiles"))
vim.keymap.set("n", "I", api.tree.toggle_gitignore_filter, opts("Toggle Git Ignore"))
vim.keymap.set("n", "J", api.node.navigate.sibling.last, opts("Last Sibling"))
vim.keymap.set("n", "K", api.node.navigate.sibling.first, opts("First Sibling"))
vim.keymap.set("n", "m", api.marks.toggle, opts("Toggle Bookmark"))
vim.keymap.set("n", "o", api.node.open.edit, opts("Open"))
-- vim.keymap.set('n', 'O', api.node.open.no_window_picker, opts('Open: No Window Picker'))
vim.keymap.set("n", "p", api.fs.paste, opts("Paste"))
vim.keymap.set("n", "P", api.node.navigate.parent, opts("Parent Directory"))
vim.keymap.set("n", "q", api.tree.close, opts("Close"))
vim.keymap.set("n", "r", api.fs.rename, opts("Rename"))
vim.keymap.set("n", "R", api.tree.reload, opts("Refresh"))
vim.keymap.set("n", "s", api.node.run.system, opts("Run System"))
vim.keymap.set("n", "S", api.tree.search_node, opts("Search"))
vim.keymap.set("n", "U", api.tree.toggle_custom_filter, opts("Toggle Hidden"))
vim.keymap.set("n", "W", api.tree.collapse_all, opts("Collapse"))
vim.keymap.set("n", "x", api.fs.cut, opts("Cut"))
vim.keymap.set("n", "y", api.fs.copy.filename, opts("Copy Name"))
vim.keymap.set("n", "Y", api.fs.copy.relative_path, opts("Copy Relative Path"))
end
require("nvim-tree").setup({
on_attach = on_attach,
update_focused_file = {
enable = true,
update_root = false,
ignore_list = {},
},
})
map("n", "<C-T>", ":NvimTreeToggle<CR>")
map("n", "<C-F>", ":NvimTreeFindFileToggle<CR>")

View File

@ -0,0 +1,66 @@
require("refactoring").setup({})
-- load refactoring Telescope extension
require("telescope").load_extension("refactoring")
-- remap to open the Telescope refactoring menu in visual mode
vim.api.nvim_set_keymap(
"v",
"<leader>rr",
"<Esc><cmd>lua require('telescope').extensions.refactoring.refactors()<CR>",
{ noremap = true }
)
-- Remaps for the refactoring operations currently offered by the plugin
vim.api.nvim_set_keymap(
"v",
"<leader>rx",
[[ <Esc><Cmd>lua require('refactoring').refactor('Extract Function')<CR>]],
{ noremap = true, silent = true, expr = false }
)
vim.api.nvim_set_keymap(
"v",
"<leader>rxf",
[[ <Esc><Cmd>lua require('refactoring').refactor('Extract Function To File')<CR>]],
{ noremap = true, silent = true, expr = false }
)
vim.api.nvim_set_keymap(
"v",
"<leader>rxv",
[[ <Esc><Cmd>lua require('refactoring').refactor('Extract Variable')<CR>]],
{ noremap = true, silent = true, expr = false }
)
vim.api.nvim_set_keymap(
"v",
"<leader>ri",
[[ <Esc><Cmd>lua require('refactoring').refactor('Inline Variable')<CR>]],
{ noremap = true, silent = true, expr = false }
)
-- Extract block doesn't need visual mode
vim.api.nvim_set_keymap(
"n",
"<leader>rxb",
[[ <Cmd>lua require('refactoring').refactor('Extract Block')<CR>]],
{ noremap = true, silent = true, expr = false }
)
vim.api.nvim_set_keymap(
"n",
"<leader>rxbf",
[[ <Cmd>lua require('refactoring').refactor('Extract Block To File')<CR>]],
{ noremap = true, silent = true, expr = false }
)
-- Inline variable can also pick up the identifier currently under the cursor without visual mode
vim.api.nvim_set_keymap(
"n",
"<leader>ri",
[[ <Cmd>lua require('refactoring').refactor('Inline Variable')<CR>]],
{ noremap = true, silent = true, expr = false }
)
vim.api.nvim_set_keymap(
"n",
"<leader>rx",
[[ <Cmd>lua require('refactoring').refactor('Extract Variable')<CR>]],
{ noremap = true, silent = true, expr = false }
)

View File

@ -0,0 +1,43 @@
local home = vim.fn.expand("~/zettelkasten")
require("telekasten").setup({
home = home,
})
vim.cmd([[
nnoremap <leader>zf :lua require('telekasten').find_notes()<CR>
nnoremap <leader>zd :lua require('telekasten').find_daily_notes()<CR>
nnoremap <leader>zg :lua require('telekasten').search_notes()<CR>
nnoremap <leader>zz :lua require('telekasten').follow_link()<CR>
autocmd FileType markdown nnoremap <Enter> :lua require('telekasten').follow_link()<CR>
autocmd FileType markdown vnoremap <leader>zf :lua require('telekasten').follow_link()<CR>
nnoremap <leader>zT :lua require('telekasten').goto_today()<CR>
nnoremap <leader>zW :lua require('telekasten').goto_thisweek()<CR>
nnoremap <leader>zw :lua require('telekasten').find_weekly_notes()<CR>
nnoremap <leader>zn :lua require('telekasten').new_note()<CR>
nnoremap <leader>zN :lua require('telekasten').new_templated_note()<CR>
nnoremap <leader>zy :lua require('telekasten').yank_notelink()<CR>
nnoremap <leader>zc :lua require('telekasten').show_calendar()<CR>
nnoremap <leader>zC :CalendarT<CR>
nnoremap <leader>zi :lua require('telekasten').paste_img_and_link()<CR>
nnoremap <leader>zt :lua require('telekasten').toggle_todo()<CR>
nnoremap <leader>zb :lua require('telekasten').show_backlinks()<CR>
nnoremap <leader>zF :lua require('telekasten').find_friends()<CR>
nnoremap <leader>zI :lua require('telekasten').insert_img_link({ i=true })<CR>
nnoremap <leader>zp :lua require('telekasten').preview_img()<CR>
nnoremap <leader>zm :lua require('telekasten').browse_media()<CR>
nnoremap <leader>za :lua require('telekasten').show_tags()<CR>
nnoremap <leader># :lua require('telekasten').show_tags()<CR>
nnoremap <leader>zr :lua require('telekasten').rename_note()<CR>
" on hesitation, bring up the panel
nnoremap <leader>z :lua require('telekasten').panel()<CR>
" colors
hi tklink ctermfg=72 guifg=#689d6a cterm=bold,underline gui=bold,underline
hi tkBrackets ctermfg=gray guifg=gray
hi tkTagSep ctermfg=gray guifg=gray
hi tkTag ctermfg=175 guifg=#d3869B
]])
-- autocmd FileType markdown vnoremap <Enter> :norm ysiw\]ysa\]\] lua require('telekasten').follow_link()<CR>

View File

@ -1,31 +0,0 @@
vim.api.nvim_create_autocmd({ 'BufRead', 'BufNewFile' }, {
group = vim.api.nvim_create_augroup('gotmpl_highlight', { clear = true }),
pattern = '*.tmpl',
callback = function()
local filename = vim.fn.expand('%:t')
local ext = filename:match('.*%.(.-)%.tmpl$')
-- Add more extension to syntax mappings here if you need to.
local ext_filetypes = {
go = 'go',
html = 'html',
md = 'markdown',
yaml = 'yaml',
yml = 'yaml',
-- cc = 'cpp',
-- h = 'cpp',
}
if ext and ext_filetypes[ext] then
-- Set the primary filetype
vim.bo.filetype = ext_filetypes[ext]
-- Define embedded Go template syntax
vim.cmd([[
syntax include @gotmpl syntax/gotmpl.vim
syntax region gotmpl start="{{" end="}}" contains=@gotmpl containedin=ALL
syntax region gotmpl start="{%" end="%}" contains=@gotmpl containedin=ALL
]])
end
end,
})

View File

@ -1,9 +0,0 @@
vim.api.nvim_create_autocmd({ "BufNewFile", "BufRead" }, {
pattern = "*.wgsl",
callback = function()
local lspconfig = require("lspconfig")
lspconfig.wgsl_analyzer.setup({})
vim.bo.filetype = "wgsl"
end,
})

View File

@ -1,35 +0,0 @@
local use_google = require("utils").use_google
return {
{
"yetone/avante.nvim",
build = "make",
enable = true,
branch = "working",
dependencies = {
"nvim-treesitter/nvim-treesitter",
"stevearc/dressing.nvim",
"nvim-lua/plenary.nvim",
"MunifTanjim/nui.nvim",
-- Add vintharas/avante-goose.nvim as a dependecy to avante.nvim
-- That'll ensure that you'll load avante-goose when you load avante.
{
"vintharas/avante-goose.nvim",
url = "sso://user/vintharas/avante-goose.nvim",
cond = use_google(),
opts = {
model = "gemini-for-google-2.5-pro", -- Select model from go/goose-models.
},
},
},
opts = {
provider = "goose", -- Select goose as provider
vendors = {}, -- Makes sure there's a vendors table
},
config = function(_, opts)
-- Load provider from the plugin
opts.vendors["goose"] = require("avante-goose").getProvider()
require("avante").setup(opts)
end,
},
}

View File

@ -1,156 +1,175 @@
local use_google = require("utils").use_google local use_google = require("utils").use_google
return { return {
{ "sindrets/diffview.nvim",
"folke/flash.nvim", --{ "mizlan/iswap.nvim", event = "VeryLazy" },
event = "VeryLazy", { "folke/todo-comments.nvim", dependencies = { "nvim-lua/plenary.nvim" } },
---@type Flash.Config {
opts = {}, "folke/flash.nvim",
event = "VeryLazy",
---@type Flash.Config
opts = {
jump = {
nohlsearch = true,
},
},
-- stylua: ignore -- stylua: ignore
keys = { keys = {
{ "s", mode = { "n", "x", "o" }, function() require("flash").jump() end, desc = "Flash" }, { "s", mode = { "n", "x", "o" }, function() require("flash").jump() end, desc = "Flash" },
{ "S", mode = { "n", "x", "o" }, function() require("flash").treesitter() end, desc = "Flash Treesitter" }, { "S", mode = { "n", "x", "o" }, function() require("flash").treesitter() end, desc = "Flash Treesitter" },
{ "r", mode = "o", function() require("flash").remote() end, desc = "Remote Flash" }, { "r", mode = "o", function() require("flash").remote() end, desc = "Remote Flash" },
{ "R", mode = { "o", "x" }, function() require("flash").treesitter_search() end, desc = "Treesitter Search" }, { "R", mode = { "o", "x" }, function() require("flash").treesitter_search() end, desc = "Treesitter Search" },
{ "<c-s>", mode = { "c" }, function() require("flash").toggle() end, desc = "Toggle Flash Search" }, { "<c-s>", mode = { "c" }, function() require("flash").toggle() end, desc = "Toggle Flash Search" },
}, },
}, },
"tikhomirov/vim-glsl", {
"sindrets/diffview.nvim", "MagicDuck/grug-far.nvim",
{ "folke/todo-comments.nvim", dependencies = { "nvim-lua/plenary.nvim" } }, config = function()
{ require("grug-far").setup({
"MagicDuck/grug-far.nvim", -- search and replace engines configuration
config = function() engines = {
require("grug-far").setup({ -- see https://github.com/BurntSushi/ripgrep
-- search and replace engines configuration ripgrep = {
engines = { -- ripgrep executable to use, can be a different path if you need to configure
-- see https://github.com/BurntSushi/ripgrep path = "rg",
ripgrep = { extraArgs = "--.",
-- ripgrep executable to use, can be a different path if you need to configure },
path = "rg", },
-- extraArgs = "-.", })
}, end,
}, },
})
end,
},
{
"shellRaining/hlchunk.nvim",
event = { "BufReadPre", "BufNewFile" },
opts = {
line_num = { enable = true },
chunk = {
enable = true,
priority = 15,
style = {
{ fg = "#393d4c" },
},
chars = {
horizontal_line = "",
-- vertical_line = "│",
vertical_line = "",
left_top = "",
left_bottom = "",
right_arrow = ">",
},
use_treesitter = true,
textobject = "",
max_file_size = 1024 * 1024,
error_sign = true,
-- animation related
duration = 0,
delay = 0,
},
},
},
"RRethy/vim-illuminate",
"kdheepak/lazygit.nvim",
"flwyd/vim-conjoin",
"rafcamlet/nvim-luapad",
"vim-scripts/vcscommand.vim",
"AndrewRadev/tagalong.vim",
"AndrewRadev/yankwin.vim",
{ "squk/gdrama-syntax.vim", ft = "gdrama" },
{ "nvim-lua/plenary.nvim", lazy = false },
{ "squk/java-syntax.vim", ft = "java" },
{ "udalov/kotlin-vim", event = "VeryLazy", ft = "kotlin" },
{ "andymass/vim-matchup", event = "VimEnter" },
{ "jghauser/mkdir.nvim", event = "BufWritePre" },
{
"rmagatti/auto-session",
dependencies = {
"nvim-telescope/telescope.nvim", -- Only needed if you want to use session lens
},
config = function()
require("auto-session").setup({
auto_session_suppress_dirs = { "~/", "~/Projects", "~/Downloads", "/" },
args_allow_single_directory = false,
bypass_save_filetypes = { "netrw" },
})
end,
},
"tpope/vim-abolish",
{
"johmsalas/text-case.nvim",
dependencies = { "nvim-telescope/telescope.nvim" },
config = function()
require("textcase").setup({})
require("telescope").load_extension("textcase")
end,
cmd = {
"Subs",
},
},
{
"NvChad/nvim-colorizer.lua",
ft = "lua",
config = function()
require("colorizer").setup()
end,
},
{
"andweeb/presence.nvim", {
cond = not use_google(), "shellRaining/hlchunk.nvim",
config = function() event = { "BufReadPre", "BufNewFile" },
require("presence").setup({ opts = {
main_image = "file", line_num = { enable = true },
show_time = false, chunk = {
}) enable = true,
end, priority = 15,
}, style = {
{ { fg = "#393d4c" },
"ntpeters/vim-better-whitespace", },
config = function() chars = {
vim.g.better_whitespace_filetypes_blacklist = { "dashboard" } horizontal_line = "",
end, -- vertical_line = "│",
}, vertical_line = "",
{ left_top = "",
"mbbill/undotree", left_bottom = "",
cmd = "UndotreeToggle", right_arrow = ">",
config = function() },
vim.g.undotree_SetFocusWhenToggle = 1 use_treesitter = true,
end, textobject = "",
max_file_size = 1024 * 1024,
error_sign = true,
-- animation related
duration = 0,
delay = 0,
},
},
},
{
"Bekaboo/dropbar.nvim",
-- optional, but required for fuzzy finder support
dependencies = {
"nvim-telescope/telescope-fzf-native.nvim",
},
config = function()
vim.ui.select = require("dropbar.utils.menu").select
end,
},
"RRethy/vim-illuminate",
"kdheepak/lazygit.nvim",
"flwyd/vim-conjoin",
"rafcamlet/nvim-luapad",
"vim-scripts/vcscommand.vim",
"AndrewRadev/tagalong.vim",
"AndrewRadev/yankwin.vim",
{ "squk/gdrama-syntax.vim", ft = "gdrama" },
{ "nvim-lua/plenary.nvim", lazy = false },
{ "squk/java-syntax.vim", ft = "java" },
{ "udalov/kotlin-vim", event = "VeryLazy", ft = "kotlin" },
{ "andymass/vim-matchup", event = "VimEnter" },
{ "jghauser/mkdir.nvim", event = "BufWritePre" },
{
"rmagatti/auto-session",
dependencies = {
"nvim-telescope/telescope.nvim", -- Only needed if you want to use session lens
},
config = function()
require("auto-session").setup({
auto_session_suppress_dirs = { "~/", "~/Projects", "~/Downloads", "/" },
args_allow_single_directory = false,
bypass_save_filetypes = { "netrw" },
})
end,
},
"tpope/vim-abolish",
{
"johmsalas/text-case.nvim",
dependencies = { "nvim-telescope/telescope.nvim" },
config = function()
require("textcase").setup({})
require("telescope").load_extension("textcase")
end,
cmd = {
"Subs",
},
-- stylua: ignore
keys = {
{ "<leader>tc", "<cmd>TextCaseOpenTelescope<CR>", mode = { "n", "v" }, desc = "Telescope" },
},
},
{
"NvChad/nvim-colorizer.lua",
ft = "lua",
config = function()
require("colorizer").setup()
end,
},
{
"andweeb/presence.nvim",
cond = not use_google(),
config = function()
require("presence").setup({
main_image = "file",
show_time = false,
})
end,
},
{
"ntpeters/vim-better-whitespace",
config = function()
vim.g.better_whitespace_filetypes_blacklist = { "dashboard" }
end,
},
{
"mbbill/undotree",
cmd = "UndotreeToggle",
config = function()
vim.g.undotree_SetFocusWhenToggle = 1
end,
-- stylua: ignore -- stylua: ignore
keys = { { "<leader>ut", ":UndotreeToggle<CR>" } }, keys = { { "<leader>ut", ":UndotreeToggle<CR>" } },
}, },
{ {
"stevearc/aerial.nvim", "stevearc/aerial.nvim",
opts = {}, opts = {},
cmd = { "AerialToggle", "AerialOn" }, cmd = { "AerialToggle", "AerialOn" },
-- stylua: ignore -- stylua: ignore
keys = { { "<leader>so", ":AerialToggle<CR>", desc = "[S]symbols [O]utline" } }, keys = { { "<leader>so", ":AerialToggle<CR>", desc = "[S]symbols [O]utline" } },
}, },
{ {
"andrewferrier/debugprint.nvim", "andrewferrier/debugprint.nvim",
opts = {}, opts = {},
-- Dependency only needed for NeoVim 0.8 -- Dependency only needed for NeoVim 0.8
dependencies = { dependencies = {
"nvim-treesitter/nvim-treesitter", "nvim-treesitter/nvim-treesitter",
}, },
-- Remove the following line to use development versions, -- Remove the following line to use development versions,
-- not just the formal releases -- not just the formal releases
version = "*", version = "*",
-- stylua: ignore -- stylua: ignore
keys = { keys = {
{ "<leader>dp", ":lua require('debugprint').debugprint()<cr>", desc = "Debug print" }, { "<leader>dp", ":lua require('debugprint').debugprint()<cr>", desc = "Debug print" },
@ -158,5 +177,5 @@ return {
{ "<leader>dq", ":lua require('debugprint').debugprint({variable = true})<cr>", desc = "Debug print" }, { "<leader>dq", ":lua require('debugprint').debugprint({variable = true})<cr>", desc = "Debug print" },
{ "<leader>dQ", ":lua require('debugprint').debugprint({variable = true, above = true})<cr>", desc = "Debug print", }, { "<leader>dQ", ":lua require('debugprint').debugprint({variable = true, above = true})<cr>", desc = "Debug print", },
}, },
}, },
} }

View File

@ -1,17 +0,0 @@
return {
"lommix/bevy_inspector.nvim",
dependencies = {
"nvim-telescope/telescope.nvim",
"nvim-lua/plenary.nvim",
},
config = function()
require("bevy_inspector").setup({})
end,
cmd = { "BevyInspect", "BevyInspectNamed", "BevyInspectQuery" },
-- stylua: ignore
keys = {
{ "<leader>bia", ":BevyInspect<Cr>", desc = "Lists all entities" },
{ "<leader>bin", ":BevyInspectNamed<Cr>", desc = "List all named entities" },
{ "<leader>biq", ":BevyInspectQuery<Cr>", desc = "Query a single component, continues to list all matching entities", },
},
}

View File

@ -1,30 +1,17 @@
return { return {
"LunarVim/bigfile.nvim", "LunarVim/bigfile.nvim",
opts = { opts = {
filesize = 2, -- size of the file in MiB, the plugin round file sizes to the closest MiB filesize = 2, -- size of the file in MiB, the plugin round file sizes to the closest MiB
pattern = function(bufnr, filesize_mib) pattern = { "*" }, -- autocmd pattern or function see <### Overriding the detection of big files>
-- you can't use `nvim_buf_line_count` because this runs on BufReadPre features = { -- features to disable
local file_contents = vim.fn.readfile(vim.api.nvim_buf_get_name(bufnr))
local file_lines = #file_contents
local filetype = vim.filetype.match({ buf = bufnr })
if filetype == "c" or filetype == "cpp" then
if file_lines > 1000 then
vim.b.codefmt_formatt = "" -- disable codefmt
vim.cmd(":FormatDisable") -- disable conform
return true
end
end
return filesize_mib > 1
end,
features = { -- features to disable
"indent_blankline", "indent_blankline",
"illuminate", "illuminate",
"lsp", "lsp",
"treesitter", "treesitter",
-- "syntax", "syntax",
"matchparen", "matchparen",
-- "vimopts", "vimopts",
-- "filetype", "filetype",
}, },
} }
} }

View File

@ -1,183 +0,0 @@
local use_google = require("utils").use_google
local flags = require("utils").flags
local kind_icons = {
-- LLM Provider icons
claude = "󰋦",
openai = "󱢆",
codestral = "󱎥",
gemini = "",
nvim_ciderlsp = "󱜚",
Groq = "",
Openrouter = "󱂇",
Ollama = "󰳆",
["Llama.cpp"] = "󰳆",
Deepseek = "",
}
return {
{
"saghen/blink.compat",
-- use the latest release, via version = '*', if you also use the latest release for blink.cmp
version = "*",
-- lazy.nvim will automatically load the plugin when it's required by blink.cmp
lazy = true,
cond = flags.blink,
-- make sure to set opts so that lazy.nvim calls blink.compat's setup
opts = {
impersonate_nvim_cmp = true,
debug = true,
},
},
{
"saghen/blink.cmp",
lazy = false, -- lazy loading handled internally
cond = flags.blink,
dependencies = {
"chrisgrieser/cmp-nerdfont",
"hrsh7th/cmp-nvim-lsp",
"mikavilpas/blink-ripgrep.nvim",
"moyiz/blink-emoji.nvim",
"rafamadriz/friendly-snippets", -- optional: provides snippets for the snippet source
"saghen/blink.compat",
},
version = "v0.*", -- use a release tag to download pre-built binaries
-- build = 'cargo build --release',
---@module 'blink.cmp'
---@type blink.cmp.Config
opts = {
-- stylua: ignore
keymap = {
preset = "none",
["<C-space>"] = { "show", "show_documentation", "hide_documentation" },
["<C-e>"] = { "hide", "fallback" },
["<CR>"] = { "accept", "fallback" },
["<Tab>"] = { "select_next", "snippet_forward", "accept", "fallback" },
["<S-Tab>"] = { "select_prev", "snippet_backward", "fallback" },
["<Up>"] = { "select_prev", "fallback" },
["<Down>"] = { "select_next", "fallback" },
["<S-Up>"] = { "scroll_documentation_up", "fallback" },
["<S-Down>"] = { "scroll_documentation_down", "fallback" },
},
appearance = {
use_nvim_cmp_as_default = true,
nerd_font_variant = "normal",
kind_icons = kind_icons,
},
sources = {
default = function(ctx)
local providerToEnable = {
"lsp",
"path",
"snippets",
"ripgrep",
"emoji",
"nerdfont",
"buffer",
"avante",
}
if use_google() then
table.insert(providerToEnable, "nvim_ciderlsp")
table.insert(providerToEnable, "buganizer")
-- table.insert(providerToEnable, "avante")
else
-- table.insert(providerToEnable, "avante")
table.insert(providerToEnable, "minuet")
end
return providerToEnable
end,
providers = {
lsp = { name = "LSP", module = "blink.cmp.sources.lsp", score_offset = 90 },
-- dont show LuaLS require statements when lazydev has items
lazydev = { name = "LazyDev", module = "lazydev.integrations.blink", fallbacks = { "lsp" } },
ripgrep = {
module = "blink-ripgrep",
name = "Ripgrep",
-- the options below are optional, some default values are shown
---@module "blink-ripgrep"
---@type blink-ripgrep.Options
opts = {
prefix_min_len = 3,
context_size = 5,
max_filesize = "1M",
additional_rg_options = {},
},
score_offset = 20, -- the higher the number, the higher the priority
},
-- https://github.com/moyiz/blink-emoji.nvim
emoji = {
module = "blink-emoji",
name = "Emoji",
score_offset = 1, -- the higher the number, the higher the priority
opts = { insert = true }, -- Insert emoji (default) or complete its name
},
buffer = {
name = "Buffer",
enabled = true,
max_items = 3,
module = "blink.cmp.sources.buffer",
min_keyword_length = 4,
score_offset = 15, -- the higher the number, the higher the priority
},
-- compat sources
nerdfont = {
name = "nerdfont",
module = "blink.compat.source",
score_offset = 1, -- the higher the number, the higher the priority
},
minuet = {
name = "minuet",
module = "minuet.blink",
score_offset = 100, -- Gives minuet higher priority among suggestions
},
-- avante = {
-- module = "blink-cmp-avante",
-- name = "Avante",
-- opts = {
-- -- options for blink-cmp-avante
-- },
-- },
nvim_ciderlsp = {
name = "nvim_ciderlsp",
module = "blink.compat.source",
score_offset = 100,
},
buganizer = {
name = "nvim_buganizer",
module = "blink.compat.source",
},
},
},
-- experimental signature help support
signature = { enabled = true },
completion = {
-- Recommended to avoid unnecessary request
trigger = { prefetch_on_insert = false },
list = {
-- stylua: ignore
selection = {
preselect = function(ctx) return ctx.mode ~= 'cmdline' end,
auto_insert = function(ctx) return ctx.mode ~= 'cmdline' end,
},
},
documentation = {
auto_show = true,
},
-- Displays a preview of the selected item on the current line
ghost_text = {
enabled = true,
},
trigger = {
show_on_x_blocked_trigger_characters = { "'", '"', "(", "{" },
},
},
},
-- allows extending the providers array elsewhere in your config
-- without having to redefine it
opts_extend = { "sources.default" },
},
}

View File

@ -2,29 +2,41 @@ return {
{ {
"akinsho/bufferline.nvim", "akinsho/bufferline.nvim",
version = "*", version = "*",
dependencies = { "nvim-tree/nvim-web-devicons" }, dependencies = "nvim-tree/nvim-web-devicons",
opts = { config = function()
options = { vim.opt.termguicolors = true
separator_style = "slope", require("bufferline").setup({
-- offsets = { { options = {
-- filetype = "neo-tree", hover = {
-- text = "NeoTree", enabled = true,
-- highlight = "Directory", delay = 200,
-- separator = true, -- use a "true" to enable the default, or set your own character reveal = { "close" },
-- }, }, },
mode = "tabs", indicator = {
diagnostics = "nvim_lsp", -- icon = "▎", -- this should be omitted if indicator style is not 'icon'
-- diagnostics_indicator = function(count, level, diagnostics_dict, context) style = "icon", -- | 'underline' | 'none',
-- local symbols = { error = " ", warning = " ", info = " ", hint = "󱠂 " } },
-- local icon = symbols[level] or level offsets = {
-- return "" .. icon .. count {
-- end, filetype = "NvimTree",
max_name_length = 30, text = "File Explorer",
tab_size = 27, highlight = "Directory",
truncate_name = false, separator = true, -- use a "true" to enable the default, or set your own character
show_close_icon = false, },
show_buffer_close_icons = false, },
}, mode = "tabs",
}, diagnostics = "nvim_lsp",
diagnostics_indicator = function(count, level, diagnostics_dict, context)
local symbols = { error = "", warning = "", info = "", hint = "󱠂 " }
local icon = symbols[level] or level
return "" .. icon .. count
end,
max_name_length = 30,
truncate_name = false,
show_close_icon = false,
show_buffer_close_icons = false,
},
})
end,
}, },
} }

View File

@ -1,12 +1,24 @@
local use_google = require("utils").use_google local use_google = require("utils").use_google
local flags = require("utils").flags
local function compare_by_ciderlsp_score(entry1, entry2)
if entry1.completion_item.score ~= nil and entry2.completion_item.score ~= nil then
print("LSP score " .. entry1.completion_item.score)
print("LSP score " .. entry2.completion_item.score)
return entry1.completion_item.score > entry2.completion_item.score
end
end
local has_words_before = function()
local line, col = unpack(vim.api.nvim_win_get_cursor(0))
return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil
end
return { return {
{ {
"hrsh7th/nvim-cmp", "hrsh7th/nvim-cmp",
event = { "InsertEnter", "CmdlineEnter" }, event = { "InsertEnter", "CmdlineEnter" },
cond = not flags.blink,
dependencies = { dependencies = {
"Exafunction/codeium.nvim",
"FelipeLema/cmp-async-path", "FelipeLema/cmp-async-path",
"amarakon/nvim-cmp-buffer-lines", "amarakon/nvim-cmp-buffer-lines",
"chrisgrieser/cmp-nerdfont", "chrisgrieser/cmp-nerdfont",
@ -29,8 +41,6 @@ return {
vim.opt.completeopt = { "menu", "menuone", "noselect" } vim.opt.completeopt = { "menu", "menuone", "noselect" }
local cmp = require("cmp") local cmp = require("cmp")
local luasnip = require("luasnip")
local compare = cmp.config.compare local compare = cmp.config.compare
local conditionalSources = {} local conditionalSources = {}
@ -38,6 +48,8 @@ return {
if use_google() then if use_google() then
table.insert(conditionalSources, { name = "nvim_ciderlsp", priority = 8 }) table.insert(conditionalSources, { name = "nvim_ciderlsp", priority = 8 })
table.insert(conditionalSources, { name = "buganizer", option = { notifications_enabled = true } }) table.insert(conditionalSources, { name = "buganizer", option = { notifications_enabled = true } })
else
table.insert(conditionalSources, { name = "codeium", priority = 8 })
end end
local lspkind = require("lspkind") local lspkind = require("lspkind")
@ -114,6 +126,7 @@ return {
async_path = " path", async_path = " path",
buffer = " Buf", buffer = " Buf",
cmdline = " cmd", cmdline = " cmd",
codeium = "󰚩 Codeium",
crates = " rust", crates = " rust",
luasnip = " snip", luasnip = " snip",
buganizer = " Buganizer", buganizer = " Buganizer",

View File

@ -0,0 +1,17 @@
local use_google = require("utils").use_google
return {
{
"Exafunction/codeium.nvim",
-- commit = "b1ff0d6c993e3d87a4362d2ccd6c660f7444599f",
event = "VeryLazy",
-- event = "InsertEnter",
cond = not use_google(),
dependencies = {
"nvim-lua/plenary.nvim",
"hrsh7th/nvim-cmp",
},
config = function()
require("codeium").setup({})
end,
},
}

View File

@ -1,89 +1,69 @@
local use_google = require("utils").use_google local use_google = require("utils").use_google
if use_google() then
return {}
end
vim.g.disable_autoformat = false
vim.api.nvim_create_user_command("FormatDisable", function(args)
if args.bang then
-- FormatDisable! will disable formatting just for this buffer
vim.b.disable_autoformat = true
else
vim.g.disable_autoformat = true
end
end, {
desc = "Disable autoformat-on-save",
bang = true,
})
vim.api.nvim_create_user_command("FormatEnable", function()
vim.b.disable_autoformat = false
vim.g.disable_autoformat = false
end, {
desc = "Re-enable autoformat-on-save",
})
return { return {
{ {
"stevearc/conform.nvim", "stevearc/conform.nvim",
event = { "BufWritePre" }, event = { "BufWritePre" },
cmd = { "ConformInfo", "FormatDisable", "FormatEnable" }, cmd = { "ConformInfo", "Format", "FormatDisable", "FormatEnable" },
keys = { keys = {
-- stylua: ignore -- stylua: ignore
{ "<leader>fmt", function() require("conform").format({ async = true, lsp_fallback = true }) end, mode = "", desc = "Format buffer", }, { "<leader>fmt", function() require("conform").format({ async = true, lsp_fallback = true }) end, mode = "", desc = "Format buffer", },
{ "<leader>fj", ":%!python -m json.tool" }, },
}, opts = {
config = function() formatters_by_ft = {
vim.g.disable_autoformat = false rust = { "rustfmt", lsp_format = "fallback" },
vim.api.nvim_create_user_command("FormatDisable", function(args) -- Conform will run multiple formatters sequentially
if args.bang then -- go = { "goimports", "gofmt" },
-- FormatDisable! will disable formatting just for this buffer -- Use a sub-list to run only the first available formatter
vim.b.disable_autoformat = true -- javascript = { { "prettierd", "prettier" } },
else lua = { "stylua" },
vim.g.disable_autoformat = true -- Conform will run multiple formatters sequentially
end python = { "isort", "black" },
end, { -- Use a sub-list to run only the first available formatter
desc = "Disable autoformat-on-save", javascript = { { "prettierd", "prettier" } },
bang = true, gdscript = { "gdformat" },
}) dashboard = {},
vim.api.nvim_create_user_command("FormatEnable", function() -- Use the "*" filetype to run formatters on all filetypes.
vim.b.disable_autoformat = false ["*"] = { "codespell" },
vim.g.disable_autoformat = false -- Use the "_" filetype to run formatters on filetypes that don't
end, { -- have other formatters configured.
desc = "Re-enable autoformat-on-save", ["_"] = { "trim_whitespace" },
}) },
format_on_save = function(bufnr)
vim.api.nvim_create_autocmd("BufWritePre", { -- Disable with a global or buffer-local variable
pattern = "*", if vim.g.disable_autoformat or vim.b[bufnr].disable_autoformat then
callback = function(args) return
if vim.g.disable_autoformat or vim.b[args.buf].disable_autoformat then end
return return { timeout_ms = 500, lsp_format = "fallback" }
end end,
require("conform").format({ bufnr = args.buf }) formatters = {
end, gdformat = {
}) prepend_args = { "-l", "100" },
},
vim.api.nvim_create_user_command("Format", function(args) },
local range = nil },
if args.count ~= -1 then },
local end_line = vim.api.nvim_buf_get_lines(0, args.line2 - 1, args.line2, true)[1]
range = {
start = { args.line1, 0 },
["end"] = { args.line2, end_line:len() },
}
end
require("conform").format({ async = true })
end, { range = true })
require("conform").setup(
{
log_level = vim.log.levels.DEBUG,
formatters_by_ft = {
rust = { "rustfmt" },
-- Conform will run multiple formatters sequentially
-- go = { "goimports", "gofmt" },
-- Use a sub-list to run only the first available formatter
lua = { "stylua" },
-- Conform will run multiple formatters sequentially
python = { "isort" },
-- Use a sub-list to run only the first available formatter
javascript = { "prettier" },
gdscript = { "gdformat" },
ron = { "ronfmt" },
dashboard = {},
-- Use the "*" filetype to run formatters on all filetypes.
-- ["*"] = { "codespell" },
-- Use the "_" filetype to run formatters on filetypes that don't
-- have other formatters configured.
["_"] = { "trim_whitespace" },
},
formatters = {
-- ronfmt = {
-- command = "ronfmt",
-- args = { "-d", "$FILENAME" },
-- },
gdformat = {
prepend_args = { "-l", "100" },
},
},
})
end,
},
} }

View File

@ -42,6 +42,6 @@ return {
}, },
}) })
end, end,
-- keys = { { "<C-Space>", ":Dashboard<CR>" } }, keys = { { "<C-Space>", ":Dashboard<CR>" } },
dependencies = { { "nvim-tree/nvim-web-devicons" } }, dependencies = { { "nvim-tree/nvim-web-devicons" } },
} }

View File

@ -1,6 +0,0 @@
return {
-- {
-- "squk/google3.nvim",
-- dev = true,
-- },
}

View File

@ -1,20 +1,6 @@
-- disable underline -- disable underline
local use_google = require("utils").use_google
vim.diagnostic.handlers.underline.show = function() end vim.diagnostic.handlers.underline.show = function() end
local signs = {
Error = "",
Warning = "",
Warn = "",
Hint = "",
Info = "",
Other = "",
}
for type, icon in pairs(signs) do
local hl = "DiagnosticSign" .. type
vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = hl })
end
return { return {
{ {
"folke/trouble.nvim", "folke/trouble.nvim",
@ -25,48 +11,32 @@ return {
use_diagnostic_signs = true, -- enabling this will use the signs defined in your lsp client use_diagnostic_signs = true, -- enabling this will use the signs defined in your lsp client
}) })
end, end,
-- stylua: ignore
keys = { keys = {
{ "<leader>xt", ":Telescope diagnostics<CR>" }, { "<leader>xt", "<cmd>:Telescope diagnostics<CR>" },
{ "gr", ":Telescope lsp_references<CR>" }, { "gr", ":Telescope lsp_references<CR>" },
{ "<leader>xd", ":Trouble diagnostics toggle <CR>" }, { "<leader>xd", ":Trouble<CR>" },
{ "<leader>xbd", ":Trouble diagnostics toggle filter.buf=0<CR>" }, { "[g", "<cmd>lua vim.diagnostic.goto_prev()<CR>" },
{ "<leader>xe", ":Trouble diagnostics toggle filter.severity=vim.diagnostic.severity.ERROR<CR>" }, { "]g", "<cmd>lua vim.diagnostic.goto_next()<CR>" },
{ "[g", ":lua vim.diagnostic.goto_prev()<CR>" },
{ "]g", ":lua vim.diagnostic.goto_next()<CR>" },
}, },
}, },
{ {
"rachartier/tiny-inline-diagnostic.nvim", "Maan2003/lsp_lines.nvim",
event = "LspAttach",
priority = 1000, -- needs to be loaded in first
cond = not use_google(),
config = function()
vim.diagnostic.config({ virtual_text = false })
require("tiny-inline-diagnostic").setup({
preset = "classic", -- Can be: "modern", "classic", "minimal", "powerline", ghost", "simple", "nonerdfont", "amongus"
-- Show the source of the diagnostic.
show_source = false,
-- Use your defined signs in the diagnostic config table.
use_icons_from_diagnostic = true,
-- Enable diagnostic message on all lines.
multilines = true,
-- Show all diagnostics on the cursor line.
show_all_diags_on_cursorline = false,
})
end,
},
{
"ErichDonGubler/lsp_lines.nvim",
event = { "LspAttach" }, event = { "LspAttach" },
name = "lsp_lines.nvim", name = "lsp_lines.nvim",
cond = use_google(),
config = function() config = function()
local signs = {
Error = "",
Warning = "",
Warn = "",
Hint = "",
Info = "",
Other = "",
}
for type, icon in pairs(signs) do
local hl = "DiagnosticSign" .. type
vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = hl })
end
require("lsp_lines").setup() require("lsp_lines").setup()
-- vim.schedule(function() -- vim.schedule(function()

View File

@ -11,6 +11,10 @@ local glugOpts = require("glug").glugOpts
local superlazy = require("nvgoog.util.superlazy") local superlazy = require("nvgoog.util.superlazy")
return { return {
-- { url = "sso://user/fentanes/nvgoog" },
-- Prevent long sessions from losing cwd
-- Load google paths like //google/* with `gf`
-- { import = "nvgoog.google.misc" },
{ import = "nvgoog.google.format" }, { import = "nvgoog.google.format" },
-- maktaba is required by all google plugins -- maktaba is required by all google plugins
glug("maktaba", { glug("maktaba", {
@ -23,9 +27,14 @@ return {
glug("googler", { glug("googler", {
event = "VeryLazy", event = "VeryLazy",
}), }),
glug("core"),
glug("glaive"), glug("glaive"),
glug("alert"), glug("alert"),
glug("csearch"),
glug("languages"),
glug("googlespell"), glug("googlespell"),
-- Enable logmsgs ASAP to avoid maktaba's log message queue filling up
glug("google-logo"),
-- Add support for google filetypes -- Add support for google filetypes
glug("google-filetypes", { event = { "BufReadPre", "BufNewFile" }, dependencies = {} }), glug("google-filetypes", { event = { "BufReadPre", "BufNewFile" }, dependencies = {} }),
@ -38,7 +47,8 @@ return {
glug("googlepaths"), glug("googlepaths"),
-- Set up syntax, indent, and core settings for various filetypes -- Set up syntax, indent, and core settings for various filetypes
superlazy(glug("ft-cpp", { event = "BufRead,BufNewFile *.[ch],*.cc,*.cpp" })), superlazy(glug("ft-cpp", { event = "BufRead,BufNewFile *.[ch],*.cc,*.cpp" })),
superlazy(glug("ft-go", { event = "BufRead,BufNewFile *.go" })), -- superlazy(glug("ft-go", { event = "BufRead,BufNewFile *.go" })),
superlazy(glug("ft-gcl", { event = "BufRead,BufNewFile *.gcl" })),
superlazy(glug("ft-java", { event = "BufRead,BufNewFile *.java" })), superlazy(glug("ft-java", { event = "BufRead,BufNewFile *.java" })),
superlazy(glug("ft-javascript", { event = "BufRead,BufNewFile *.js,*.jsx" })), superlazy(glug("ft-javascript", { event = "BufRead,BufNewFile *.js,*.jsx" })),
superlazy(glug("ft-kotlin", { event = "BufRead,BufNewFile *.kt,*.kts" })), superlazy(glug("ft-kotlin", { event = "BufRead,BufNewFile *.kt,*.kts" })),
@ -74,13 +84,13 @@ return {
}, },
}), }),
glug("relatedfiles", { glug("relatedfiles", {
-- stylua: ignore -- stylua: ignore
keys = { keys = {
{ "<leader>rb", ":exec relatedfiles#selector#JumpToBuild()<CR>" }, { "<leader>rb", ":exec relatedfiles#selector#JumpToBuild()<CR>" },
{ "<leader>rt", ":exec relatedfiles#selector#JumpToTestFile()<CR>" }, { "<leader>rt", ":exec relatedfiles#selector#JumpToTestFile()<CR>" },
{ "<leader>rh", ":exec relatedfiles#selector#JumpToHeader()<CR>" }, { "<leader>rh", ":exec relatedfiles#selector#JumpToHeader()<CR>" },
{ "<leader>rc", ":exec relatedfiles#selector#JumpToCodeFile()<CR>" }, { "<leader>rc", ":exec relatedfiles#selector#JumpToCodeFile()<CR>" },
}, },
}), }),
{ "junegunn/fzf", dir = "~/.fzf", build = "./install --all" }, { "junegunn/fzf", dir = "~/.fzf", build = "./install --all" },
{ "junegunn/fzf.vim", dependencies = { "junegunn/fzf" } }, { "junegunn/fzf.vim", dependencies = { "junegunn/fzf" } },
@ -172,6 +182,9 @@ return {
"BlazeDebugFinish", "BlazeDebugFinish",
"BlazeDepsUpdate", "BlazeDepsUpdate",
}, },
config = function()
require("config.blaze")
end,
keys = function() keys = function()
local function runCommandWithTarget(cmd) local function runCommandWithTarget(cmd)
return function() return function()
@ -222,12 +235,12 @@ return {
}, },
cmd = { "ImpSuggest", "ImpFirst" }, cmd = { "ImpSuggest", "ImpFirst" },
keys = { keys = {
{ "<leader>I", ":ImpSuggest <C-r><C-w><cr>" }, { "<leader>i", ":ImpSuggest <C-r><C-w><cr>" },
}, },
}), }),
{ {
url = "sso://user/fentanes/googlepaths.nvim", url = "sso://user/fentanes/googlepaths.nvim",
event = { "VeryLazy", "BufReadCmd //*", "BufReadCmd google3/*" }, event = { "VeryLazy", "BufReadCmd //*" },
opts = {}, opts = {},
}, },
{ {
@ -238,31 +251,28 @@ return {
name = "cmp-nvim-ciderlsp", name = "cmp-nvim-ciderlsp",
url = "sso://googler@user/piloto/cmp-nvim-ciderlsp", url = "sso://googler@user/piloto/cmp-nvim-ciderlsp",
event = "VimEnter", event = "VimEnter",
dependencies = {
"hrsh7th/nvim-cmp",
},
}, },
{ {
name = "ciderlsp-nvim", name = "ciderlsp-nvim",
url = "sso://googler@user/kdark/ciderlsp-nvim", url = "sso://googler@user/kdark/ciderlsp-nvim",
event = "VimEnter", event = "VimEnter",
}, dependencies = {
{ "hrsh7th/nvim-cmp",
url = "sso://user/jackcogdill/nvim-figtree",
keys = {
{
"<Leader>ft",
function()
require("figtree").toggle()
end,
},
},
opts = {
-- see |figtree-configuration| for all possible options
}, },
}, },
-- {
-- name = "nvim_figtree",
-- url = "sso://googler@user/jackcogdill/nvim-figtree",
-- },
{ {
name = "telescope_codesearch", name = "telescope_codesearch",
url = "sso://googler@user/vintharas/telescope-codesearch.nvim", url = "sso://googler@user/vintharas/telescope-codesearch.nvim",
dependencies = { "nvim-telescope/telescope.nvim" }, dependencies = { "nvim-telescope/telescope.nvim" },
config = function() end, config = function()
end,
}, },
{ {
name = "telescope_citc", name = "telescope_citc",
@ -286,6 +296,8 @@ return {
}, },
-- here are some mappings you might want: -- here are some mappings you might want:
keys = { keys = {
{ "]c", ":CritiqueGotoNextComment<CR>" },
{ "[c", ":CritiqueGotoPrevComment<CR>" },
{ "<Leader>lc", ":CritiqueToggleLineComment<CR>" }, { "<Leader>lc", ":CritiqueToggleLineComment<CR>" },
{ "<Leader>ac", ":CritiqueToggleAllComments<CR>" }, { "<Leader>ac", ":CritiqueToggleAllComments<CR>" },
{ "<Leader>uc", ":CritiqueToggleUnresolvedComments<CR>" }, { "<Leader>uc", ":CritiqueToggleUnresolvedComments<CR>" },
@ -316,6 +328,7 @@ return {
url = "sso://googler@user/smwang/hg.nvim", url = "sso://googler@user/smwang/hg.nvim",
dependencies = { "ipod825/libp.nvim" }, dependencies = { "ipod825/libp.nvim" },
config = function() config = function()
require("config.fig")
require("hg").setup() require("hg").setup()
end, end,
}, },

View File

@ -0,0 +1,81 @@
return {
"theprimeagen/harpoon",
branch = "harpoon2",
dependencies = {
"nvim-lua/plenary.nvim",
"nvim-telescope/telescope.nvim",
},
config = function()
local harpoon = require("harpoon")
-- REQUIRED
harpoon:setup()
-- REQUIRED
vim.keymap.set("n", "<leader>m", function()
harpoon:list():add()
end)
vim.keymap.set("n", "<leader>M", function()
harpoon.ui:toggle_quick_menu(harpoon:list())
end)
vim.keymap.set("n", "<leader>1", function()
harpoon:list():select(1)
end)
vim.keymap.set("n", "<leader>2", function()
harpoon:list():select(2)
end)
vim.keymap.set("n", "<leader>3", function()
harpoon:list():select(3)
end)
vim.keymap.set("n", "<leader>4", function()
harpoon:list():select(4)
end)
-- Toggle previous & next buffers stored within Harpoon list
vim.keymap.set("n", "<C-S-P>", function()
harpoon:list():prev()
end)
vim.keymap.set("n", "<C-S-N>", function()
harpoon:list():next()
end)
-- basic telescope configuration
local conf = require("telescope.config").values
local function toggle_telescope(harpoon_files)
local file_paths = {}
for _, item in ipairs(harpoon_files.items) do
table.insert(file_paths, item.value)
end
require("telescope.pickers")
.new({}, {
prompt_title = "Harpoon",
finder = require("telescope.finders").new_table({
results = file_paths,
}),
previewer = conf.file_previewer({}),
sorter = conf.generic_sorter({}),
})
:find()
end
vim.keymap.set("n", "<leader>h", function()
toggle_telescope(harpoon:list())
end, { desc = "Open harpoon window" })
end,
-- stylua: ignore
-- keys = {
-- -- Mark current file
-- { "<leader>m", ":lua require('harpoon').mark_file()<CR>" },
--
-- -- Go to marks tracker (editable, use `gf` to go to file under cursor)
-- { "<leader>M", "lua require('lasso').open_marks_tracker()<CR>" },
--
-- -- Jump to n-th marked file (n-th line of marks tracker)
-- { "<leader>1", "lua require('lasso').open_marked_file(1)<CR>" },
-- { "<leader>2", "lua require('lasso').open_marked_file(2)<CR>" },
-- { "<leader>3", "lua require('lasso').open_marked_file(3)<CR>" },
-- { "<leader>4", "lua require('lasso').open_marked_file(4)<CR>" },
-- },
}

View File

@ -1,11 +0,0 @@
return {
"folke/lazydev.nvim",
ft = "lua", -- only load on lua files
opts = {
library = {
-- See the configuration section for more details
-- Load luvit types when the `vim.uv` word is found
{ path = "${3rd}/luv/library", words = { "vim%.uv" } },
},
},
}

View File

@ -0,0 +1,6 @@
return {
"ggandor/leap.nvim",
config = function()
require("leap").add_default_mappings()
end,
}

View File

@ -1,60 +1,82 @@
local use_google = require("utils").use_google local use_google = require("utils").use_google
local flags = require("utils").flags
local function add_import()
vim.lsp.buf.code_action({
apply = true,
context = {
only = { "quickfix.addImports" },
},
})
end
return { return {
{ {
"kosayoda/nvim-lightbulb", "ray-x/lsp_signature.nvim",
event = "VeryLazy",
opts = {
floating_window = true,
hint_prefix = "󰡱 ",
},
config = function(_, opts)
require("lsp_signature").setup(opts)
end,
},
{
"luozhiya/lsp-virtual-improved.nvim",
event = { "LspAttach" },
config = function()
require("lsp-virtual-improved").setup()
end,
},
{
"kosayoda/nvim-lightbulb",
commit = "1cae7b7153ae98dcf1b11173a443ac1b6d8e3d49", commit = "1cae7b7153ae98dcf1b11173a443ac1b6d8e3d49",
event = { "LspAttach" }, event = { "LspAttach" },
opts = { opts = {
autocmd = { enabled = true }, autocmd = { enabled = true },
virtual_text = { virtual_text = {
enabled = true, enabled = true,
text = " 󱐋", text = " 󱐋",
hl = "DiagnosticWarn", hl = "DiagnosticWarn",
}, },
sign = { enabled = false }, sign = { enabled = false },
}, },
}, },
{ {
"L3MON4D3/LuaSnip", "L3MON4D3/LuaSnip",
build = "make install_jsregexp", build = "make install_jsregexp",
config = function() config = function()
require("luasnip.loaders.from_vscode").lazy_load() require("luasnip.loaders.from_vscode").lazy_load()
end, end,
dependencies = { "rafamadriz/friendly-snippets" }, dependencies = { "rafamadriz/friendly-snippets" },
}, },
{ {
"ray-x/go.nvim", "hinell/lsp-timeout.nvim",
dependencies = { -- optional packages event = { "LspAttach" },
"ray-x/guihua.lua", dependencies = { "neovim/nvim-lspconfig" },
"neovim/nvim-lspconfig", -- cond = not use_google(),
"nvim-treesitter/nvim-treesitter", config = function()
}, vim.g.lspTimeoutConfig = {
-- cond = not use_google(), filetypes = {
config = function() ignore = { -- filetypes to ignore; empty by default
local capabilities = flags.blink "gdscript",
and require("blink.cmp").get_lsp_capabilities(vim.lsp.protocol.make_client_capabilities()) "rust",
or require("cmp_nvim_lsp").default_capabilities(vim.lsp.protocol.make_client_capabilities()) }, -- for these filetypes
capabilities.offsetEncoding = { "utf-16" } },
require("go").setup({ }
lsp_cfg = { capabilities = capabilities }, end,
lsp_keymaps = false, },
lsp_inlay_hints = { {
enable = not use_google(), -- doesn't work with ciderlsp "ray-x/go.nvim",
}, dependencies = { -- optional packages
}) "ray-x/guihua.lua",
-- Run gofmt + goimports on save "neovim/nvim-lspconfig",
"nvim-treesitter/nvim-treesitter",
},
-- cond = not use_google(),
config = function()
local capabilities =
require("cmp_nvim_lsp").default_capabilities(vim.lsp.protocol.make_client_capabilities())
capabilities.offsetEncoding = { "utf-16" }
require("go").setup({
lsp_cfg = { capabilities = capabilities },
lsp_keymaps = false,
lsp_inlay_hints = {
enable = not use_google(), -- doesn't work with ciderlsp
},
})
-- Run gofmt + goimports on save
local format_sync_grp = vim.api.nvim_create_augroup("goimports", {}) local format_sync_grp = vim.api.nvim_create_augroup("goimports", {})
vim.api.nvim_create_autocmd("BufWritePre", { vim.api.nvim_create_autocmd("BufWritePre", {
@ -65,6 +87,7 @@ return {
group = format_sync_grp, group = format_sync_grp,
}) })
end, end,
event = { "CmdlineEnter" },
ft = { "go", "gomod" }, ft = { "go", "gomod" },
build = ':lua require("go.install").update_all_sync()', -- if you need to install/update all binaries build = ':lua require("go.install").update_all_sync()', -- if you need to install/update all binaries
}, },
@ -72,69 +95,49 @@ return {
"neovim/nvim-lspconfig", "neovim/nvim-lspconfig",
dependencies = { dependencies = {
"hrsh7th/nvim-cmp", "hrsh7th/nvim-cmp",
"saghen/blink.cmp",
"saghen/blink.compat",
"nvim-lua/lsp-status.nvim", "nvim-lua/lsp-status.nvim",
"VonHeikemen/lsp-zero.nvim", "VonHeikemen/lsp-zero.nvim",
}, },
-- stylua: ignore
keys = { keys = {
{ "<leader>F", ":lua vim.lsp.buf.format()<CR>" }, { "<leader>F", "<cmd>lua vim.lsp.buf.format()<CR>" },
{ "<leader>i", add_import },
{ "<leader>rn", ":lua vim.lsp.buf.rename()<CR>" }, { "<leader>rn", "<cmd>lua vim.lsp.buf.rename()<CR>" },
{ "L", ":lua vim.lsp.buf.hover()<CR>" }, { "L", "<cmd>lua vim.lsp.buf.hover()<CR>" },
{ "gr", ":Telescope lsp_references<CR>" }, { "gr", "<Cmd>Telescope lsp_references<CR>" },
{ "gd", ":lua vim.lsp.buf.definition()<CR>" }, { "gd", "<cmd>Telescope lsp_definitions<CR>" },
-- { "gd", "<cmd>Telescope lsp_definitions<CR>" }, { "gD", "<cmd>tab split | lua vim.lsp.buf.definition()<CR>" },
{ "gD", ":tab split | lua vim.lsp.buf.definition()<CR>" }, { "gi", "<cmd>lua vim.lsp.buf.implementation()<CR>" },
{ "gi", ":lua vim.lsp.buf.implementation()<CR>" }, { "gI", "<cmd>lua vim.lsp.buf.implementation()<CR>" },
{ "gI", ":lua vim.lsp.buf.implementation()<CR>" }, { "gR", "<cmd>lua vim.lsp.buf.references()<CR>" },
{ "gR", ":lua vim.lsp.buf.references()<CR>" }, { "gt", "<cmd>lua vim.lsp.buf.type_definition()<CR>" },
{ "gt", ":lua vim.lsp.buf.type_definition()<CR>" }, { "<C-g>", "<cmd>lua vim.lsp.buf.signature_help()<CR>" },
{ "<C-g>", ":lua vim.lsp.buf.signature_help()<CR>" }, { "<C-g>", "<cmd>lua vim.lsp.buf.signature_help()<CR>", mode = "i" },
{ "<C-g>", ":lua vim.lsp.buf.signature_help()<CR>", mode = "i" },
}, },
config = function() config = function()
local lsp_status = require("lsp-status")
lsp_status.register_progress()
vim.opt.spell = true
vim.opt.spelllang = { "en_us" }
local capabilities =
require("cmp_nvim_lsp").default_capabilities(vim.lsp.protocol.make_client_capabilities())
capabilities = vim.tbl_extend("keep", capabilities or {}, lsp_status.capabilities)
capabilities.offsetEncoding = { "utf-16" }
local lspconfig = require("lspconfig") local lspconfig = require("lspconfig")
local lsp_configs = require("lspconfig.configs") local configs = require("lspconfig.configs")
require("config.lsp-google").setup(capabilities)
lsp_configs.ciderlsp = { -- Godot
default_config = { lspconfig.gdscript.setup({
cmd = { -- flags = {
"/google/bin/releases/cider/ciderlsp/ciderlsp", -- debounce_text_changes = 2000, -- Wait 5 seconds before sending didChange
"--tooltag=nvim-lsp", -- },
"--noforward_sync_responses", })
}, vim.cmd([[autocmd FileType gdscript setlocal commentstring=#\ %s]])
filetypes = { vim.cmd([[autocmd FileType gdscript setlocal autoindent noexpandtab tabstop=4 shiftwidth=4]])
"c", end,
"cpp", },
"java",
"kotlin",
"objc",
"proto",
"textproto",
"go",
"python",
"bzl",
"typescript",
},
offset_encoding = "utf-8",
root_dir = lspconfig.util.root_pattern(".citc"),
settings = {},
},
}
if use_google() then
lspconfig.ciderlsp.setup({})
end
lspconfig.gdscript.setup({})
-- require('lspconfig').gdscript.setup { cmd = { "ncat", "localhost", "6005" }, root_dir = function()
-- return vim.fs.dirname(vim.fs.find('project.godot', { upward = true })[1])
-- end
-- }
vim.cmd([[autocmd FileType gdscript setlocal commentstring=#\ %s]])
vim.cmd([[autocmd FileType gdscript setlocal autoindent noexpandtab tabstop=4 shiftwidth=4 wrap]])
end,
},
} }

View File

@ -1,41 +1,84 @@
return { local split = function(inputstr, sep)
"nvim-lualine/lualine.nvim", local t = {}
lazy = false, for str in string.gmatch(inputstr, "([^" .. sep .. "]+)") do
config = function() table.insert(t, str)
local lsp_status = require("lsp-status") end
return t
end
local function getCitc()
local fname = vim.api.nvim_buf_get_name(0)
if string.find(fname, "/google/src/cloud/", 1, true) then
local parts = split(fname, "/")
return parts[5]
end
end
local function isCiderLspAttached()
if vim.b["is_cider_lsp_attached"] then
if vim.b["is_cider_lsp_attached"] == "yes" then
return ""
else
return "x"
end
else
return ""
end
end
require("lualine").setup({ local function getLightbulb()
options = { return require("nvim-lightbulb").get_status_text()
theme = "auto", end
globalstatus = false,
refresh = { local function getLGTMs()
statusline = 100, local comments = require("google.comments")
tabline = 100, local tracker = require("google.comments.tracker")
winbar = 100, local dump = require("utils").dump
},
}, print(dump(tracker.get_all_comments()))
sections = { local lgtm = comments.get_lgtms()
lualine_a = { "mode" }, local appr = comments.get_approvals()
lualine_b = { "branch", "diff" }, print("lgtms" .. dump(lgtm))
lualine_c = { print("approvals" .. dump(appr))
require("nvim-lightbulb").get_status_text, return "LGTM:" .. table.concat(lgtm, ",") .. " Approval:" .. table.concat(appr, ",")
{ end
"filename",
path = 4, -- 0 = just filename, 1 = relative path, 2 = absolute path return {
}, "nvim-lualine/lualine.nvim",
}, lazy = false,
lualine_x = { config = function()
"", local lsp_status = require("lsp-status")
{
"diagnostics", require("lualine").setup({
sources = { "nvim_lsp" }, options = {
symbols = { error = "", warn = "", info = "", hint = "" }, theme = "auto",
}, globalstatus = false,
"filetype", refresh = {
}, statusline = 1000,
lualine_y = { "progress" }, -- tabline = 1000,
lualine_z = { "location" }, winbar = 1000,
}, },
}) },
end, sections = {
lualine_a = { "mode" },
lualine_b = { "branch", "diff", getCitc, isCiderLspAttached },
lualine_c = {
getLightbulb,
{
"filename",
path = 4, -- 0 = just filename, 1 = relative path, 2 = absolute path
},
},
lualine_x = {
"",
{
"diagnostics",
sources = { "nvim_lsp" },
symbols = { error = "", warn = "", info = "", hint = "" },
},
"filetype",
},
lualine_y = { "progress" },
lualine_z = { "location" },
},
})
end,
} }

View File

@ -0,0 +1,35 @@
return {
{
"danymat/neogen",
config = function()
require("neogen").setup({ snippet_engine = "luasnip" })
end,
},
{
"L3MON4D3/LuaSnip",
-- follow latest release.
version = "<CurrentMajor>.*", -- Replace <CurrentMajor> by the latest released major (first number of latest release)
-- install jsregexp (optional!).
build = "make install_jsregexp",
},
{ "saadparwaiz1/cmp_luasnip" },
config = function()
local ls = require("luasnip")
vim.keymap.set({ "i" }, "<Tab>", function()
ls.expand()
end, { silent = true })
vim.keymap.set({ "i", "s" }, "<Tab>", function()
ls.jump(1)
end, { silent = true })
vim.keymap.set({ "i", "s" }, "<S-Tab>", function()
ls.jump(-1)
end, { silent = true })
vim.keymap.set({ "i", "s" }, "<C-E>", function()
if ls.choice_active() then
ls.change_choice(1)
end
end, { silent = true })
end,
}

View File

@ -23,6 +23,7 @@ return {
TableConcat(lsps, { TableConcat(lsps, {
"pyright", "pyright",
"omnisharp_mono", "omnisharp_mono",
"tsserver",
"docker_compose_language_service", "docker_compose_language_service",
"dockerls", "dockerls",
"graphql", "graphql",

View File

@ -1,44 +0,0 @@
return {
'milanglacier/minuet-ai.nvim',
config = function()
require('minuet').setup {
provider = 'gemini',
provider_options = {
gemini = {
optional = {
generationConfig = {
maxOutputTokens = 256,
},
safetySettings = {
{
-- HARM_CATEGORY_HATE_SPEECH,
-- HARM_CATEGORY_HARASSMENT
-- HARM_CATEGORY_SEXUALLY_EXPLICIT
category = 'HARM_CATEGORY_DANGEROUS_CONTENT',
-- BLOCK_NONE
threshold = 'BLOCK_ONLY_HIGH',
},
},
},
},
},
virtualtext = {
auto_trigger_ft = {},
keymap = {
-- accept whole completion
accept = '<A-A>',
-- accept one line
accept_line = '<A-a>',
-- accept n lines (prompts for number)
-- e.g. "A-z 2 CR" will accept 2 lines
accept_n_lines = '<A-z>',
-- Cycle to prev completion item, or manually invoke completion
prev = '<A-[>',
-- Cycle to next completion item, or manually invoke completion
next = '<A-]>',
dismiss = '<A-e>',
},
}
}
end,
}

View File

@ -0,0 +1,8 @@
return {
"folke/neodev.nvim",
config = function()
require("neodev").setup({
library = { plugins = { "nvim-dap-ui" }, types = true },
})
end,
}

View File

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

View File

@ -7,51 +7,50 @@ return {
-- }, -- },
{ {
"nvim-neo-tree/neo-tree.nvim", "nvim-neo-tree/neo-tree.nvim",
branch = "v3.x",
lazy = false, -- neo-tree will lazily load itself
dependencies = { dependencies = {
"nvim-lua/plenary.nvim", "nvim-lua/plenary.nvim",
"nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
"MunifTanjim/nui.nvim", "MunifTanjim/nui.nvim",
-- {"3rd/image.nvim", opts = {}}, -- Optional image support in preview window: See `# Preview Mode` for more information -- "~/cmdtree",
}, },
-----@module "neo-tree" cmd = {
-----@type neotree.Config "Neotree",
opts = { },
filesystem = { config = function()
require("neo-tree").setup({
hijack_netrw_behavior = "open_default", hijack_netrw_behavior = "open_default",
filtered_items = { filesystem = {
hide_dotfiles = false, filtered_items = {
hide_dotfiles = false,
},
bind_to_cwd = false,
}, },
-- follow_current_file = { sources = {
-- enabled = true, "filesystem",
-- leave_dirs_open = false, "buffers",
-- }, "git_status",
group_empty_dirs = true, --"cmdtree",
}, -- ...and any additional source
sources = {
"filesystem",
"buffers",
"git_status",
--"cmdtree",
-- ...and any additional source
},
window = {
mappings = {
["O"] = "expand_all_nodes",
}, },
}, window = {
mappings = {
["O"] = "expand_all_nodes",
},
},
})
end,
-- stylua: ignore
keys = {
(function()
if use_google() then
return { "<C-n>m", ":Neotree float cmdtree<CR>", desc = "Open NeoTree CWD float" }
end
-- return { "<C-n>.", ":Neotree toggle reveal_force_cwd<CR>", desc = "Open NeoTree CWD float" }
return { "<C-n>m", ":Neotree float git_status<CR>", desc = "Open NeoTree CWD float" }
end)(),
-- { "<C-n>b", ":Neotree float buffers<CR>" },
{ "<C-n>f", ":Neotree float dir=%:p:h<cr>" },
{ "<C-n>", ":Neotree toggle dir=%:p:h<cr>" },
-- { "<C-n>.", ":Neotree reveal_force_cwd<CR>", desc = "Open NeoTree CWD float" },
}, },
-- stylua: ignore
keys = {
(function()
-- if use_google() then
-- return { "<C-n>m", ":Neotree float cmdtree<CR>", desc = "Open NeoTree CWD float" }
-- end
return { "<C-n>m", ":Neotree float git_status<CR>", desc = "Open NeoTree CWD float" }
end)(),
{ "<C-n>", ":Neotree reveal left<cr>" },
{ "<C-n>.", ":Neotree reveal left dir=%:p:h<cr>" },
},
}, },
} }

View File

@ -48,6 +48,21 @@ return {
if lang == "gdrama" then if lang == "gdrama" then
return true return true
end end
local file_too_large = require("utils").file_too_large
local fname = vim.api.nvim_buf_get_name(buf)
if file_too_large(fname) then
vim.schedule(function()
vim.notify(
string.format(
"Disabling treesitter for buffer. File %s exceeds maximum configured size.",
fname
)
)
end)
return true
end
return false return false
end, end,

View File

@ -5,6 +5,9 @@ return {
{ "nvim-lua/plenary.nvim" }, { "nvim-lua/plenary.nvim" },
{ "nvim-treesitter/nvim-treesitter" }, { "nvim-treesitter/nvim-treesitter" },
}, },
config = function()
require("config.refactoring")
end,
-- stylua: ignore -- stylua: ignore
keys = { keys = {
-- remap to open the Telescope refactoring menu in visual mode -- remap to open the Telescope refactoring menu in visual mode

View File

@ -1,65 +1,23 @@
return { return {
{ "ron-rs/ron.vim" },
{ {
"mrcjkb/rustaceanvim", "mrcjkb/rustaceanvim",
version = vim.fn.has("nvim-0.10.0") == 0 and "^4" or false, version = "^5", -- Recommended
ft = { "rust" }, lazy = false, -- This plugin is already lazy
config = function(_, opts)
vim.g.rustaceanvim = vim.tbl_deep_extend("keep", vim.g.rustaceanvim or {}, opts or {})
for _, method in ipairs({ "textDocument/diagnostic", "workspace/diagnostic" }) do
local default_diagnostic_handler = vim.lsp.handlers[method]
vim.lsp.handlers[method] = function(err, result, context, config)
if err ~= nil and err.code == -32802 then
return
end
return default_diagnostic_handler(err, result, context, config)
end
end
end,
opts = {
server = {
default_settings = {
-- rust-analyzer language server configuration
["rust-analyzer"] = {
cargo = {
allFeatures = true,
loadOutDirsFromCheck = true,
buildScripts = {
enable = true,
},
},
procMacro = {
enable = true,
ignored = {
["async-trait"] = { "async_trait" },
["napi-derive"] = { "napi" },
["async-recursion"] = { "async_recursion" },
},
},
files = {
excludeDirs = {
".direnv",
".git",
".github",
".gitlab",
"bin",
"node_modules",
"target",
"venv",
".venv",
},
},
},
},
},
},
}, },
{ {
"saecki/crates.nvim", "saecki/crates.nvim",
event = { "BufRead Cargo.toml" }, -- event = { "BufRead Cargo.toml" },
-- ft = "rust",
-- dependencies = { "nvim-lua/plenary.nvim" },
config = function() config = function()
require("crates").setup() require("crates").setup({
completion = {
cmp = {
enabled = true,
},
},
})
end, end,
}, },
} }

View File

@ -1,4 +1,18 @@
return { return {
-- {
-- "dstein64/nvim-scrollview",
-- config = function()
-- require("scrollview").setup({
-- excluded_filetypes = { "nerdtree" },
-- current_only = true,
-- -- base = "buffer",
-- -- column = 80,
-- signs_on_startup = { "all" },
-- diagnostics_severities = { vim.diagnostic.severity.ERROR },
-- })
-- end,
-- },
{ {
"petertriho/nvim-scrollbar", "petertriho/nvim-scrollbar",
config = function() config = function()
@ -16,4 +30,22 @@ return {
end, end,
lazy = false, lazy = false,
}, },
-- {
-- "kevinhwang91/nvim-hlslens",
-- config = function()
-- require("hlslens").setup({
-- nearest_only = true,
-- build_position_cb = function(plist, _, _, _)
-- require("scrollbar.handlers.search").handler.show(plist.start_pos)
-- end,
-- })
--
-- vim.cmd([[
-- augroup scrollbar_search_hide
-- autocmd!
-- autocmd CmdlineLeave : lua require('scrollbar.handlers.search').handler.hide()
-- augroup END
-- ]])
-- end,
-- },
} }

View File

@ -1,88 +1,83 @@
local use_google = require("utils").use_google local use_google = require("utils").use_google
local function change_diffbase(hg_revision, git_revision) local function setup_mercurial(hg_revision)
vim.g.signify_vcs_cmds = { local git_cmd = "git diff --no-color --no-ext-diff -U0 -- %f"
git = "git diff --no-color --diff-algorithm=histogram --no-ext-diff -U0 " .. git_revision .. " -- %f", local rcs_cmd = "rcsdiff -U0 %f 2>%n"
yadm = 'yadm diff --no-color --no-ext-diff -U0 -- %f', local svn_cmd = "svn diff --diff-cmd %d -x -U0 -- %f"
hg = 'chg --config alias.diff=diff diff '.. hg_revision .. ' --color=never --nodates -U0 -- %f', local hg_diff = hg_revision .. " --color=never config aliases.diff= --nodates -U0 -- %f"
svn = 'svn diff --diff-cmd %d -x -U0 -- %f', local hg_cat = hg_revision .. " -- %f"
bzr = 'bzr diff --using %d --diff-options=-U0 -- %f',
darcs = 'darcs diff --no-pause-for-gui --no-unified --diff-opts=-U0 -- %f', vim.cmd(string.format(
fossil = 'fossil diff --unified -c 0 -- %f', [[
cvs = 'cvs diff -U0 -- %f', let g:signify_vcs_cmds = {
rcs = 'rcsdiff -U0 %f 2>%n', \ 'git': '%s',
accurev = 'accurev diff %f -- -U0', \ 'rcs': '%s',
tfs = 'tf diff -version=W -noprompt -format=Unified %f' \ 'svn': '%s',
} \ 'hg': 'hg diff %s',
vim.g.signify_vcs_cmds_diffmode = { \ }
git = "git show " .. git_revision .. ":./%f", let g:signify_vcs_cmds_diffmode = {
hg = "chg cat " .. hg_revision .. " -- %f", \ 'hg': 'hg cat %s',
yadm = 'yadm show HEAD:./%f', \ }
svn = 'svn cat %f', ]],
bzr = 'bzr cat %f', git_cmd,
darcs = 'darcs show contents -- %f', rcs_cmd,
fossil = 'fossil cat %f', svn_cmd,
cvs = 'cvs up -p -- %f 2>%n', hg_diff,
rcs = 'co -q -p %f', hg_cat
accurev = 'accurev cat %f', ))
perforce = 'p4 print %f',
tfs = 'tf view -version:W -noprompt %f',
}
end end
_G.signify_dtup = function() _G.signify_dtup = function()
change_diffbase('-r ".^"', 'HEAD^') setup_mercurial('-r ".^"')
vim.cmd([[:SignifyEnable]]) vim.cmd([[:SignifyEnable]])
vim.cmd([[:SignifyRefresh]]) vim.cmd([[:SignifyRefresh]])
end end
_G.signify_normal = function() _G.signify_normal = function()
change_diffbase("-r .", "") setup_mercurial("-r .")
vim.cmd([[:SignifyEnable]]) vim.cmd([[:SignifyEnable]])
vim.cmd([[:SignifyRefresh]]) vim.cmd([[:SignifyRefresh]])
end end
_G.signify_dtp4 = function() _G.signify_dtp4 = function()
change_diffbase("-r p4head", "main") setup_mercurial("-r p4head")
vim.cmd([[:SignifyEnable]]) vim.cmd([[:SignifyEnable]])
vim.cmd([[:SignifyRefresh]]) vim.cmd([[:SignifyRefresh]])
end end
_G.signify_dtex = function() _G.signify_dtex = function()
change_diffbase("-r exported(.)", "origin/main") setup_mercurial("-r exported(.)")
vim.cmd([[:SignifyEnable]]) vim.cmd([[:SignifyEnable]])
vim.cmd([[:SignifyRefresh]]) vim.cmd([[:SignifyRefresh]])
end end
return { return {
"mhinz/vim-signify", "mhinz/vim-signify",
event = "VimEnter", event = "VimEnter",
-- stylua: ignore -- stylua: ignore
keys = { keys = {
{ "]d", "<plug>(signify-next-hunk)" }, { "]d", "<plug>(signify-next-hunk)" },
{ "[d", "<plug>(signify-prev-hunk)" }, { "[d", "<plug>(signify-prev-hunk)" },
{ "<leader>sd", ":SignifyDiff<CR>" }, { "<leader>sd", ":SignifyDiff<CR>" },
{ "<leader>sn", ":lua signify_normal()<CR>" }, { "<leader>sn", ":lua signify_normal()<CR>" },
{ "<leader>sup", ":lua signify_dtup()<CR>" }, { "<leader>sup", ":lua signify_dtup()<CR>" },
{ "<leader>sex", ":lua signify_dtex()<CR>" }, { "<leader>sex", ":lua signify_dtex()<CR>" },
{ "<leader>sp4", ":lua signify_dtp4()<CR>" }, { "<leader>sp4", ":lua signify_dtp4()<CR>" },
{ "<leader>sb", ":lua signify_dtp4()<CR>" }, },
}, config = function()
config = function() vim.g.signify_vcs_list = { "hg", "git" }
vim.g.signify_vcs_list = { "hg", "git" } local one_eighth = ""
vim.g.signify_disable_by_default = 0 local one_quarter = ""
-- vim.g.signify_number_highlight = 1 local three_eighths = ""
vim.g.signify_sign_show_count = 0 vim.g.signify_disable_by_default = 0
local s = "" vim.g.signify_sign_add = one_quarter
vim.g.signify_sign_add = s vim.g.signify_sign_delete = one_quarter
vim.g.signify_sign_delete = s vim.g.signify_sign_change = one_quarter
vim.g.signify_sign_change = s local red = "#f8a6a0"
vim.api.nvim_set_hl(0, "SignifySignAdd", { fg = "#9cd9b8" }) vim.api.nvim_set_hl(0, "SignifySignAdd", { fg = "#9cc9b8" })
vim.api.nvim_set_hl(0, "SignifySignChange", { fg = "#849ee3" }) vim.api.nvim_set_hl(0, "SignifySignChange", { fg = "#84cee3" })
vim.api.nvim_set_hl(0, "SignifySignChangeDelete", { fg = red })
local myred = "#f296a0" vim.api.nvim_set_hl(0, "SignifySignDelete", { fg = red })
vim.api.nvim_set_hl(0, "SignifySignChangeDelete", { fg = myred }) vim.api.nvim_set_hl(0, "SignifySignDeleteDeleteFirstLine", { fg = red })
vim.api.nvim_set_hl(0, "SignifySignDelete", { fg = myred }) -- vim.cmd("highlight SignColumn ctermbg=NONE cterm=NONE guibg=NONE gui=NONE")
vim.api.nvim_set_hl(0, "SignifyLineDelete", { fg = myred }) end,
vim.api.nvim_set_hl(0, "SignifySignDeleteDeleteFirstLine", { fg = myred })
end,
} }

View File

@ -1,12 +1,19 @@
local use_google = require("utils").use_google local use_google = require("utils").use_google
local exec = require("utils").exec local exec = require("utils").exec
local TableConcat = require("utils").TableConcat local TableConcat = require("utils").TableConcat
local scopes = require("neoscopes")
_G.find_files = function(search_dirs) _G.find_files = function(search_dirs)
require("telescope.builtin").find_files({ search_dirs = search_dirs }) require("telescope.builtin").find_files({
search_dirs = search_dirs,
})
end end
-- Helper functions to fetch the current scope and set `search_dirs` -- Helper functions to fetch the current scope and set `search_dirs`
_G.find_dotfiles = function() end _G.find_dotfiles = function()
require("telescope.builtin").git_files({
cwd = vim.fn.expand("$HOME/dotfiles"),
})
end
_G.search_cwd = function() _G.search_cwd = function()
local builtin = require("telescope.builtin") local builtin = require("telescope.builtin")
@ -14,55 +21,66 @@ _G.search_cwd = function()
builtin.find_files({ cwd = utils.buffer_dir() }) builtin.find_files({ cwd = utils.buffer_dir() })
end end
_G.live_grep = function(search_dirs)
require("telescope.builtin").live_grep({
search_dirs = search_dirs,
})
end
_G.live_grep_cword = function(search_dirs)
require("telescope.builtin").live_grep({
search_dirs = search_dirs,
})
end
local function exe(cmd) local function exe(cmd)
return vim.split(vim.fn.system(cmd), "\n") return vim.split(vim.fn.system(cmd), "\n")
end end
local function fig_modified() local function get_visual_selection()
return exe("chg pstatus -ma -n --no-status --template= | sort") -- Yank current visual selection into the 'v' register
--
-- Note that this makes no effort to preserve this register
vim.cmd('noau normal! "vy"')
return vim.fn.getreg("v")
end end
local function fig_all_modified() function fig_modified()
return exe("chg status -ma -n --rev p4base --no-status --template= | sort") return exe("hg pstatus -ma -n --no-status --template= | sort")
end
function fig_all_modified()
return exe("hg status -ma -n --rev p4base --no-status --template= | sort")
end end
-- stylua: ignore -- stylua: ignore
local keys = { local keys = {
{ "<leader>e", ":lua search_cwd()<CR>", desc = "Find Files in Buffer Directory" }, { "<leader>e", ":lua search_cwd()<CR>", desc = "Find Files in Buffer Directory" },
{ "<leader>tb", ":Telescope buffers<CR>" }, { "<leader>ts", require('telescope.builtin').live_grep },
-- { "<leader>ts", require('telescope.builtin').live_grep }, { "<leader>TS", [[<cmd>lua require('telescope.builtin').live_grep{default_text = vim.fn.expand("<cword>")}<CR>]], },
-- { "<leader>TS", function() require('telescope.builtin').live_grep { default_text = vim.fn.expand("<cword>") } end, }, { "<leader>t.", ":lua find_dotfiles()<CR>", desc = "Find Dotfiles" },
{ { "<leader>tc", ":Telescope textcase<CR>", desc = "Text case" },
"<leader>t.", { "<leader>tC", ":CritiqueUnresolvedCommentsTelescope<CR>", desc = "Critique unresolved comments" },
function() { "<leader>tca", ":CritiqueCommentsTelescope<CR>", desc = "Critique all comments" },
require("telescope.builtin").git_files({ { "<leader>tg", ":Telescope git_files<CR>", desc = "Git Files" },
cwd = vim.fn.expand("$HOME/dotfiles"), }) { "<leader>th", ":lua require('telescope.builtin').help_tags{}<CR>", desc = "[T]elescope [H]elp" },
end { "<leader>tk", ":Telescope keymaps<CR>", desc = "Keymaps" },
, { "<leader>tn", ":Telescope notify<CR>", desc = "Notifications" },
desc = "Find Dotfiles" { "<leader>tr", ":Telescope resume<CR>", desc = "Telescope Resume" },
},
{ "<leader>tC", ":Telescope textcase<CR>", desc = "Text case" },
{ "<leader>tc", ":CritiqueCommentsTelescope<CR>", desc = "Critique all comments" },
{ "<leader>tg", ":Telescope git_files<CR>", desc = "Git Files" },
{ "<leader>tk", ":Telescope keymaps<CR>", desc = "Keymaps" },
{ "<leader>tn", ":Telescope notify<CR>", desc = "Notifications" },
{ "<leader>tr", ":Telescope resume<CR>", desc = "Telescope Resume" },
{ "<leader>th", ":lua require('telescope.builtin').help_tags{}<CR>", desc = "[T]elescope [H]elp" },
} }
if use_google() then if use_google() then
local find_files = require("telescope.builtin").find_files
local cs_query = require("telescope").extensions.codesearch.find_query
-- stylua: ignore -- stylua: ignore
TableConcat(keys, { TableConcat(keys, {
{ "<leader>tm", function() find_files({ search_dirs = fig_modified() }) end, desc = "list modified Fig files." }, { "<leader>tm", ":lua find_files(fig_modified())<CR>" },
{ "<leader>tM", function() find_files({ search_dirs = fig_all_modified() }) end, desc = "List *all* modified Fig files" }, { "<leader>tM", ":lua find_files(fig_all_modified())<CR>" },
{ "<leader>tf", function() find_files({ search_dirs = fig_modified() }) end, desc = "Grep modified Fig files." }, { "<leader>tf", ":lua live_grep(fig_modified())<CR>", desc = "Search in modified Fig files." },
{ "<leader>tF", function() find_files({ search_dirs = fig_modified() }) end, desc = "Grep *all* modified Fig files." }, { "<leader>tF", ":lua live_grep(fig_all_modified())<CR>", desc = "Search in *all* modified Fig files." },
{ "<C-P>", require("telescope").extensions.codesearch.find_files, desc = "Code search files" }, { "<C-P>", require("telescope").extensions.codesearch.find_files },
{ "<leader>cs", require("telescope").extensions.codesearch.find_query, desc = "Code search query" }, { "<leader>cs", require("telescope").extensions.codesearch.find_query },
{ "<leader>cs", cs_query, desc = "Code search query", mode = "v" }, { "<leader>cs", require("telescope").extensions.codesearch.find_query, mode = "v" },
{ "<leader>CS", function() cs_query({ default_text_expand = '<cword>' }) end, desc = "Code search query <cword>" }, { "<leader>CS", [[<cmd>lua require('telescope').extensions.codesearch.find_query{default_text_expand='<cword>'}<CR>]], },
}) })
end end
@ -113,32 +131,9 @@ return {
end end
end, end,
}, },
{
"nvim-telescope/telescope-live-grep-args.nvim",
keys = {
{
"<leader>ts",
function()
require("telescope").extensions.live_grep_args.live_grep_args()
end,
},
{
"<leader>TS",
function()
require("telescope").extensions.live_grep_args.live_grep_args({
default_text = vim.fn.expand("<cword>"),
})
end,
},
},
config = function()
require("telescope").load_extension("live_grep_args")
end,
},
{ {
"nvim-telescope/telescope.nvim", "nvim-telescope/telescope.nvim",
dependencies = { dependencies = {
"nvim-telescope/telescope-live-grep-args.nvim",
"mfussenegger/nvim-dap", "mfussenegger/nvim-dap",
"smartpde/telescope-recent-files", "smartpde/telescope-recent-files",
"rcarriga/nvim-dap-ui", "rcarriga/nvim-dap-ui",
@ -196,18 +191,6 @@ return {
codesearch = { codesearch = {
experimental = true, -- enable results from google3/experimental experimental = true, -- enable results from google3/experimental
}, },
live_grep_args = {
auto_quoting = true, -- enable/disable auto-quoting
-- define mappings, e.g.
mappings = { -- extend mappings
i = {
["<C-k>"] = require("telescope-live-grep-args.actions").quote_prompt(),
["<C-i>"] = require("telescope-live-grep-args.actions").quote_prompt({ postfix = " --iglob " }),
-- freeze the current list and start a fuzzy search in the frozen list
["<C-.>"] = require("telescope-live-grep-args.actions").to_fuzzy_refine,
},
},
},
recent_files = { recent_files = {
-- This function rewrites all file paths to the current workspace. -- This function rewrites all file paths to the current workspace.
-- For example, if w2 is the current workspace, then -- For example, if w2 is the current workspace, then

View File

@ -1,78 +1,67 @@
local use_google = require("utils").use_google local use_google = require("utils").use_google
return { return {
{
"squk/ableton.nvim",
lazy = false,
cond = not use_google(),
priority = 1000,
-- dir = "~/neovim-plugins/squk/ableton.nvim",
opts = {
variant = "cooler",
},
config = function()
vim.cmd("colorscheme ableton")
end,
},
{
"dgox16/oldworld.nvim",
lazy = false,
cond = not use_google(),
priority = 1000,
opts = {
variant = "cooler",
},
config = function()
-- vim.cmd("colorscheme oldworld")
end,
},
{ {
"bluz71/vim-moonfly-colors", "bluz71/vim-moonfly-colors",
name = "moonfly", name = "moonfly",
-- cond = not use_google(), cond = not use_google(),
cond = false,
lazy = false, lazy = false,
priority = 1000, priority = 1000,
config = function() config = function()
local custom_highlight = vim.api.nvim_create_augroup("CustomHighlight", {})
vim.api.nvim_create_autocmd("colorscheme", {
pattern = "moonfly",
callback = function()
local p = require("moonfly").palette
local unused = p.test
local highlights = { "", "VirtualText", "Underline", "Sign", "Floating" }
for _, h in ipairs(highlights) do
vim.api.nvim_set_hl(0, "Diagnostic" .. h .. "Error", { fg = p.crimson, bold = true })
vim.api.nvim_set_hl(0, "Diagnostic" .. h .. "Warn", { fg = p.yellow, bold = true })
vim.api.nvim_set_hl(0, "Diagnostic" .. h .. "Info", { fg = p.sky, bold = true })
vim.api.nvim_set_hl(0, "Diagnostic" .. h .. "Hint", { fg = p.turqoise, bold = true })
vim.api.nvim_set_hl(0, "Diagnostic" .. h .. "Ok", { fg = p.emerald, bold = true })
end
end,
group = custom_highlight,
})
vim.g.moonflyCursorColor = true
vim.g.moonflyItalics = true
vim.g.moonflyUnderlineMatchParen = true
vim.g.moonflyVirtualTextColor = true
vim.cmd("colorscheme moonfly") vim.cmd("colorscheme moonfly")
end, end,
}, },
-- { {
-- "EdenEast/nightfox.nvim", "sainnhe/sonokai",
-- lazy = use_google(), -- make sure we load this during startup if it is your main colorscheme -- cond = false,
-- priority = 1000, -- make sure to load this before all the other start plugins config = function()
-- cond = not use_google(), vim.g.sonokai_diagnostic_virtual_text = "highlighted"
-- config = function() vim.g.sonokai_style = "andromeda"
-- -- vim.cmd("colorscheme nightfox") vim.g.sonokai_dim_inactive_windows = 1
-- -- vim.cmd("colorscheme carbonfox") -- vim.cmd("colorscheme sonokai")
-- -- vim.cmd("colorscheme terafox") end,
-- vim.cmd("colorscheme duskfox") },
-- -- vim.cmd("colorscheme nordfox") {
-- -- vim.cmd("colorscheme dayfox") "nyoom-engineering/oxocarbon.nvim",
-- -- vim.cmd("colorscheme dawnfox") lazy = use_google(), -- make sure we load this during startup if it is your main colorscheme
-- end, priority = 1000, -- make sure to load this before all the other start plugins
-- }, cond = false,
config = function()
vim.cmd("colorscheme oxocarbon")
end,
},
{
"uloco/bluloco.nvim",
dependencies = { "rktjmp/lush.nvim" },
lazy = use_google(), -- make sure we load this during startup if it is your main colorscheme
priority = 1000, -- make sure to load this before all the other start plugins
cond = false,
config = function()
vim.cmd("colorscheme bluloco")
end,
},
{
"EdenEast/nightfox.nvim",
lazy = use_google(), -- make sure we load this during startup if it is your main colorscheme
priority = 1000, -- make sure to load this before all the other start plugins
cond = false,
config = function()
-- vim.cmd("colorscheme nightfox")
-- vim.cmd("colorscheme carbonfox")
-- vim.cmd("colorscheme terafox")
vim.cmd("colorscheme duskfox")
-- vim.cmd("colorscheme nordfox")
-- vim.cmd("colorscheme dayfox")
-- vim.cmd("colorscheme dawnfox")
end,
},
{
"rebelot/kanagawa.nvim",
lazy = use_google(), -- make sure we load this during startup if it is your main colorscheme
priority = 1000, -- make sure to load this before all the other start plugins
cond = false,
config = function()
vim.cmd("colorscheme kanagawa-wave")
end,
},
} }

View File

@ -1,93 +1,97 @@
local use_google = require("utils").use_google local use_google = require("utils").use_google
return { return {
{ {
"ful1e5/onedark.nvim", "ful1e5/onedark.nvim",
priority = 1000, -- make sure to load this before all the other start plugins priority = 1000, -- make sure to load this before all the other start plugins
lazy = not use_google(), -- make sure we load this during startup if it is your main colorscheme lazy = not use_google(), -- make sure we load this during startup if it is your main colorscheme
cond = use_google(), cond = use_google(),
config = function() config = function()
-- require("onedark").setup() -- require("onedark").setup()
end, end,
}, },
{ {
"catppuccin/nvim", "catppuccin/nvim",
name = "catppuccin", name = "catppuccin",
priority = 1000, -- make sure to load this before all the other start plugins priority = 1000, -- make sure to load this before all the other start plugins
lazy = not use_google(), -- make sure we load this during startup if it is your main colorscheme lazy = not use_google(), -- make sure we load this during startup if it is your main colorscheme
cond = use_google(), cond = use_google(),
config = function() config = function()
vim.g.catppuccin_flavour = "macchiato" -- latte, frappe, macchiato, mocha vim.g.catppuccin_flavour = "macchiato" -- latte, frappe, macchiato, mocha
local colors = require("catppuccin.palettes").get_palette() local colors = require("catppuccin.palettes").get_palette()
require("catppuccin").setup({ require("catppuccin").setup({
flavour = "mocha", flavour = "mocha",
integrations = { integrations = {
cmp = true, cmp = true,
-- coc_nvim = false, -- coc_nvim = false,
dashboard = true, dashboard = true,
-- fern = false, -- fern = false,
fidget = true, fidget = true,
gitgutter = true, gitgutter = true,
gitsigns = true, gitsigns = true,
-- hop = false, -- hop = false,
illuminate = true, illuminate = true,
leap = false, -- leap = false,
-- lightspeed = false, -- lightspeed = false,
-- lsp_saga = false, -- lsp_saga = false,
lsp_trouble = true, lsp_trouble = true,
mason = true, illuminate = {
markdown = true, enabled = true,
-- neogit = false, -- lsp = false
-- neotest = false, },
neotree = true, mason = true,
notify = true, markdown = true,
nvimtree = true, -- neogit = false,
-- overseer = false, -- neotest = false,
-- pounce = false, neotree = true,
symbols_outline = true, notify = true,
telescope = true, nvimtree = true,
treesitter = true, -- overseer = false,
treesitter_context = true, -- pounce = false,
-- ts_rainbow = false, symbols_outline = true,
-- vim_sneak = false, telescope = true,
-- vimwiki = false, treesitter = true,
which_key = true, treesitter_context = true,
-- Special integrations, see https://github.com/catppuccin/nvim#special-integrations -- ts_rainbow = false,
dap = true, -- vim_sneak = false,
dap_ui = true, -- vimwiki = false,
indent_blankline = { which_key = true,
enabled = true, -- Special integrations, see https://github.com/catppuccin/nvim#special-integrations
colored_indent_levels = false, dap = true,
}, dap_ui = true,
}, indent_blankline = {
native_lsp = { enabled = true,
enabled = true, colored_indent_levels = false,
virtual_text = { },
errors = { "italic" }, },
hints = { "italic" }, native_lsp = {
warnings = { "italic" }, enabled = true,
information = { "italic" }, virtual_text = {
}, errors = { "italic" },
underlines = { hints = { "italic" },
errors = { "underline" }, warnings = { "italic" },
hints = { "underline" }, information = { "italic" },
warnings = { "underline" }, },
information = { "underline" }, underlines = {
}, errors = { "underline" },
inlay_hints = { hints = { "underline" },
background = true, warnings = { "underline" },
}, information = { "underline" },
}, },
custom_highlights = { inlay_hints = {
-- Identifier = { fg = colors.lavender }, background = true,
-- Statement = { fg = colors.rosewater }, },
-- Identifier = { fg = colors.sapphire }, },
-- Function = { fg = colors.mauve }, custom_highlights = {
}, -- Identifier = { fg = colors.lavender },
}) -- Statement = { fg = colors.rosewater },
-- Identifier = { fg = colors.sapphire },
-- Function = { fg = colors.mauve },
},
})
vim.api.nvim_command("colorscheme catppuccin") vim.api.nvim_command("colorscheme catppuccin")
end, end,
}, },
} }

View File

@ -1,9 +1,9 @@
return { return {
"preservim/vimux", "preservim/vimux",
"tmux-plugins/vim-tmux", "tmux-plugins/vim-tmux",
"christoomey/vim-tmux-navigator", "christoomey/vim-tmux-navigator",
"whatyouhide/vim-tmux-syntax", "whatyouhide/vim-tmux-syntax",
"tmux-plugins/vim-tmux-focus-events", "tmux-plugins/vim-tmux-focus-events",
-- 'jabirali/vim-tmux-yank', -- 'jabirali/vim-tmux-yank',
"skywind3000/asyncrun.vim", "skywind3000/asyncrun.vim",
} }

View File

@ -1,6 +1,5 @@
local M = { local M = {
use_google_cache = nil, use_google_cache = nil,
flags = { blink = true },
} }
function M.exec(command, args) function M.exec(command, args)
@ -23,9 +22,18 @@ function M.map(mode, lhs, rhs, opts)
vim.keymap.set(mode, lhs, rhs, options) vim.keymap.set(mode, lhs, rhs, options)
end end
function M.file_too_large(filename)
local max_filesize = 2000 * 1024 -- 2MB
local ok, stats = pcall(vim.loop.fs_stat, filename)
if ok and stats and stats.size > max_filesize then
return true
end
return false
end
function M.use_google() function M.use_google()
if M.use_google_cache == nil then if M.use_google_cache == nil then
M.use_google_cache = M.file_exists(vim.env.HOME .. "/use_google") M.use_google_cache = M.file_exists(os.getenv("HOME") .. "/use_google")
end end
return M.use_google_cache return M.use_google_cache
end end
@ -40,6 +48,48 @@ function M.file_exists(name)
end end
end end
function M.dump(o)
if type(o) == "table" then
local s = "{ "
for k, v in pairs(o) do
if type(k) ~= "number" then
k = '"' .. k .. '"'
end
s = s .. "[" .. k .. "] = " .. M.dump(v) .. ","
end
return s .. "} "
else
return tostring(o)
end
end
function M.tprint(tbl, indent)
if not indent then
indent = 0
end
local toprint = string.rep(" ", indent) .. "{\r\n"
indent = indent + 2
for k, v in pairs(tbl) do
toprint = toprint .. string.rep(" ", indent)
if type(k) == "number" then
toprint = toprint .. "[" .. k .. "] = "
elseif type(k) == "string" then
toprint = toprint .. k .. "= "
end
if type(v) == "number" then
toprint = toprint .. v .. ",\r\n"
elseif type(v) == "string" then
toprint = toprint .. '"' .. v .. '",\r\n'
elseif type(v) == "table" then
toprint = toprint .. M.tprint(v, indent + 2) .. ",\r\n"
else
toprint = toprint .. '"' .. tostring(v) .. '",\r\n'
end
end
toprint = toprint .. string.rep(" ", indent - 2) .. "}"
return toprint
end
function M.log(message) function M.log(message)
local log_file_path = vim.fn.expand("$HOME/nvim.log") local log_file_path = vim.fn.expand("$HOME/nvim.log")
local log_file = io.open(log_file_path, "a") local log_file = io.open(log_file_path, "a")
@ -55,6 +105,4 @@ function M.TableConcat(t1, t2)
return t1 return t1
end end
M.flags.blink = not M.use_google()
return M return M

View File

@ -15,7 +15,7 @@ map <leader>` ysiw`
vmap <leader>` c`<C-R>"`<ESC> vmap <leader>` c`<C-R>"`<ESC>
" --------- SEARCH MAPPINGS --------- " --------- SEARCH MAPPINGS ---------
" unhighlight search " unhilight search
nnoremap <leader><space> :nohlsearch<CR> nnoremap <leader><space> :nohlsearch<CR>
" --------- CLIPBOARD MAPPINGS --------- " --------- CLIPBOARD MAPPINGS ---------
@ -46,5 +46,4 @@ nmap <leader>yf :let @+ = expand("%") \| let @" = expand("%")<cr>
" replace currently selected text with default register " replace currently selected text with default register
" without yanking it " without yanking it
vnoremap <leader>p "_dP vnoremap <leader>p "_dP
nnoremap <leader><leader> :VimuxZoomRunner<cr> :VimuxRunCommand '!!'<cr> :call VimuxSendKeys("Enter")<cr> nnoremap <leader><leader> :VimuxOpenRunner<cr> :VimuxRunCommand '!!'<cr> :call VimuxSendKeys("Enter")<cr>
nnoremap <leader>. :VimuxOpenRunner<cr> :VimuxRunCommand '!!'<cr> :call VimuxSendKeys("Enter")<cr>

View File

@ -1,6 +1,7 @@
" jk is escape -.- " jk is escape -.-
inoremap jk <esc> inoremap jk <esc>
inoremap <space><space> <esc>:w<cr> inoremap <space><space> <esc>:w<cr>
test
" make tmux and vim play nicely together " make tmux and vim play nicely together
map <Esc>[A <Up> map <Esc>[A <Up>

View File

@ -2,13 +2,24 @@ set nocompatible " be iMproved, required
let mapleader="," " BEST LEADER OF ALL TIME (BLOT) let mapleader="," " BEST LEADER OF ALL TIME (BLOT)
filetype off " required filetype off " required
set runtimepath+=,~/.vim
set runtimepath+=,~/.vim/after
set runtimepath+=,~/.vim/lua/
set runtimepath+=,~/.config/nvim/after/
let &runtimepath = &runtimepath
set directory=/tmp set directory=/tmp
set undofile set undofile
set nobackup set nobackup
set formatoptions+=j set formatoptions+=j
set nowritebackup set nowritebackup
au BufWritePre * let &bex = '@' . strftime("%F.%H:%M")
set termguicolors set termguicolors
let &t_8f = "\<Esc>[38;2;%lu;%lu;%lum"
let &t_8b = "\<Esc>[48;2;%lu;%lu;%lum"
let &t_AB="\e[48;5;%dm"
let &t_AF="\e[38;5;%dm"
set laststatus=2 set laststatus=2
set cmdheight=1 set cmdheight=1
@ -37,16 +48,34 @@ set hlsearch " highlight matches
set splitright " Puts new vsplit windows to the right of the current set splitright " Puts new vsplit windows to the right of the current
set splitbelow " Puts new split windows to the bottom of the current set splitbelow " Puts new split windows to the bottom of the current
set scrolljump=5 " Line to scroll when cursor leaves screen
set scrolloff=3 " Minimum lines to keep above and below cursor
set shortmess=A " disable swapg set shortmess=A " disable swapg
set shortmess+=O set shortmess+=O
set modifiable set modifiable
set noscrollbind set noscrollbind
set expandtab set expandtab
" map <LeftMouse> ""
map <LeftDrag> ""
map <LeftRelease> ""
set updatetime=100
source ~/.vim/prefs/mappings.vim
source ~/.vim/prefs/leader.vim
set encoding=utf-8 set encoding=utf-8
set t_Co=256 set t_Co=256
let base16colorspace=256 let base16colorspace=256
set colorcolumn=100 set colorcolumn=100
if (has("termguicolors"))
set termguicolors
endif
set background=dark set background=dark
let $NVIM_TUI_ENABLE_TRUE_COLOR=1 let $NVIM_TUI_ENABLE_TRUE_COLOR=1
@ -57,6 +86,23 @@ let g:lsp_log_file = expand('~/vim-lsp.log')
"Don't ask to save when changing buffers (i.e. when jumping to a type definition) "Don't ask to save when changing buffers (i.e. when jumping to a type definition)
set hidden set hidden
function! GenerateUnicode(first, last)
let i = a:first
while i <= a:last
if (i%256 == 0)
$put ='----------------------------------------------------'
$put =' 0 1 2 3 4 5 6 7 8 9 A B C D E F '
$put ='----------------------------------------------------'
endif
let c = printf('%04X ', i)
for j in range(16)
let c = c . nr2char(i) . ' '
let i += 1
endfor
$put =c
endwhile
endfunction
" makes sure that when opening, files are normal, i.e. not folded. " makes sure that when opening, files are normal, i.e. not folded.
set nofoldenable set nofoldenable
@ -76,10 +122,7 @@ let g:loaded_netrwPlugin = 0
let g:loaded_tutor_mode_plugin = 0 let g:loaded_tutor_mode_plugin = 0
let g:loaded_remote_plugins = 1 let g:loaded_remote_plugins = 1
au BufRead,BufNewFile,BufReadPost *.cc.inc set filetype=cpp
filetype plugin indent on filetype plugin indent on
syntax on syntax on
source ~/.vim/prefs/mappings.vim
source ~/.vim/prefs/leader.vim
source ~/.vim/prefs/mappings.vim
source ~/.vim/prefs/leader.vim

Binary file not shown.

View File

@ -1,7 +1,7 @@
export ABBR_QUIET=1 export ABBR_QUIET=1
alias grep='grep --colour' alias grep='grep --colour'
# abbr cat='bat' # abbr cat='bat'
# alias ls='exa' alias ls='exa'
alias tmux='tmux -2' alias tmux='tmux -2'
alias ..="cd .." alias ..="cd .."

View File

@ -23,8 +23,6 @@ source ~/.aliases.sh
if [[ -f "$HOME/use_google" ]]; then if [[ -f "$HOME/use_google" ]]; then
source $HOME/.bash_profile.google source $HOME/.bash_profile.google
fi fi
if [ -f ~/.bashrc ]; then . ~/.bashrc; fi
. "$HOME/.cargo/env" . "$HOME/.cargo/env"
ulimit -n 10240 if [ -f ~/.bashrc ]; then . ~/.bashrc; fi

View File

@ -5,11 +5,8 @@ export ABBR_QUIET=1
# --------------- # ---------------
export PATH=$PATH:/google/src/head/depot/google3/experimental/users/cnieves/util export PATH=$PATH:/google/src/head/depot/google3/experimental/users/cnieves/util
export PATH="${HOME}/.config/lsp/lua-language-server/bin:${PATH}" export PATH="${HOME}/.config/lsp/lua-language-server/bin:${PATH}"
export PATH=$PATH:/${HOME}/nvim-linux-x86_64/bin/
export PATH=$GOROOT/bin:$PATH
export DUMMY_API_KEY="DUMMY_API_KEY"
export GOROOT=/usr/lib/google-golang export GOROOT=/usr/lib/google-golang
export PATH=$GOROOT/bin:$PATH
export JAVA_HOME=$(readlink -ne /usr/local/buildtools/java/jdk) export JAVA_HOME=$(readlink -ne /usr/local/buildtools/java/jdk)
export CARGO_NET_GIT_FETCH_WITH_CLI=true export CARGO_NET_GIT_FETCH_WITH_CLI=true
source ~/g3path.zsh source ~/g3path.zsh
@ -150,15 +147,8 @@ alias bisect=/google/data/ro/teams/tetralight/bin/bisect
alias copybara='/google/bin/releases/copybara/public/copybara/copybara' alias copybara='/google/bin/releases/copybara/public/copybara/copybara'
alias allow_ptrace='/google/bin/releases/cider/dbg/allow_ptrace' alias allow_ptrace='/google/bin/releases/cider/dbg/allow_ptrace'
alias bluze=/google/bin/releases/blueprint-bluze/public/bluze alias bluze=/google/bin/releases/blueprint-bluze/public/bluze
alias cclean=/google/src/head/depot/google3/devtools/maintenance/cclean/cclean
source /google/bin/releases/gmscore-tools/cli/prod/setup_prod_gms.sh source /google/bin/releases/gmscore-tools/cli/prod/setup_prod_gms.sh
abbr bq="blaze query" abbr bq="blaze query"
abbr br="blaze run" abbr br="blaze run"
abbr bb="blaze build" abbr bb="blaze build"
function phenodb() {
adb shell sqlite3 /data/data/com.google.android.gms/databases/phenotype.db "'$*'"
}
export PHENOTYPE_PACKAGE_NAME="com.google.YOUR.PHENOTYPE.PACKAGE.NAME"

View File

@ -30,6 +30,7 @@
zmodload zsh/langinfo zmodload zsh/langinfo
if [[ ${langinfo[CODESET]:-} != (utf|UTF)(-|)8 ]]; then if [[ ${langinfo[CODESET]:-} != (utf|UTF)(-|)8 ]]; then
local LC_ALL=${${(@M)$(locale -a):#*.(utf|UTF)(-|)8}[1]:-en_US.UTF-8}
fi fi
# The list of segments shown on the left. Fill it with the most important segments. # The list of segments shown on the left. Fill it with the most important segments.

View File

@ -37,7 +37,6 @@ zplug "zsh-users/zsh-syntax-highlighting", defer:2
zplug "mafredri/zsh-async", from:"github", use:"async.zsh" zplug "mafredri/zsh-async", from:"github", use:"async.zsh"
zplug "zsh-users/zsh-autosuggestions" zplug "zsh-users/zsh-autosuggestions"
zplug "zsh-users/zsh-history-substring-search" zplug "zsh-users/zsh-history-substring-search"
zplug 'joshskidmore/zsh-fzf-history-search'
zplug "modules/command-not-found", from:prezto zplug "modules/command-not-found", from:prezto
zplug "romkatv/powerlevel10k", as:theme, depth:1 zplug "romkatv/powerlevel10k", as:theme, depth:1
@ -78,7 +77,7 @@ fi
zle -N fancy-ctrl-z zle -N fancy-ctrl-z
bindkey '^Z' fancy-ctrl-z bindkey '^Z' fancy-ctrl-z
# bindkey '^R' fzf-history-widget bindkey '^R' fzf-history-widget
bindkey "^A" beginning-of-line bindkey "^A" beginning-of-line
bindkey "^E" end-of-line bindkey "^E" end-of-line
bindkey '\eK' kill-line bindkey '\eK' kill-line
@ -159,13 +158,12 @@ autoload -Uz add-zsh-hook
[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
export EDITOR='nvim' export EDITOR='nvim'
export PATH="$PATH:/opt/nvim/"
export TERM=xterm-256color export TERM=xterm-256color
export LANG="en_US.UTF-8"
export CARGO_NET_GIT_FETCH_WITH_CLI=true export LC_ALL="en_US.UTF-8"
export LC_CTYPE="en_US.UTF-8"
export LANG_ALL="en_US.UTF-8"
source ~/.bash_profile source ~/.bash_profile
export RIPGREP_CONFIG_PATH=$HOME/.ripgreprc
export PATH="$HOME/.local/bin:$PATH" export PATH="$HOME/.local/bin:$PATH"

View File

@ -13,7 +13,7 @@ autoload -Uz add-zsh-hook
add-zsh-hook chpwd g3path::hook add-zsh-hook chpwd g3path::hook
g3path::zle::accept-line () { g3path::zle::accept-line () {
if [[ -n $GOOGLE3_ROOT && ! $BUFFER =~ \\s*(bb|bq|br|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|bloaty) ]]; then if [[ -n $GOOGLE3_ROOT && ! $BUFFER =~ \\s*(bb|bq|br|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\/} BUFFER=${BUFFER// \/\// $GOOGLE3_ROOT\/}
fi fi
zle .accept-line zle .accept-line