clean woot

This commit is contained in:
Christian Nieves
2023-10-21 18:28:20 -05:00
parent 1a899da35d
commit 5b9499e39b
6 changed files with 73 additions and 88 deletions

View File

@ -4,7 +4,6 @@
"asyncrun.vim": { "branch": "master", "commit": "7191d0c30dd105e5d7f897b9a6ee19cabe734466" },
"auto-session": { "branch": "main", "commit": "21033c6815f249a7839c3a85fc8a6b44d74925c9" },
"bufferline.nvim": { "branch": "main", "commit": "d24378edc14a675c820a303b4512af3bbc5761e9" },
"calendar-vim": { "branch": "master", "commit": "a7e73e02c92566bf427b2a1d6a61a8f23542cc21" },
"catppuccin": { "branch": "main", "commit": "a84ee1848bfac4601771805396552bdbaa0a0e91" },
"cmp-async-path": { "branch": "main", "commit": "d8229a93d7b71f22c66ca35ac9e6c6cd850ec61d" },
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
@ -14,6 +13,7 @@
"cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" },
"cmp-nvim-lsp-document-symbol": { "branch": "main", "commit": "f0f53f704c08ea501f9d222b23491b0d354644b0" },
"cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "3d8912ebeb56e5ae08ef0906e3a54de1c66b92f1" },
"cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
"cmp-spell": { "branch": "master", "commit": "60584cb75e5e8bba5a0c9e4c3ab0791e0698bffa" },
"cmp-treesitter": { "branch": "master", "commit": "389eadd48c27aa6dc0e6b992644704f026802a2e" },
"cmp-under-comparator": { "branch": "master", "commit": "6857f10272c3cfe930cece2afa2406e1385bfef8" },
@ -24,7 +24,6 @@
"crates.nvim": { "branch": "main", "commit": "1dffccc0a95f656ebe00cacb4de282473430c5a1" },
"formatter.nvim": { "branch": "master", "commit": "9bf2e7e294b00bac87c6123c889828ee08dc9b46" },
"friendly-snippets": { "branch": "main", "commit": "ea84a710262cb2c286d439070bad37d36fd3db25" },
"fzf": { "branch": "master", "commit": "3c09c77269d848f5e7dd8f350a90e8d7ed760845" },
"fzf.vim": { "branch": "master", "commit": "e0d131d95364edf940a70127fcb5748b86e6955e" },
"git-conflict.nvim": { "branch": "main", "commit": "8d962d83cae924a314965f738ed1e05a4000d682" },
"gitsigns.nvim": { "branch": "main", "commit": "adcf2c7f2f495f5df148683764bf7cba6a70f34c" },
@ -35,8 +34,6 @@
"lazy.nvim": { "branch": "main", "commit": "25beed5e2e935ebc00d7e3eed1dc502df3c40e39" },
"leap.nvim": { "branch": "main", "commit": "5efe985cf68fac3b6a6dfe7a75fbfaca8db2af9c" },
"libp.nvim": { "branch": "main", "commit": "636b1748e92f66022c1763f32b2ded6b8606eda5" },
"litee-calltree.nvim": { "branch": "main", "commit": "e2dffec35740032258fee3a3c7f30123226f2271" },
"litee.nvim": { "branch": "main", "commit": "bf366a1414fd0f9401631ac8884f2f9fa4bf18d2" },
"lsp-lens.nvim": { "branch": "main", "commit": "13d25ad8bd55aa34cc0aa3082e78a4157c401346" },
"lsp-status.nvim": { "branch": "master", "commit": "54f48eb5017632d81d0fd40112065f1d062d0629" },
"lsp-zero.nvim": { "branch": "v2.x", "commit": "f306adde671281d77cebd635098cc8b8fc8368ee" },
@ -67,15 +64,14 @@
"rust-tools.nvim": { "branch": "master", "commit": "0cc8adab23117783a0292a0c8a2fbed1005dc645" },
"scss-syntax.vim": { "branch": "master", "commit": "bda22a93d1dcfcb8ee13be1988560d9bb5bd0fef" },
"tabular": { "branch": "master", "commit": "339091ac4dd1f17e225fe7d57b48aff55f99b23a" },
"telekasten.nvim": { "branch": "main", "commit": "4a5e57eee9c5154ed77423bb7fa6619fdb0784cd" },
"telescope.nvim": { "branch": "master", "commit": "47c755d737702df7a39b640c8d9c473a728be1df" },
"trouble.nvim": { "branch": "main", "commit": "20d1b30d6925213abece21d35858a16e11d1e9fc" },
"undotree": { "branch": "master", "commit": "0e11ba7325efbbb3f3bebe06213afa3e7ec75131" },
"vcscommand.vim": { "branch": "master", "commit": "2fb32681361f37533455d20aaa7fc6eb11b0fa4b" },
"vim-bazel": { "branch": "master", "commit": "31b0d5e4f51da1aeb56d65bf505a744e6de405de" },
"vim-better-whitespace": { "branch": "master", "commit": "1b22dc57a2751c7afbc6025a7da39b7c22db635d" },
"vim-dirdiff": { "branch": "master", "commit": "84bc8999fde4b3c2d8b228b560278ab30c7ea4c9" },
"vim-floaterm": { "branch": "master", "commit": "bcaeabf89a92a924031d471395054d84bd88ce2f" },
"vim-illuminate": { "branch": "master", "commit": "3bd2ab64b5d63b29e05691e624927e5ebbf0fb86" },
"vim-maktaba": { "branch": "master", "commit": "fe95bb10f6bb250943a44632107f6a3d76ce5f28" },
"vim-matchup": { "branch": "master", "commit": "17cc05867cb3314761e4baa20115a27120f8e82c" },
"vim-ripgrep": { "branch": "master", "commit": "2bb2425387b449a0cd65a54ceb85e123d7a320b8" },

