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

clean woot

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

98
vim/.vim/lua/plugins/base.lua
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",

12
vim/.vim/lua/plugins/cmp.lua
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]",
},

8
vim/.vim/lua/plugins/lsp.lua
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,

30
vim/.vim/lua/plugins/mason.lua
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,
}