diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d547881 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +packer_compiled.lua diff --git a/config/.config/nvim/plugin/packer_compiled.lua b/config/.config/nvim/plugin/packer_compiled.lua index 543620d..41cfb09 100644 --- a/config/.config/nvim/plugin/packer_compiled.lua +++ b/config/.config/nvim/plugin/packer_compiled.lua @@ -49,8 +49,8 @@ local function save_profiles(threshold) end time([[Luarocks path setup]], true) -local package_path_str = "/usr/local/google/home/cnieves/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/usr/local/google/home/cnieves/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/usr/local/google/home/cnieves/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/usr/local/google/home/cnieves/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua" -local install_cpath_pattern = "/usr/local/google/home/cnieves/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so" +local package_path_str = "/Users/christian/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/Users/christian/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/Users/christian/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/Users/christian/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua" +local install_cpath_pattern = "/Users/christian/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so" if not string.find(package.path, package_path_str, 1, true) then package.path = package.path .. ';' .. package_path_str end @@ -76,110 +76,104 @@ time([[Defining packer_plugins]], true) _G.packer_plugins = { LuaSnip = { loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/LuaSnip", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/LuaSnip", url = "https://github.com/L3MON4D3/LuaSnip" }, MatchTagAlways = { loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/MatchTagAlways", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/MatchTagAlways", url = "https://github.com/Valloric/MatchTagAlways" }, ["asyncrun.vim"] = { loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/asyncrun.vim", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/asyncrun.vim", url = "https://github.com/skywind3000/asyncrun.vim" }, ["auto-session"] = { config = { "\27LJ\2\n²\1\0\0\a\0\t\1\0146\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0005\3\4\0006\4\5\0009\4\6\4'\6\a\0B\4\2\0?\4\0\0=\3\b\2B\0\2\1K\0\1\0\31auto_session_suppress_dirs\tHOME\vgetenv\aos\1\4\0\0\a~/\16~/Downloads\6/\1\0\1\14log_level\nerror\nsetup\17auto-session\frequire\t€€À™\4\0" }, loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/auto-session", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/auto-session", url = "https://github.com/rmagatti/auto-session" }, catppuccin = { config = { 'require("catppuccin-config")' }, loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/catppuccin", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/catppuccin", url = "https://github.com/catppuccin/nvim" }, ["cmp-buffer"] = { loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/cmp-buffer", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/cmp-buffer", url = "https://github.com/hrsh7th/cmp-buffer" }, ["cmp-cmdline"] = { loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/cmp-cmdline", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/cmp-cmdline", url = "https://github.com/hrsh7th/cmp-cmdline" }, ["cmp-nvim-lsp"] = { loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp", url = "https://github.com/hrsh7th/cmp-nvim-lsp" }, ["cmp-nvim-lsp-document-symbol"] = { loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp-document-symbol", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp-document-symbol", url = "https://github.com/hrsh7th/cmp-nvim-lsp-document-symbol" }, ["cmp-nvim-lsp-signature-help"] = { loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp-signature-help", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp-signature-help", url = "https://github.com/hrsh7th/cmp-nvim-lsp-signature-help" }, ["cmp-nvim-lua"] = { loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/cmp-nvim-lua", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/cmp-nvim-lua", url = "https://github.com/hrsh7th/cmp-nvim-lua" }, ["cmp-path"] = { loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/cmp-path", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/cmp-path", url = "https://github.com/hrsh7th/cmp-path" }, ["cmp-spell"] = { loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/cmp-spell", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/cmp-spell", url = "https://github.com/f3fora/cmp-spell" }, ["cmp-under-comparator"] = { loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/cmp-under-comparator", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/cmp-under-comparator", url = "https://github.com/lukas-reineke/cmp-under-comparator" }, ["cmp-vsnip"] = { loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/cmp-vsnip", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/cmp-vsnip", url = "https://github.com/hrsh7th/cmp-vsnip" }, cmp_luasnip = { - after_files = { "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/opt/cmp_luasnip/after/plugin/cmp_luasnip.lua" }, + after_files = { "/Users/christian/.local/share/nvim/site/pack/packer/opt/cmp_luasnip/after/plugin/cmp_luasnip.lua" }, load_after = {}, loaded = true, needs_bufread = false, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/opt/cmp_luasnip", + path = "/Users/christian/.local/share/nvim/site/pack/packer/opt/cmp_luasnip", url = "https://github.com/saadparwaiz1/cmp_luasnip" }, - critique = { - config = { ' require("critique").setup() ' }, - loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/critique", - url = "/google/src/cloud/cnieves/google-comments/google3/experimental/users/cnieves/neovim/critique" - }, ["fidget.nvim"] = { config = { 'require("fidget").setup()' }, loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/fidget.nvim", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/fidget.nvim", url = "https://github.com/j-hui/fidget.nvim" }, ["fzf.vim"] = { loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/fzf.vim", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/fzf.vim", url = "https://github.com/junegunn/fzf.vim" }, ["git-conflict.nvim"] = { config = { "require('git-conflict').setup()" }, loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/git-conflict.nvim", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/git-conflict.nvim", url = "https://github.com/akinsho/git-conflict.nvim" }, ["gitsigns.nvim"] = { @@ -187,48 +181,48 @@ _G.packer_plugins = { loaded = false, needs_bufread = false, only_cond = false, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/opt/gitsigns.nvim", + path = "/Users/christian/.local/share/nvim/site/pack/packer/opt/gitsigns.nvim", url = "https://github.com/lewis6991/gitsigns.nvim" }, ["google-comments"] = { - cond = { true }, + cond = { false }, config = { ' require("google_comments") ' }, loaded = false, needs_bufread = false, only_cond = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/opt/google-comments", + path = "/Users/christian/.local/share/nvim/site/pack/packer/opt/google-comments", url = "sso://googler@user/chmnchiang/google-comments" }, ["java-syntax.vim"] = { loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/java-syntax.vim", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/java-syntax.vim", url = "https://github.com/squk/java-syntax.vim" }, ["kotlin-vim"] = { loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/kotlin-vim", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/kotlin-vim", url = "https://github.com/udalov/kotlin-vim" }, ["lsp_lines.nvim"] = { config = { 'require("lsp_lines").setup()' }, loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/lsp_lines.nvim", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/lsp_lines.nvim", url = "https://github.com/ErichDonGubler/lsp_lines.nvim" }, ["lspkind.nvim"] = { loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/lspkind.nvim", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/lspkind.nvim", url = "https://github.com/onsails/lspkind.nvim" }, ["lualine.nvim"] = { config = { ' require("lualine_config") ' }, loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/lualine.nvim", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/lualine.nvim", url = "https://github.com/nvim-lualine/lualine.nvim" }, ["mkdir.nvim"] = { loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/mkdir.nvim", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/mkdir.nvim", url = "https://github.com/jghauser/mkdir.nvim" }, neogit = { @@ -237,97 +231,97 @@ _G.packer_plugins = { loaded = false, needs_bufread = true, only_cond = false, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/opt/neogit", + path = "/Users/christian/.local/share/nvim/site/pack/packer/opt/neogit", url = "https://github.com/TimUntersberger/neogit" }, nerdcommenter = { loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/nerdcommenter", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/nerdcommenter", url = "https://github.com/scrooloose/nerdcommenter" }, nerdtree = { loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/nerdtree", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/nerdtree", url = "https://github.com/preservim/nerdtree" }, ["nvim-cmp"] = { loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/nvim-cmp", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/nvim-cmp", url = "https://github.com/hrsh7th/nvim-cmp" }, ["nvim-lightbulb"] = { loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/nvim-lightbulb", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/nvim-lightbulb", url = "https://github.com/kosayoda/nvim-lightbulb" }, ["nvim-lsp-installer"] = { loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/nvim-lsp-installer", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/nvim-lsp-installer", url = "https://github.com/williamboman/nvim-lsp-installer" }, ["nvim-lspconfig"] = { loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/nvim-lspconfig", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/nvim-lspconfig", url = "https://github.com/neovim/nvim-lspconfig" }, ["nvim-notify"] = { config = { ' require("notify_config") ' }, loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/nvim-notify", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/nvim-notify", url = "https://github.com/rcarriga/nvim-notify" }, ["nvim-scrollbar"] = { config = { 'require("scrollbar").setup()' }, loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/nvim-scrollbar", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/nvim-scrollbar", url = "https://github.com/petertriho/nvim-scrollbar" }, ["nvim-treesitter"] = { loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/nvim-treesitter", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/nvim-treesitter", url = "https://github.com/nvim-treesitter/nvim-treesitter" }, ["nvim-web-devicons"] = { loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/nvim-web-devicons", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/nvim-web-devicons", url = "https://github.com/kyazdani42/nvim-web-devicons" }, ["packer.nvim"] = { loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/packer.nvim", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/packer.nvim", url = "https://github.com/wbthomason/packer.nvim" }, ["plenary.nvim"] = { loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/plenary.nvim", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/plenary.nvim", url = "https://github.com/nvim-lua/plenary.nvim" }, ["registers.nvim"] = { loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/registers.nvim", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/registers.nvim", url = "https://github.com/tversteeg/registers.nvim" }, ["symbols-outline.nvim"] = { loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/symbols-outline.nvim", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/symbols-outline.nvim", url = "https://github.com/simrat39/symbols-outline.nvim" }, ["telescope-codesearch.nvim"] = { - cond = { true }, + cond = { false }, loaded = false, needs_bufread = false, only_cond = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/opt/telescope-codesearch.nvim", + path = "/Users/christian/.local/share/nvim/site/pack/packer/opt/telescope-codesearch.nvim", url = "sso://googler@user/vintharas/telescope-codesearch.nvim" }, ["telescope.nvim"] = { loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/telescope.nvim", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/telescope.nvim", url = "https://github.com/nvim-telescope/telescope.nvim" }, ["trouble.nvim"] = { loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/trouble.nvim", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/trouble.nvim", url = "https://github.com/folke/trouble.nvim" }, undotree = { @@ -336,111 +330,111 @@ _G.packer_plugins = { loaded = false, needs_bufread = false, only_cond = false, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/opt/undotree", + path = "/Users/christian/.local/share/nvim/site/pack/packer/opt/undotree", url = "https://github.com/mbbill/undotree" }, ["vim-better-whitespace"] = { loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/vim-better-whitespace", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/vim-better-whitespace", url = "https://github.com/ntpeters/vim-better-whitespace" }, ["vim-case-convert"] = { loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/vim-case-convert", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/vim-case-convert", url = "https://github.com/chiedo/vim-case-convert" }, ["vim-indent-guides"] = { loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/vim-indent-guides", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/vim-indent-guides", url = "https://github.com/nathanaelkane/vim-indent-guides" }, ["vim-matchup"] = { - after_files = { "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/opt/vim-matchup/after/plugin/matchit.vim" }, + after_files = { "/Users/christian/.local/share/nvim/site/pack/packer/opt/vim-matchup/after/plugin/matchit.vim" }, loaded = false, needs_bufread = true, only_cond = false, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/opt/vim-matchup", + path = "/Users/christian/.local/share/nvim/site/pack/packer/opt/vim-matchup", url = "https://github.com/andymass/vim-matchup" }, ["vim-nerdtree-syntax-highlight"] = { loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/vim-nerdtree-syntax-highlight", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/vim-nerdtree-syntax-highlight", url = "https://github.com/tiagofumo/vim-nerdtree-syntax-highlight" }, ["vim-obsession"] = { loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/vim-obsession", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/vim-obsession", url = "https://github.com/tpope/vim-obsession" }, ["vim-quantum"] = { loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/vim-quantum", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/vim-quantum", url = "https://github.com/squk/vim-quantum" }, ["vim-ripgrep"] = { loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/vim-ripgrep", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/vim-ripgrep", url = "https://github.com/jremmen/vim-ripgrep" }, ["vim-searchindex"] = { loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/vim-searchindex", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/vim-searchindex", url = "https://github.com/google/vim-searchindex" }, ["vim-signify"] = { loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/vim-signify", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/vim-signify", url = "https://github.com/mhinz/vim-signify" }, ["vim-surround"] = { loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/vim-surround", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/vim-surround", url = "https://github.com/tpope/vim-surround" }, ["vim-titlecase"] = { loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/vim-titlecase", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/vim-titlecase", url = "https://github.com/christoomey/vim-titlecase" }, ["vim-tmux"] = { loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/vim-tmux", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/vim-tmux", url = "https://github.com/tmux-plugins/vim-tmux" }, ["vim-tmux-focus-events"] = { loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/vim-tmux-focus-events", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/vim-tmux-focus-events", url = "https://github.com/tmux-plugins/vim-tmux-focus-events" }, ["vim-tmux-navigator"] = { loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/vim-tmux-navigator", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/vim-tmux-navigator", url = "https://github.com/christoomey/vim-tmux-navigator" }, ["vim-tmux-syntax"] = { loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/vim-tmux-syntax", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/vim-tmux-syntax", url = "https://github.com/whatyouhide/vim-tmux-syntax" }, ["vim-vsnip"] = { loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/vim-vsnip", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/vim-vsnip", url = "https://github.com/hrsh7th/vim-vsnip" }, ["vim-windowswap"] = { loaded = true, needs_bufread = false, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/opt/vim-windowswap", + path = "/Users/christian/.local/share/nvim/site/pack/packer/opt/vim-windowswap", url = "https://github.com/wesQ3/vim-windowswap" }, vimux = { loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/vimux", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/vimux", url = "https://github.com/preservim/vimux" }, ["zettelkasten.nvim"] = { loaded = true, - path = "/usr/local/google/home/cnieves/.local/share/nvim/site/pack/packer/start/zettelkasten.nvim", + path = "/Users/christian/.local/share/nvim/site/pack/packer/start/zettelkasten.nvim", url = "https://github.com/Furkanzmc/zettelkasten.nvim" } } @@ -453,42 +447,38 @@ time([[Setup for vim-windowswap]], false) time([[packadd for vim-windowswap]], true) vim.cmd [[packadd vim-windowswap]] time([[packadd for vim-windowswap]], false) --- Config for: critique -time([[Config for critique]], true) - require("critique").setup() -time([[Config for critique]], false) --- Config for: fidget.nvim -time([[Config for fidget.nvim]], true) -require("fidget").setup() -time([[Config for fidget.nvim]], false) --- Config for: lualine.nvim -time([[Config for lualine.nvim]], true) - require("lualine_config") -time([[Config for lualine.nvim]], false) --- Config for: auto-session -time([[Config for auto-session]], true) -try_loadstring("\27LJ\2\n²\1\0\0\a\0\t\1\0146\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0005\3\4\0006\4\5\0009\4\6\4'\6\a\0B\4\2\0?\4\0\0=\3\b\2B\0\2\1K\0\1\0\31auto_session_suppress_dirs\tHOME\vgetenv\aos\1\4\0\0\a~/\16~/Downloads\6/\1\0\1\14log_level\nerror\nsetup\17auto-session\frequire\t€€À™\4\0", "config", "auto-session") -time([[Config for auto-session]], false) -- Config for: nvim-scrollbar time([[Config for nvim-scrollbar]], true) require("scrollbar").setup() time([[Config for nvim-scrollbar]], false) --- Config for: git-conflict.nvim -time([[Config for git-conflict.nvim]], true) -require('git-conflict').setup() -time([[Config for git-conflict.nvim]], false) --- Config for: catppuccin -time([[Config for catppuccin]], true) -require("catppuccin-config") -time([[Config for catppuccin]], false) --- Config for: lsp_lines.nvim -time([[Config for lsp_lines.nvim]], true) -require("lsp_lines").setup() -time([[Config for lsp_lines.nvim]], false) +-- Config for: lualine.nvim +time([[Config for lualine.nvim]], true) + require("lualine_config") +time([[Config for lualine.nvim]], false) -- Config for: nvim-notify time([[Config for nvim-notify]], true) require("notify_config") time([[Config for nvim-notify]], false) +-- Config for: git-conflict.nvim +time([[Config for git-conflict.nvim]], true) +require('git-conflict').setup() +time([[Config for git-conflict.nvim]], false) +-- Config for: lsp_lines.nvim +time([[Config for lsp_lines.nvim]], true) +require("lsp_lines").setup() +time([[Config for lsp_lines.nvim]], false) +-- Config for: auto-session +time([[Config for auto-session]], true) +try_loadstring("\27LJ\2\n²\1\0\0\a\0\t\1\0146\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0005\3\4\0006\4\5\0009\4\6\4'\6\a\0B\4\2\0?\4\0\0=\3\b\2B\0\2\1K\0\1\0\31auto_session_suppress_dirs\tHOME\vgetenv\aos\1\4\0\0\a~/\16~/Downloads\6/\1\0\1\14log_level\nerror\nsetup\17auto-session\frequire\t€€À™\4\0", "config", "auto-session") +time([[Config for auto-session]], false) +-- Config for: catppuccin +time([[Config for catppuccin]], true) +require("catppuccin-config") +time([[Config for catppuccin]], false) +-- Config for: fidget.nvim +time([[Config for fidget.nvim]], true) +require("fidget").setup() +time([[Config for fidget.nvim]], false) -- Conditional loads time([[Conditional loading of telescope-codesearch.nvim]], true) require("packer.load")({"telescope-codesearch.nvim"}, {}, _G.packer_plugins) diff --git a/vim/.vim/lua/lsp.lua b/vim/.vim/lua/lsp.lua index 35c73d0..8f5af50 100644 --- a/vim/.vim/lua/lsp.lua +++ b/vim/.vim/lua/lsp.lua @@ -1,16 +1,19 @@ -- 1. Configure CiderLSP +local use_google = require("utils").use_google local lspconfig = require("lspconfig") local configs = require("lspconfig.configs") local notify = require 'notify' -configs.ciderlsp = { - default_config = { - cmd = { "/google/bin/releases/cider/ciderlsp/ciderlsp", "--tooltag=nvim-cmp", "--forward_sync_responses" }, - -- cmd = {'/google/bin/releases/cider/ciderlsp/ciderlsp', '--forward_sync_responses', '--enable_document_highlight'}; - filetypes = { "c", "cpp", "java", "kotlin", "objc", "proto", "textproto", "go", "python", "bzl" }, - root_dir = lspconfig.util.root_pattern("BUILD"), - settings = {}, - }, -} +if use_google() then + configs.ciderlsp = { + default_config = { + cmd = { "/google/bin/releases/cider/ciderlsp/ciderlsp", "--tooltag=nvim-cmp", "--forward_sync_responses" }, + -- cmd = {'/google/bin/releases/cider/ciderlsp/ciderlsp', '--forward_sync_responses', '--enable_document_highlight'}; + filetypes = { "c", "cpp", "java", "kotlin", "objc", "proto", "textproto", "go", "python", "bzl" }, + root_dir = lspconfig.util.root_pattern("BUILD"), + settings = {}, + }, + } +end local has_words_before = function() local line, col = unpack(vim.api.nvim_win_get_cursor(0)) @@ -48,6 +51,28 @@ cmp.setup.cmdline(':', { }) }) +local conditionalSources = { + { name = "nvim_lua" }, + { name = "nvim_lsp" }, + { name = "path" }, + { name = "vim_vsnip" }, + { name = 'nvim_lsp_signature_help' }, + { name = "buffer", keyword_length = 5 }, + { + name = 'spell', + option = { + keep_all_entries = false, + enable_in_context = function() + return true + end, + }, + }, +} + +if use_google() then + table.insert(conditionalSources, { name = 'nvim_ciderlsp', priority = 9 }) +end + cmp.setup({ mapping = { [""] = cmp.mapping.scroll_docs(-4), @@ -97,24 +122,7 @@ cmp.setup({ end), }, - sources = { - { name = "nvim_lua" }, - { name = "nvim_lsp" }, - { name = "path" }, - { name = "vim_vsnip" }, - { name = 'nvim_lsp_signature_help' }, - { name = 'nvim_ciderlsp', priority = 9 }, - { name = "buffer", keyword_length = 5 }, - { - name = 'spell', - option = { - keep_all_entries = false, - enable_in_context = function() - return true - end, - }, - }, - }, + sources = conditionalSources, sorting = { comparators = { @@ -257,7 +265,6 @@ end local capabilities = require('cmp_nvim_lsp').default_capabilities(vim.lsp.protocol.make_client_capabilities()) -capabilities = require('cmp_nvim_ciderlsp').update_capabilities(capabilities) capabilities['codeLens'] = {dynamicRegistration=false} -- capabilities.workspace.codeLens = {refreshSupport=true} -- capabilities.workspace.diagnostics = {refreshSupport=true} @@ -274,12 +281,14 @@ capabilities.textDocument.publishDiagnostics={ dataSupport=true, --layeredDiagnostics=true } - -lspconfig.ciderlsp.setup({ - capabilities = capabilities, - on_attach = on_attach, - handlers = cider_lsp_handlers, -}) +if use_google() then + capabilities = require('cmp_nvim_ciderlsp').update_capabilities(capabilities) + lspconfig.ciderlsp.setup({ + capabilities = capabilities, + on_attach = on_attach, + handlers = cider_lsp_handlers, + }) +end local runtime_path = vim.split(package.path, ";") table.insert(runtime_path, "lua/?.lua") diff --git a/vim/.vim/lua/plugins.lua b/vim/.vim/lua/plugins.lua index ac6f3a7..35ae78e 100644 --- a/vim/.vim/lua/plugins.lua +++ b/vim/.vim/lua/plugins.lua @@ -1,5 +1,6 @@ local fn = vim.fn local install_path = fn.stdpath('data')..'/site/pack/packer/start/packer.nvim' +local use_google = require("utils").use_google if fn.empty(fn.glob(install_path)) > 0 then packer_bootstrap = fn.system({'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', install_path}) vim.o.runtimepath = vim.fn.stdpath('data') .. '/site/pack/*/start/*,' .. vim.o.runtimepath @@ -13,7 +14,6 @@ augroup end ]]) -local file_exists = require("utils").file_exists require('packer').startup(function(use) -- Packer can manage itself @@ -90,20 +90,22 @@ require('packer').startup(function(use) use { 'sso://googler@user/vintharas/telescope-codesearch.nvim', - cond = file_exists(os.getenv("HOME").."/use_google"), + cond = use_google(), } use { 'sso://googler@user/chmnchiang/google-comments', -- '/google/src/head/depot/google3/experimental/users/chmnchiang/neovim/google-comments', -- '/google/src/cloud/cnieves/google-comments/google3/experimental/users/chmnchiang/neovim/google-comments', - cond = file_exists(os.getenv("HOME").."/use_google"), + cond = use_google(), requires = {'rcarriga/nvim-notify', 'nvim-lua/plenary.nvim'}, config = [[ require("google_comments") ]] } use { '/google/src/cloud/cnieves/google-comments/google3/experimental/users/cnieves/neovim/critique', + -- cond = file_exists(os.getenv("HOME").."/use_google"), + disable = not use_google(), config = [[ require("critique").setup() ]] } diff --git a/vim/.vim/lua/utils.lua b/vim/.vim/lua/utils.lua index 316a5a8..978b6e9 100644 --- a/vim/.vim/lua/utils.lua +++ b/vim/.vim/lua/utils.lua @@ -8,6 +8,10 @@ function M.map(mode, lhs, rhs, opts) vim.api.nvim_set_keymap(mode, lhs, rhs, options) end +function M.use_google() + return M.file_exists(os.getenv("HOME").."/use_google") +end + function M.file_exists(name) local f=io.open(name,"r") if f~=nil then io.close(f) return true else return false end