From 85cf458908471358fa85dd2a729c2e67e32cdb43 Mon Sep 17 00:00:00 2001 From: Saeed Afzal Date: Fri, 3 Mar 2023 21:17:23 +0000 Subject: [PATCH] Update configuration --- lua/core/init.lua | 4 +- lua/plugins/config/barbar.lua | 3 - lua/plugins/config/catppuccin.lua | 52 ------------ lua/plugins/config/colorizer.lua | 14 ++- lua/plugins/config/lspsetup.lua | 5 -- lua/plugins/config/lualine.lua | 9 +- lua/plugins/config/nvimtree.lua | 3 +- lua/plugins/config/tokyonight.lua | 13 +-- lua/plugins/config/treesitter.lua | 4 +- lua/plugins/setup.lua | 136 +----------------------------- 10 files changed, 24 insertions(+), 219 deletions(-) delete mode 100644 lua/plugins/config/barbar.lua delete mode 100644 lua/plugins/config/catppuccin.lua delete mode 100644 lua/plugins/config/lspsetup.lua diff --git a/lua/core/init.lua b/lua/core/init.lua index e269f3b..dc30d24 100644 --- a/lua/core/init.lua +++ b/lua/core/init.lua @@ -1,8 +1,8 @@ local opt = vim.opt local g = vim.g --- Disable -g.loaded = 1 +-- Disable netrw +g.loaded_netrw = 1 g.loaded_netrwPlugin = 1 -- Settings diff --git a/lua/plugins/config/barbar.lua b/lua/plugins/config/barbar.lua deleted file mode 100644 index 945acb5..0000000 --- a/lua/plugins/config/barbar.lua +++ /dev/null @@ -1,3 +0,0 @@ -require("bufferline").setup { - maximum_length = 25 -} diff --git a/lua/plugins/config/catppuccin.lua b/lua/plugins/config/catppuccin.lua deleted file mode 100644 index 4a947c5..0000000 --- a/lua/plugins/config/catppuccin.lua +++ /dev/null @@ -1,52 +0,0 @@ -vim.g.catppuccin_flavour = "mocha" - -require("catppuccin").setup { - term_colors = true, - styles = { - conditionals = { "italic", "bold" }, - loops = { "italic", "bold" }, - functions = { "italic", "bold" }, - keywords = { "italic", "bold" }, - strings = { "bold" }, - variables = { "bold" }, - numbers = { "bold" }, - booleans = { "bold" }, - properties = { "italic" }, - types = { "italic", "bold" } - }, - integrations = { - barbar = true, - gitsigns = true, - cmp = true, - nvimtree = true, - treesitter_context = true, - treesitter = true, - symbols_outline = true, - telescope = true, - lsp_trouble = true, - which_key = true, - - 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" } - } - }, - } -} - --- vim.cmd [[colorscheme catppuccin]] diff --git a/lua/plugins/config/colorizer.lua b/lua/plugins/config/colorizer.lua index 6632c39..1aa758e 100644 --- a/lua/plugins/config/colorizer.lua +++ b/lua/plugins/config/colorizer.lua @@ -1,13 +1,11 @@ -require("colorizer").setup( - { "*" }, - { - RGB = true, - RRGGBB = true, - names = true, +require("colorizer").setup { + user_default_options = { RRGGBBAA = true, + AARRGGBB = true, rgb_fn = true, hsl_fn = true, css = true, - css_fn = true + css_fn = true, + sass = { enable = true } } -) +} diff --git a/lua/plugins/config/lspsetup.lua b/lua/plugins/config/lspsetup.lua deleted file mode 100644 index 6aa0c8a..0000000 --- a/lua/plugins/config/lspsetup.lua +++ /dev/null @@ -1,5 +0,0 @@ -require("lsp-setup").setup { - servers = { - sumneko_lua = {} - } -} diff --git a/lua/plugins/config/lualine.lua b/lua/plugins/config/lualine.lua index d313475..91b2760 100644 --- a/lua/plugins/config/lualine.lua +++ b/lua/plugins/config/lualine.lua @@ -1,13 +1,14 @@ require("lualine").setup { options = { - -- theme = "catppuccin" theme = "tokyonight" }, extensions = { - "nvim-tree", "fzf", - "toggleterm", - "symbols-outline" + "nvim-dap-ui", + "nvim-tree", + "quickfix", + "symbols-outline", + "toggleterm" } } diff --git a/lua/plugins/config/nvimtree.lua b/lua/plugins/config/nvimtree.lua index 4d30238..74da236 100644 --- a/lua/plugins/config/nvimtree.lua +++ b/lua/plugins/config/nvimtree.lua @@ -18,7 +18,8 @@ require("nvim-tree").setup { }, diagnostics = { - enable = true + enable = true, + show_on_dirs = true }, filters = { diff --git a/lua/plugins/config/tokyonight.lua b/lua/plugins/config/tokyonight.lua index a1eef70..1195f1b 100644 --- a/lua/plugins/config/tokyonight.lua +++ b/lua/plugins/config/tokyonight.lua @@ -1,17 +1,10 @@ require("tokyonight").setup { style = "night", - terminal_colors = true, styles = { - conditionals = { italic = true, bold = true }, - loops = { italic = true, bold = true }, - functions = { italic = true, bold = true }, + comments = { italic = true }, keywords = { italic = true, bold = true }, - strings = { bold = true }, - variables = { bold = true }, - numbers = { bold = true }, - booleans = { bold = true }, - properties = { italic = true }, - types = { italic = true, bold = true } + functions = { italic = true, bold = true }, + variables = { italic = true, bold = true } }, lualine_bold = true } diff --git a/lua/plugins/config/treesitter.lua b/lua/plugins/config/treesitter.lua index 5695e26..3934e25 100644 --- a/lua/plugins/config/treesitter.lua +++ b/lua/plugins/config/treesitter.lua @@ -1,5 +1,7 @@ require("nvim-treesitter.configs").setup { - ensure_installed = { "lua" }, + ensure_installed = { "vim", "lua", "typescript" }, + auto_install = false, + highlight = { enable = true, additional_vim_regex_highlighting = false diff --git a/lua/plugins/setup.lua b/lua/plugins/setup.lua index 90d4e41..101d1a6 100644 --- a/lua/plugins/setup.lua +++ b/lua/plugins/setup.lua @@ -31,14 +31,6 @@ return packer.startup(function(use) end } - use { - "catppuccin/nvim", - as = "catppuccin", - config = function() - require("plugins.config.catppuccin") - end - } - use "kyazdani42/nvim-web-devicons" use { @@ -51,10 +43,7 @@ return packer.startup(function(use) use { "romgrk/barbar.nvim", - requires = "kyazdani42/nvim-web-devicons", - config = function() - require("plugins.config.barbar") - end + requires = "kyazdani42/nvim-web-devicons" } use { @@ -74,9 +63,9 @@ return packer.startup(function(use) } use { - "norcalli/nvim-colorizer.lua", + "NvChad/nvim-colorizer.lua", config = function() - require("plugins.config.colorizer") + require("colorizer").setup() end } @@ -93,123 +82,4 @@ return packer.startup(function(use) require("plugins.config.blankline") end } - - use { - "numToStr/Comment.nvim", - config = function() - require("Comment").setup() - end - } - - use { - "akinsho/toggleterm.nvim", - tag = "*", - config = function() - require("plugins.config.toggleterm") - end - } - - use { - "goolord/alpha-nvim", - requires = "kyazdani42/nvim-web-devicons", - config = function() - require("alpha").setup(require("alpha.themes.dashboard").config) - end - } - - -- Telescope - use { - "nvim-telescope/telescope-fzf-native.nvim", - run = "make" - } - - use { - "nvim-telescope/telescope.nvim", - requires = "nvim-lua/plenary.nvim", - config = function() - require("plugins.config.telescope") - end - } - - -- LSP - use { - "junnplus/nvim-lsp-setup", - requires = { - "neovim/nvim-lspconfig", - "williamboman/mason.nvim", - "williamboman/mason-lspconfig.nvim" - }, - config = function() - require("plugins.config.lspsetup") - end - } - - use { - "hrsh7th/nvim-cmp", - requires = { - "L3MON4D3/LuaSnip", - "hrsh7th/cmp-nvim-lsp", - "hrsh7th/cmp-path", - "hrsh7th/cmp-buffer", - "saadparwaiz1/cmp_luasnip", - "hrsh7th/cmp-cmdline" - }, - config = function() - require("plugins.config.cmp") - end - } - - use { - "rafamadriz/friendly-snippets", - event = "InsertCharPre" - } - - use { - "ray-x/lsp_signature.nvim", - after = "nvim-lspconfig", - config = function() - require("lsp_signature").setup() - end - } - - use { - "windwp/nvim-autopairs", - config = function() - require("nvim-autopairs").setup() - end - } - - use { - "folke/trouble.nvim", - requires = "kyazdani42/nvim-web-devicons", - config = function() - require("trouble").setup() - end - } - - use { - "folke/todo-comments.nvim", - requires = "nvim-lua/plenary.nvim", - config = function() - require("todo-comments").setup() - end - } - - use { - "simrat39/symbols-outline.nvim", - config = function() - require("symbols-outline").setup() - end - } - - use { - "folke/which-key.nvim", - config = function() - require("plugins.config.whichkey") - end - } - - if packer_bootstrap then - require("packer").sync() - end end)