From 4f00ad8f84710c693bc7a4e99a8136a773353ece Mon Sep 17 00:00:00 2001 From: TiagoRG Date: Tue, 27 Feb 2024 12:39:43 +0000 Subject: [PATCH] Neovim Updates Signed-off-by: TiagoRG --- .config/nvim/README.md | 4 +- .config/nvim/after/plugin/aerial.lua | 2 + .config/nvim/after/plugin/wrapping.lua | 2 + .config/nvim/data/colorscheme.txt | 2 +- .config/nvim/lua/tiagorg/init.lua | 3 +- .config/nvim/lua/tiagorg/packer.lua | 59 +++++-------------------- .config/nvim/plugin/packer_compiled.lua | 25 ----------- 7 files changed, 19 insertions(+), 78 deletions(-) diff --git a/.config/nvim/README.md b/.config/nvim/README.md index 26f4e20..b5e0f28 100644 --- a/.config/nvim/README.md +++ b/.config/nvim/README.md @@ -1,3 +1 @@ -# Neovim - -## This is my neovim configuration, highly based on [ThePrimeagen](https://github.com/ThePrimeagen) +# Neovim Configuration diff --git a/.config/nvim/after/plugin/aerial.lua b/.config/nvim/after/plugin/aerial.lua index 18c4086..2109fab 100644 --- a/.config/nvim/after/plugin/aerial.lua +++ b/.config/nvim/after/plugin/aerial.lua @@ -1,3 +1,5 @@ +require("aerial").setup() + vim.keymap.set("n", "{", "AerialPrev") vim.keymap.set("n", "}", "AerialNext") vim.keymap.set("n", "", "AerialToggle float") diff --git a/.config/nvim/after/plugin/wrapping.lua b/.config/nvim/after/plugin/wrapping.lua index 316ad6a..da1bad4 100644 --- a/.config/nvim/after/plugin/wrapping.lua +++ b/.config/nvim/after/plugin/wrapping.lua @@ -1,3 +1,5 @@ +require("wrapping").setup() + opts = { auto_set_mode_filetype_allowlist = { "asciidoc", diff --git a/.config/nvim/data/colorscheme.txt b/.config/nvim/data/colorscheme.txt index 3b15296..0d83d6f 100644 --- a/.config/nvim/data/colorscheme.txt +++ b/.config/nvim/data/colorscheme.txt @@ -1 +1 @@ -onedark \ No newline at end of file +rose-pine \ No newline at end of file diff --git a/.config/nvim/lua/tiagorg/init.lua b/.config/nvim/lua/tiagorg/init.lua index 462887a..21cf19f 100644 --- a/.config/nvim/lua/tiagorg/init.lua +++ b/.config/nvim/lua/tiagorg/init.lua @@ -1,5 +1,6 @@ require("tiagorg.set") require("tiagorg.remap") -require('Comment').setup() +require('Comment').setup() require("liveshare").setup() +require("nvim-surround").setup() diff --git a/.config/nvim/lua/tiagorg/packer.lua b/.config/nvim/lua/tiagorg/packer.lua index 7c7f36d..6d88b4a 100644 --- a/.config/nvim/lua/tiagorg/packer.lua +++ b/.config/nvim/lua/tiagorg/packer.lua @@ -1,5 +1,3 @@ --- This file can be loaded by calling `lua require('plugins')` from your init.vim - -- Only required if you have packer configured as `opt` vim.cmd [[packadd packer.nvim]] @@ -8,12 +6,7 @@ return require('packer').startup(function(use) use 'wbthomason/packer.nvim' -- Themes - use { - "loctvl842/monokai-pro.nvim", -- Fking goated theme - config = function() - require("monokai-pro").setup() - end - } + use "loctvl842/monokai-pro.nvim" use { 'rose-pine/neovim', as = 'rose-pine', @@ -23,9 +16,9 @@ return require('packer').startup(function(use) -- Essentials use { - 'nvim-telescope/telescope.nvim', tag = '0.1.1', - -- or , branch = '0.1.x', - requires = { { 'nvim-lua/plenary.nvim' } } + 'nvim-telescope/telescope.nvim', + tag = '0.1.1', + requires = { 'nvim-lua/plenary.nvim' } } use('nvim-treesitter/nvim-treesitter', { run = ':TSUpdate' }) use("nvim-treesitter/nvim-treesitter-context") @@ -47,39 +40,17 @@ return require('packer').startup(function(use) { 'rafamadriz/friendly-snippets' }, } } - use({ - "L3MON4D3/LuaSnip", - -- follow latest release. - tag = "v2.*", -- Replace by the latest released major (first number of latest release) - -- install jsregexp (optional!:). - run = "make install_jsregexp" - }) - use({ - "stevearc/aerial.nvim", - config = function() - require("aerial").setup() - end, - }) - use('m4xshen/autoclose.nvim') + use "stevearc/aerial.nvim" + use 'm4xshen/autoclose.nvim' -- Extras - use('mbbill/undotree') - use({ - "andrewferrier/wrapping.nvim", - config = function() - require("wrapping").setup() - end - }) + use 'mbbill/undotree' + use "andrewferrier/wrapping.nvim" use "lukas-reineke/indent-blankline.nvim" use "HiPhish/nvim-ts-rainbow2" use "folke/trouble.nvim" - use { - "FotiadisM/tabset.nvim", - config = function() - require("tabset").setup() - end - } - use('nvim-tree/nvim-web-devicons') + use "FotiadisM/tabset.nvim" + use 'nvim-tree/nvim-web-devicons' use 'nvim-tree/nvim-tree.lua' use 'lewis6991/gitsigns.nvim' use 'romgrk/barbar.nvim' @@ -88,16 +59,8 @@ return require('packer').startup(function(use) use({ "kylechui/nvim-surround", tag = "*", -- Use for stability; omit to use `main` branch for the latest features - config = function() - require("nvim-surround").setup({ - -- Configuration here, or leave empty to use defaults - }) - end }) - use { - 'nvim-lualine/lualine.nvim', - requires = { 'nvim-tree/nvim-web-devicons', opt = true }, - } + use 'nvim-lualine/lualine.nvim' -- Misc use('wakatime/vim-wakatime') diff --git a/.config/nvim/plugin/packer_compiled.lua b/.config/nvim/plugin/packer_compiled.lua index e2dbcf2..f70a063 100644 --- a/.config/nvim/plugin/packer_compiled.lua +++ b/.config/nvim/plugin/packer_compiled.lua @@ -95,7 +95,6 @@ _G.packer_plugins = { url = "https://github.com/L3MON4D3/LuaSnip" }, ["aerial.nvim"] = { - config = { "\27LJ\2\n4\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\vaerial\frequire\0" }, loaded = true, path = "/home/tiagorg/.local/share/nvim/site/pack/packer/start/aerial.nvim", url = "https://github.com/stevearc/aerial.nvim" @@ -181,7 +180,6 @@ _G.packer_plugins = { url = "https://github.com/williamboman/mason.nvim" }, ["monokai-pro.nvim"] = { - config = { "\27LJ\2\n9\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\16monokai-pro\frequire\0" }, loaded = true, path = "/home/tiagorg/.local/share/nvim/site/pack/packer/start/monokai-pro.nvim", url = "https://github.com/loctvl842/monokai-pro.nvim" @@ -202,7 +200,6 @@ _G.packer_plugins = { url = "https://github.com/neovim/nvim-lspconfig" }, ["nvim-surround"] = { - config = { "\27LJ\2\n?\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\18nvim-surround\frequire\0" }, loaded = true, path = "/home/tiagorg/.local/share/nvim/site/pack/packer/start/nvim-surround", url = "https://github.com/kylechui/nvim-surround" @@ -258,7 +255,6 @@ _G.packer_plugins = { url = "https://github.com/rose-pine/neovim" }, ["tabset.nvim"] = { - config = { "\27LJ\2\n4\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\vtabset\frequire\0" }, loaded = true, path = "/home/tiagorg/.local/share/nvim/site/pack/packer/start/tabset.nvim", url = "https://github.com/FotiadisM/tabset.nvim" @@ -299,7 +295,6 @@ _G.packer_plugins = { url = "https://github.com/Mofiqul/vscode.nvim" }, ["wrapping.nvim"] = { - config = { "\27LJ\2\n6\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\rwrapping\frequire\0" }, loaded = true, path = "/home/tiagorg/.local/share/nvim/site/pack/packer/start/wrapping.nvim", url = "https://github.com/andrewferrier/wrapping.nvim" @@ -307,26 +302,6 @@ _G.packer_plugins = { } time([[Defining packer_plugins]], false) --- Config for: nvim-surround -time([[Config for nvim-surround]], true) -try_loadstring("\27LJ\2\n?\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\18nvim-surround\frequire\0", "config", "nvim-surround") -time([[Config for nvim-surround]], false) --- Config for: tabset.nvim -time([[Config for tabset.nvim]], true) -try_loadstring("\27LJ\2\n4\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\vtabset\frequire\0", "config", "tabset.nvim") -time([[Config for tabset.nvim]], false) --- Config for: wrapping.nvim -time([[Config for wrapping.nvim]], true) -try_loadstring("\27LJ\2\n6\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\rwrapping\frequire\0", "config", "wrapping.nvim") -time([[Config for wrapping.nvim]], false) --- Config for: monokai-pro.nvim -time([[Config for monokai-pro.nvim]], true) -try_loadstring("\27LJ\2\n9\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\16monokai-pro\frequire\0", "config", "monokai-pro.nvim") -time([[Config for monokai-pro.nvim]], false) --- Config for: aerial.nvim -time([[Config for aerial.nvim]], true) -try_loadstring("\27LJ\2\n4\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\vaerial\frequire\0", "config", "aerial.nvim") -time([[Config for aerial.nvim]], false) _G._packer.inside_compile = false if _G._packer.needs_bufread == true then