diff --git a/lua/plugins.lua b/lua/plugins.lua index 3e23639..2f7b1d4 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -1,27 +1,5 @@ local plugins = { - { - "marcussimonsen/let-it-snow.nvim", - cmd = "LetItSnow", -- Wait with loading until command is run - opts = {}, - }, - { - "norcalli/nvim-colorizer.lua", - }, - { - "folke/lazydev.nvim", - ft = "lua", -- only load on lua files - init = function() - vim.g.lazydev_enabled = true - end, - opts = { - library = { - -- See the configuration section for more details - -- Load luvit types when the `vim.uv` word is found - { path = "luvit-meta/library", words = { "vim%.uv" } }, - }, - }, - }, - { "Bilal2453/luvit-meta", lazy = true }, -- optional `vim.uv` typings + -- { -- optional blink completion source for require statements and module annotations -- "saghen/blink.cmp", -- opts = { @@ -38,10 +16,7 @@ local plugins = { -- }, -- }, -- }, - { - "echasnovski/mini.bufremove", - version = "*", - }, + { "folke/noice.nvim", event = "VeryLazy", @@ -76,11 +51,6 @@ local plugins = { }) end, }, - { - "akinsho/bufferline.nvim", - version = "*", - dependencies = "nvim-tree/nvim-web-devicons", - }, { "akinsho/toggleterm.nvim", }, @@ -117,15 +87,9 @@ local plugins = { { "olrtg/nvim-emmet", }, - { - "lambdalisue/suda.vim", - }, { "sadan4/eregex.vim", }, - { - "windwp/nvim-ts-autotag", - }, { "barrett-ruth/live-server.nvim", build = "pnpm add -g live-server", @@ -144,9 +108,6 @@ local plugins = { "nvim-lualine/lualine.nvim", dependencies = { "nvim-tree/nvim-web-devicons" }, }, - { - "andweeb/presence.nvim", - }, { "jose-elias-alvarez/null-ls.nvim", }, @@ -165,66 +126,9 @@ local plugins = { { "neovim/nvim-lspconfig", }, - - { - "p00f/clangd_extensions.nvim", - }, - { - "abecodes/tabout.nvim", - lazy = false, - requires = { - "nvim-treesitter/nvim-treesitter", - "L3MON4D3/LuaSnip", - "hrsh7th/nvim-cmp", - }, - event = "InsertCharPre", -- Set the event to 'InsertCharPre' for better compatibility - priority = 1000, - }, - { - "nvim-treesitter/nvim-treesitter", - build = ":TSUpdate", - }, - { - "numToStr/Comment.nvim", - opts = { - -- add any options here - }, - lazy = false, - }, - - { - "windwp/nvim-autopairs", - event = "InsertEnter", - config = true, - -- use opts = {} for passing setup options - -- this is equalent to setup({}) function - opts = {}, - }, - { - "folke/tokyonight.nvim", - lazy = false, - priority = 1000, - opts = {}, - }, { "mhartington/formatter.nvim", }, - { - "nvim-telescope/telescope.nvim", - tag = "0.1.5", - opts = { - extensions = { - fzf = { - fuzzy = true, -- false will only do exact matching - override_generic_sorter = true, -- override the generic sorter - override_file_sorter = true, -- override the file sorter - case_mode = "ignore_case", -- or "ignore_case" or "respect_case" or smart_case - -- the default case_mode is "smart_case" - }, - }, - }, - dependencies = { "nvim-lua/plenary.nvim" }, - }, { "hrsh7th/cmp-nvim-lsp", }, @@ -241,29 +145,6 @@ local plugins = { { "saadparwaiz1/cmp_luasnip", }, - { - "nvim-tree/nvim-tree.lua", - }, - { - "kevinhwang91/nvim-ufo", - dependencies = { - "kevinhwang91/promise-async", - { - "luukvbaal/statuscol.nvim", - config = function() - local builtin = require("statuscol.builtin") - require("statuscol").setup({ - relculright = true, - segments = { - { text = { builtin.foldfunc }, click = "v:lua.ScFa" }, - { text = { "%s" }, click = "v:lua.ScSa" }, - { text = { builtin.lnumfunc, " " }, click = "v:lua.ScLa" }, - }, - }) - end, - }, - }, - }, --{ -- 'mfussenegger/nvim-lint' --}, diff --git a/lua/sets.lua b/lua/sets.lua index e1711c1..3262e75 100644 --- a/lua/sets.lua +++ b/lua/sets.lua @@ -1,19 +1,5 @@ -vim.opt.rnu = true -vim.opt.expandtab = true -vim.opt.tabstop = 4 -vim.opt.smarttab = true -vim.opt.shiftround = true -vim.opt.shiftwidth = 4 -vim.opt.smartcase = true -vim.opt.ignorecase = true -vim.opt.scrolloff = 6 -vim.opt.sloc = "statusline" +-- move to noice? +-- vim.opt.sloc = "statusline" -- eregex.vim vim.g.eregex_default_enable = 1 -vim.api.nvim_create_autocmd({ "BufEnter" }, { - - callback = function() - package.loaded.presence:update() - end, -}) diff --git a/lua/setup.lua b/lua/setup.lua index 66b6058..93b02d6 100644 --- a/lua/setup.lua +++ b/lua/setup.lua @@ -1,34 +1,17 @@ -require("themesetup") -vim.cmd([[colorscheme tokyonight]]) require("setupnotify") require("setupnoice") -require("mason").setup() -require("mason-lspconfig").setup() - -require("masonDownload") - require("setuplsp") require("setupformat") -require("setuptree") -require("setuptreesitter") -- Has to be setup after treesitter require("setuptabout") -require("setupufo") - require("setupcomment") -- setup function signature require("setupsig") -require("setuplualine") - require("setupDiscord") -require('telescope').load_extension('fzf') require('telescope').load_extension("noice") -require("setupbufferline") -require("setupterminal") require("setuphover") -require("colorizer").setup() diff --git a/lua/setupDiscord.lua b/lua/setupDiscord.lua deleted file mode 100644 index 7361454..0000000 --- a/lua/setupDiscord.lua +++ /dev/null @@ -1,33 +0,0 @@ --- The setup config table shows all available config options with their default values: -require("presence").setup({ - -- General options - auto_update = true, -- Update activity based on autocmd events (if `false`, map or manually execute `:lua package.loaded.presence:update()`) - neovim_image_text = "A text editor of all time", -- Text displayed when hovered over the Neovim image - main_image = "neovim", -- Main image display (either "neovim" or "file") - client_id = "793271441293967371", -- Use your own Discord application client id (not recommended) - log_level = nil, -- Log messages at or above this level (one of the following: "debug", "info", "warn", "error") - debounce_timeout = 5, -- Number of seconds to debounce events (or calls to `:lua package.loaded.presence:update(, true)`) - enable_line_number = true, -- Displays the current line number instead of the current project - blacklist = {}, -- A list of strings or Lua patterns that disable Rich Presence if the current file name, path, or workspace matches - buttons = { - { - label = "Git", - url = "https://github.com/sadan4", - }, - { - label = "My website", - url = "https://sadan.zip", - }, - }, -- Configure Rich Presence button(s), either a boolean to enable/disable, a static table (`{{ label = "