From f129f0f93dc610f2482245da462526919b0a084e Mon Sep 17 00:00:00 2001 From: Christian Nieves Date: Wed, 8 Nov 2023 13:01:41 -0600 Subject: [PATCH] lsptimeout n stuff --- hyper/.hyper.js | 3 +- vim/.vim/lua/plugins/cmp.lua | 2 +- vim/.vim/lua/plugins/google.lua | 7 -- vim/.vim/lua/plugins/imp.lua | 6 ++ vim/.vim/lua/plugins/lsp-lens.lua | 8 +-- vim/.vim/lua/plugins/lsp.lua | 4 ++ vim/.vim/lua/plugins/notify.lua | 6 +- vim/.vim/lua/plugins/theme.lua | 113 ++++++++++++++++++++++++++++++ 8 files changed, 132 insertions(+), 17 deletions(-) create mode 100644 vim/.vim/lua/plugins/imp.lua create mode 100644 vim/.vim/lua/plugins/theme.lua diff --git a/hyper/.hyper.js b/hyper/.hyper.js index 459fd97..14dd9f7 100644 --- a/hyper/.hyper.js +++ b/hyper/.hyper.js @@ -6,7 +6,7 @@ module.exports = { config : { modifierKeys: { altIsMeta: true }, - catppuccinTheme: "macchiato", + catppuccinTheme: "macchiato", // choose either `'stable'` for receiving highly polished, // or `'canary'` for less polished but more frequent updates updateChannel : 'stable', @@ -156,6 +156,7 @@ module.exports = { "hyper-font-smoothing", "hyper-font-ligatures", "hypurr" + // "hyper-aura-theme" ], // in development, you can create a directory under // `~/.hyper_plugins/local/` and include it here diff --git a/vim/.vim/lua/plugins/cmp.lua b/vim/.vim/lua/plugins/cmp.lua index 91e7b9d..fce6209 100644 --- a/vim/.vim/lua/plugins/cmp.lua +++ b/vim/.vim/lua/plugins/cmp.lua @@ -54,7 +54,7 @@ return { local cmp = require("cmp") local conditionalSources = { - { name = "nvim_lsp", max_item_count = 5, priority = 8 }, + { name = "nvim_lsp", max_item_count = 15, priority = 8 }, { name = "treesitter", max_item_count = 5, priority = 7 }, { name = "luasnip", max_item_count = 5, priority = 6 }, { name = "calc" }, diff --git a/vim/.vim/lua/plugins/google.lua b/vim/.vim/lua/plugins/google.lua index 8a8cf0b..a443cdf 100644 --- a/vim/.vim/lua/plugins/google.lua +++ b/vim/.vim/lua/plugins/google.lua @@ -99,13 +99,6 @@ return { end, lazy = false, }, - { - "flwyd/vim-imp", - lazy = false, - keys = { - { "i", ":ImpSuggest " }, - }, - }, { name = "ai.nvim", url = "sso://googler@user/vvvv/ai.nvim", diff --git a/vim/.vim/lua/plugins/imp.lua b/vim/.vim/lua/plugins/imp.lua new file mode 100644 index 0000000..403b267 --- /dev/null +++ b/vim/.vim/lua/plugins/imp.lua @@ -0,0 +1,6 @@ +return { + "flwyd/vim-imp", + keys = { + { "i", ":ImpSuggest " }, + }, +} diff --git a/vim/.vim/lua/plugins/lsp-lens.lua b/vim/.vim/lua/plugins/lsp-lens.lua index 83ef9d9..5414c9a 100644 --- a/vim/.vim/lua/plugins/lsp-lens.lua +++ b/vim/.vim/lua/plugins/lsp-lens.lua @@ -7,13 +7,11 @@ return { require("lsp-lens").setup({ enable = true, include_declaration = false, -- Reference include declaration - sections = { -- Enable / Disable specific request + sections = { -- Enable / Disable specific request, formatter example looks 'Format Requests' definition = false, references = true, - implementation = true, - }, - ignore_filetype = { - "prisma", + implements = true, + git_authors = true, }, }) end, diff --git a/vim/.vim/lua/plugins/lsp.lua b/vim/.vim/lua/plugins/lsp.lua index 8a29b0a..c701dfd 100644 --- a/vim/.vim/lua/plugins/lsp.lua +++ b/vim/.vim/lua/plugins/lsp.lua @@ -22,6 +22,10 @@ return { end, dependencies = { "rafamadriz/friendly-snippets" }, }, + { + "hinell/lsp-timeout.nvim", + dependencies = { "neovim/nvim-lspconfig" }, + }, { "neovim/nvim-lspconfig", dependencies = deps, diff --git a/vim/.vim/lua/plugins/notify.lua b/vim/.vim/lua/plugins/notify.lua index 7077e6a..1a3a566 100644 --- a/vim/.vim/lua/plugins/notify.lua +++ b/vim/.vim/lua/plugins/notify.lua @@ -3,10 +3,10 @@ return { event = "VimEnter", lazy = true, config = function() - local colors = require("catppuccin.palettes").get_palette() + -- local colors = require("catppuccin.palettes").get_palette() require("notify").setup({ - background_colour = colors.base, - fps = 10, -- default 30 + -- background_colour = colors.base, + fps = 20, -- default 30 stages = "slide", -- default fade_in_slide_out timeout = 5000, -- default 5000 }) diff --git a/vim/.vim/lua/plugins/theme.lua b/vim/.vim/lua/plugins/theme.lua new file mode 100644 index 0000000..4233e26 --- /dev/null +++ b/vim/.vim/lua/plugins/theme.lua @@ -0,0 +1,113 @@ +local use_google = require("utils").use_google + +return { + { + "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 = not use_google(), + cond = false, + config = function() + -- vim.cmd("colorscheme kanagawa") + end, + }, + { + "nyoom-engineering/oxocarbon.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 = not use_google(), + 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 = not use_google(), + config = function() + -- vim.cmd("colorscheme bluloco") + end, + }, + { + "catppuccin/nvim", + name = "catppuccin", + lazy = not 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 = use_google(), + config = function() + vim.g.catppuccin_flavour = "macchiato" -- latte, frappe, macchiato, mocha + local colors = require("catppuccin.palettes").get_palette() + + require("catppuccin").setup({ + flavour = "macchiato", + integrations = { + cmp = true, + -- coc_nvim = false, + dashboard = true, + -- fern = false, + fidget = true, + gitgutter = true, + gitsigns = true, + -- hop = false, + -- illuminate = false, + -- leap = false, + -- lightspeed = false, + -- lsp_saga = false, + lsp_trouble = true, + mason = true, + markdown = true, + -- neogit = false, + -- neotest = false, + neotree = true, + notify = true, + -- nvimtree = true, + -- overseer = false, + -- pounce = false, + symbols_outline = true, + telescope = true, + treesitter = true, + treesitter_context = false, + -- ts_rainbow = false, + -- vim_sneak = false, + -- vimwiki = false, + which_key = true, + + -- Special integrations, see https://github.com/catppuccin/nvim#special-integrations + dap = { + enabled = false, + enable_ui = false, + }, + indent_blankline = { + enabled = true, + colored_indent_levels = false, + }, + native_lsp = { + enabled = true, + virtual_text = { + errors = { "italic" }, + hints = { "italic" }, + warnings = { "italic" }, + information = { "italic" }, + }, + underlines = { + errors = { "underline" }, + hints = { "underline" }, + warnings = { "underline" }, + information = { "underline" }, + }, + }, + }, + custom_highlights = { + Identifier = { fg = colors.lavender }, + Statement = { fg = colors.rosewater }, + -- Identifier = { fg = colors.sapphire }, + Function = { fg = colors.mauve }, + }, + }) + + vim.api.nvim_command("colorscheme catppuccin") + end, + }, +}