From 125d86d70c722c0f375f5eb34ef3ae2487712b45 Mon Sep 17 00:00:00 2001 From: Andy Teijelo Date: Wed, 1 Nov 2023 14:12:01 -0400 Subject: [PATCH] more stuff --- after/ftplugin/c.lua | 2 ++ lazy-lock.json | 10 ++++++++++ lua/config/lazy.lua | 6 +++--- lua/config/options.lua | 1 + lua/plugins/catppuccin.lua | 24 ++++++++++++++++++++++++ lua/plugins/lsp.lua | 28 +++++++++++++++++++++++++--- lua/plugins/lsp_signature.lua | 6 ++++++ 7 files changed, 71 insertions(+), 6 deletions(-) create mode 100644 after/ftplugin/c.lua create mode 100644 lua/plugins/catppuccin.lua create mode 100644 lua/plugins/lsp_signature.lua diff --git a/after/ftplugin/c.lua b/after/ftplugin/c.lua new file mode 100644 index 0000000..906533a --- /dev/null +++ b/after/ftplugin/c.lua @@ -0,0 +1,2 @@ +vim.opt.sw=2 +vim.opt.ts=2 diff --git a/lazy-lock.json b/lazy-lock.json index b8e8f03..972a5a2 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -9,6 +9,7 @@ "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "conform.nvim": { "branch": "master", "commit": "2c1e852fbf723b7d89b14fd28089472d92edeeb9" }, + "crates.nvim": { "branch": "main", "commit": "aac57ef84cf4fecf7907114b22e875f84a6128ee" }, "dashboard-nvim": { "branch": "master", "commit": "c71cab740e2add248c54c458b5ca9d6e77c30fa6" }, "dressing.nvim": { "branch": "master", "commit": "1f2d1206a03bd3add8aedf6251e4534611de577f" }, "fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" }, @@ -16,8 +17,10 @@ "gitsigns.nvim": { "branch": "main", "commit": "af0f583cd35286dd6f0e3ed52622728703237e50" }, "indent-blankline.nvim": { "branch": "master", "commit": "29be0919b91fb59eca9e90690d76014233392bef" }, "lazy.nvim": { "branch": "main", "commit": "16603c6917435d8446f7357cb61095138a417085" }, + "lsp_signature.nvim": { "branch": "master", "commit": "33250c84c7a552daf28ac607d9d9e82f88cd0907" }, "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "40301e1c74bc0946eece13edf2b1c561cc497491" }, + "mason-nvim-dap.nvim": { "branch": "main", "commit": "f0cd12f7a8a310c58cecebddb6b219ffad1cfd0f" }, "mason.nvim": { "branch": "main", "commit": "eabf6d347fdb75be360d4c0ced1145670a171453" }, "mini.ai": { "branch": "main", "commit": "fc9ce93eb8d58ce1a39101928fb5ea8f8b97844c" }, "mini.comment": { "branch": "main", "commit": "e4320af992cd053a7da2f33d9f63a86c2ab6ce59" }, @@ -29,6 +32,10 @@ "neodev.nvim": { "branch": "main", "commit": "80487e4f7bfa11c2ef2a1b461963db019aad6a73" }, "nui.nvim": { "branch": "main", "commit": "c0c8e347ceac53030f5c1ece1c5a5b6a17a25b32" }, "nvim-cmp": { "branch": "main", "commit": "51260c02a8ffded8e16162dcf41a23ec90cfba62" }, + "nvim-dap": { "branch": "master", "commit": "4048f37bc8b1a36fe1f5fde0df7d84aef71380e4" }, + "nvim-dap-python": { "branch": "master", "commit": "37b4cba02e337a95cb62ad1609b3d1dccb2e5d42" }, + "nvim-dap-ui": { "branch": "master", "commit": "34160a7ce6072ef332f350ae1d4a6a501daf0159" }, + "nvim-dap-virtual-text": { "branch": "master", "commit": "57f1dbd0458dd84a286b27768c142e1567f3ce3b" }, "nvim-lint": { "branch": "master", "commit": "962a76877a4479a535b935bd7ef35ad41ba308b2" }, "nvim-lspconfig": { "branch": "master", "commit": "d0467b9574b48429debf83f8248d8cee79562586" }, "nvim-spectre": { "branch": "master", "commit": "696cff781a4a7ecc91549736835e2acbd00fe859" }, @@ -40,11 +47,14 @@ "nvim-web-devicons": { "branch": "master", "commit": "5de460ca7595806044eced31e3c36c159a493857" }, "persistence.nvim": { "branch": "main", "commit": "ad538bfd5336f1335cdb6fd4e0b0eebfa6e12f32" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, + "rust-tools.nvim": { "branch": "master", "commit": "0cc8adab23117783a0292a0c8a2fbed1005dc645" }, + "tailwindcss-colorizer-cmp.nvim": { "branch": "main", "commit": "bc25c56083939f274edcfe395c6ff7de23b67c50" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope.nvim": { "branch": "master", "commit": "4522d7e3ea75ffddabdc39957168a8a7060b5df0" }, "todo-comments.nvim": { "branch": "main", "commit": "4a6737a8d70fe1ac55c64dfa47fcb189ca431872" }, "tokyonight.nvim": { "branch": "main", "commit": "f247ee700b569ed43f39320413a13ba9b0aef0db" }, "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, + "venv-selector.nvim": { "branch": "main", "commit": "48c9cd0dbc0ce3cc02fd6164e4f665dba338a3ec" }, "vim-bbye": { "branch": "master", "commit": "25ef93ac5a87526111f43e5110675032dbcacf56" }, "vim-illuminate": { "branch": "master", "commit": "3bd2ab64b5d63b29e05691e624927e5ebbf0fb86" }, "vim-startuptime": { "branch": "master", "commit": "454b3de856b7bd298700de33d79774ca9b9e3875" }, diff --git a/lua/config/lazy.lua b/lua/config/lazy.lua index ba9b44b..38e9eeb 100644 --- a/lua/config/lazy.lua +++ b/lua/config/lazy.lua @@ -11,9 +11,9 @@ require("lazy").setup({ -- add LazyVim and import its plugins { "LazyVim/LazyVim", import = "lazyvim.plugins" }, -- import any extras modules here - { import = "lazyvim.plugins.extras.lang.typescript" }, - { import = "lazyvim.plugins.extras.linting.eslint" }, - { import = "lazyvim.plugins.extras.formatting.prettier" }, + -- { import = "lazyvim.plugins.extras.lang.typescript" }, + -- { import = "lazyvim.plugins.extras.linting.eslint" }, + -- { import = "lazyvim.plugins.extras.formatting.prettier" }, -- { import = "lazyvim.plugins.extras.lang.json" }, -- { import = "lazyvim.plugins.extras.ui.mini-animate" }, -- import/override with your plugins diff --git a/lua/config/options.lua b/lua/config/options.lua index e2907c8..0d872d8 100644 --- a/lua/config/options.lua +++ b/lua/config/options.lua @@ -9,3 +9,4 @@ vim.opt.list = false vim.opt.pumblend = 0 vim.opt.tabstop = 4 vim.opt.shiftwidth = 4 +vim.g.autoformat = false diff --git a/lua/plugins/catppuccin.lua b/lua/plugins/catppuccin.lua new file mode 100644 index 0000000..a23cddf --- /dev/null +++ b/lua/plugins/catppuccin.lua @@ -0,0 +1,24 @@ +return { + -- { + -- "catppuccin/nvim", + -- name = "catppuccin", + -- dependencies = { + -- "mg979/vim-visual-multi", + -- }, + -- priority = 1000, + -- config = function() + -- require("catppuccin").setup({ + -- custom_highlights = function(colors) + -- print("fuuuuuuuuuuuuuuuuuuuck", colors.red) + -- return { + -- TreesitterContext = { bg = colors.mantle }, + -- TreesitterContextLineNumber = { bg = colors.mantle }, + -- TreesitterContextBottom = { style = { "underline" } }, + -- MultiCursor = { bg = colors.red }, + -- VM_Cursor = { bg = colors.red }, + -- } + -- end, + -- }) + -- end, + -- }, +} diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index e42741e..7004119 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -3,7 +3,7 @@ return { "neovim/nvim-lspconfig", init = function() local format = function() - require("lazyvim.plugins.lsp.format").format({ force = true }) + require("lazyvim.util").format({ force = true }) end local keys = require("lazyvim.plugins.lsp.keymaps").get() @@ -17,7 +17,7 @@ return { }) end, opts = { - autoformat = false, + -- autoformat = false, diagnostics = { update_in_insert = true, }, @@ -36,7 +36,29 @@ return { command = "clippy", }, }, - } + }, + }, + lua_ls = { + -- mason = false, -- set to false if you don't want this server to be installed with mason + -- Use this to add any additional keymaps + -- for specific lsp servers + root_dir = function() + -- local Path = require('plenary.path') + -- return Path:new(fname):parent().filename + return vim.loop.cwd() + end, + -- ---@type LazyKeys[] + -- keys = {}, + settings = { + Lua = { + workspace = { + checkThirdParty = false, + }, + completion = { + callSnippet = "Replace", + }, + }, + }, }, }, }, diff --git a/lua/plugins/lsp_signature.lua b/lua/plugins/lsp_signature.lua new file mode 100644 index 0000000..44a574a --- /dev/null +++ b/lua/plugins/lsp_signature.lua @@ -0,0 +1,6 @@ +return { + { + "ray-x/lsp_signature.nvim", + enabled = true, + }, +}