View File

@ -1,5 +0,0 @@
require("which-key").setup({
-- your configuration comes here
-- or leave it empty to use the default settings
-- refer to the configuration section below
})

View File

@ -1,56 +1,19 @@
local use_google = require("utils").use_google
return {
-- Pretty symbols
{ "nvim-lua/plenary.nvim", lazy = false },
{ "nvim-tree/nvim-web-devicons", lazy = false },
{ "squk/java-syntax.vim", lazy = false },
{
"nvim-tree/nvim-web-devicons",
"petertriho/nvim-scrollbar",
config = function()
require("scrollbar").setup()
end,
lazy = false,
},
"godlygeek/tabular",
"ldelossa/litee.nvim",
"cakebaker/scss-syntax.vim",
"ldelossa/litee-calltree.nvim",
"jghauser/mkdir.nvim",
"will133/vim-dirdiff",
"renerocksai/calendar-vim",
"google/vim-searchindex",
"kosayoda/nvim-lightbulb",
{
"L3MON4D3/LuaSnip",
build = "make install_jsregexp",
config = function()
require("luasnip.loaders.from_vscode").lazy_load()
end,
dependencies = { "rafamadriz/friendly-snippets" },
},
"ntpeters/vim-better-whitespace",
"junegunn/fzf.vim",
"tversteeg/registers.nvim",
"jremmen/vim-ripgrep",
"nvim-lua/plenary.nvim",
-- Undo tree
{
"mbbill/undotree",
cmd = "UndotreeToggle",
config = function()
vim.g.undotree_SetFocusWhenToggle = 1
end,
},
{
"renerocksai/telekasten.nvim",
config = function()
require("config.telekasten")
end,
keys = {
{ "<leader>zf", ":lua require('telekasten').find_notes()<CR>", desc = "Find Notes" },
},
},
{ "udalov/kotlin-vim", ft = "kotlin" },
{ "ray-x/go.nvim", ft = "go" },
{ "ray-x/guihua.lua", ft = "go" },
-- Rust
{
"saecki/crates.nvim",
ft = "rust",
@ -62,7 +25,27 @@ return {
},
{ "simrat39/rust-tools.nvim", ft = "rust" },
"RRethy/vim-illuminate",
"godlygeek/tabular",
"wesQ3/vim-windowswap",
"cakebaker/scss-syntax.vim",
"vim-scripts/vcscommand.vim",
"jghauser/mkdir.nvim",
"google/vim-searchindex",
"kosayoda/nvim-lightbulb",
"ntpeters/vim-better-whitespace",
"junegunn/fzf.vim",
"tversteeg/registers.nvim",
"jremmen/vim-ripgrep",
{ "andymass/vim-matchup", event = "VimEnter" },
-- Undo tree
{
"mbbill/undotree",
cmd = "UndotreeToggle",
config = function()
vim.g.undotree_SetFocusWhenToggle = 1
end,
},
{
"stevearc/aerial.nvim",
opts = {},
@ -75,20 +58,10 @@ return {
{ "<leader>so", ":AerialToggle<CR>", desc = "[S]ymbols [O]utline" },
},
},
{
"petertriho/nvim-scrollbar",
config = function()
require("scrollbar").setup()
end,
lazy = false,
},
{
"rmagatti/auto-session",
config = function()
require("auto-session").setup({
log_level = "error",
-- auto_session_suppress_dirs = { "~/", "~/Downloads", "/", os.getenv("HOME")},
})
require("auto-session").setup({ log_level = "error" })
end,
},
{
@ -97,25 +70,12 @@ return {
require("libp").setup()
end,
},
{
"squk/java-syntax.vim",
lazy = false,
},
{
"folke/which-key.nvim",
config = function()
require("config.whichkey")
require("which-key").setup({})
end,
},
{ "junegunn/fzf", build = ":call fzf#install()" },
{ "udalov/kotlin-vim", ft = "kotin" },
{
"wesQ3/vim-windowswap",
init = function()
vim.g.windowswap_map_keys = 0
end,
},
{ "vim-scripts/vcscommand.vim" },
{
"mhinz/vim-signify",
event = "VimEnter",

View File

@ -41,7 +41,7 @@ return {
"hrsh7th/cmp-nvim-lsp",
"hrsh7th/cmp-nvim-lsp-document-symbol",
"hrsh7th/cmp-nvim-lsp-signature-help",
-- "hrsh7th/cmp-nvim-lua",
"hrsh7th/cmp-nvim-lua",
"FelipeLema/cmp-async-path",
"lukas-reineke/cmp-under-comparator",
"ray-x/cmp-treesitter",
@ -56,22 +56,20 @@ return {
{ name = "nvim_lsp", priority = 8 },
{ name = "treesitter", priority = 7 },
{ name = "nvim_lsp_signature_help" },
-- { name = "luasnip" },
{ name = "luasnip" },
{ name = "calc" },
{ name = "crates" },
-- { name = "nvim_lua" },
{ name = "nvim_lua" },
{ name = "emoji" },
{ name = "async_path" },
{ name = "spell" },
-- { name = "buffer", option = { keyword_pattern = [[\k\+]] }, priority = 1 },
-- { name = "buffer-lines" },
}
if use_google() then
table.insert(conditionalSources, { name = "analysislsp", priority = 5 })
table.insert(conditionalSources, { name = "nvim_ciderlsp", priority = 8 })
else
table.insert(conditionalSources, { name = "cmp_tabnine", priority = 9 })
table.insert(conditionalSources, { name = "codeium", priority = 9 })
end
local lspkind = require("lspkind")
@ -172,7 +170,7 @@ return {
nvim_lsp = "[LSP]",
nvim_lua = "",
luasnip = "[LuaSnip]",
cmp_tabnine = "[TabNine]",
codiuem = "[Codiuem]",
async_path = "[async_path]",
tmux = "[TMUX]",
},

View File

@ -14,6 +14,14 @@ if not use_google() then
end
return {
{
"L3MON4D3/LuaSnip",
build = "make install_jsregexp",
config = function()
require("luasnip.loaders.from_vscode").lazy_load()
end,
dependencies = { "rafamadriz/friendly-snippets" },
},
{
"neovim/nvim-lspconfig",
dependencies = deps,

View File

@ -8,7 +8,7 @@ return {
local use_google = require("utils").use_google
local lsps = {
"lus_la",
"lua_ls",
"html",
"rust_analyzer",
"marksman",
@ -52,6 +52,34 @@ return {
["rust_analyzer"] = function()
require("rust-tools").setup({})
end,
["lua_ls"] = function()
require("lspconfig").lua_ls.setup({
settings = {
Lua = {
runtime = {
-- Tell the language server which version of Lua you're using
-- (most likely LuaJIT in the case of Neovim)
version = "LuaJIT",
},
diagnostics = {
-- Get the language server to recognize the `vim` global
globals = {
"vim",
"require",
},
},
workspace = {
-- Make the server aware of Neovim runtime files
library = vim.api.nvim_get_runtime_file("", true),
},
-- Do not send telemetry data containing a randomized but unique identifier
telemetry = {
enable = false,
},
},
},
})
end,
})
end,
}