From f043d9087ad536a23148bdfce99730d0736c9283 Mon Sep 17 00:00:00 2001
From: Ste Vaidis <ste.vaidis@gmail.com>
Date: Wed, 16 Aug 2023 11:10:50 +0300
Subject: [PATCH] Update 2.Vim.lua

---
 2.Vim.lua | 137 ++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 108 insertions(+), 29 deletions(-)

diff --git a/2.Vim.lua b/2.Vim.lua
index c4e32dc..0812e98 100644
--- a/2.Vim.lua
+++ b/2.Vim.lua
@@ -14,7 +14,6 @@ return {
         }
       end,
     },
-
     {
       'dominikduda/vim_current_word', lazy = false},
     {
@@ -23,34 +22,89 @@ return {
       "gennaro-tedesco/nvim-jqx", ft = { "json", "yaml" }
     },
     {
-      'https://git.sr.ht/~whynothugo/lsp_lines.nvim',
-      lazy = false,
+      'windwp/nvim-autopairs',
+      event = "InsertEnter",
+      opts = {}
+    },
+    {
+      "ray-x/lsp_signature.nvim",
+      event = "BufRead",
       config = function()
-        require('lsp_lines').setup()
+        require("lsp_signature").setup()
       end,
     },
+    -- {
+    --   'https://git.sr.ht/~whynothugo/lsp_lines.nvim',
+    --   lazy = false,
+    --   config = function()
+    --     require('lsp_lines').setup()
+    --   end,
+    -- },
     {
       'zaldih/themery.nvim',
       lazy = false,
       config = function()
         require("themery").setup({
           themes = {
-            'vim-monokai-tasty',
+            'abscs',
+            'aurora',
+            'astrodark',
+            'astromars',
+            'astrotheme',
+            'blue',
+            'catppuccin',
+            'catppuccin-frappe',
+            'catppuccin-macchiato',
+            'catppuccin-mocha',
+            'darkblue',
+            'desert',
+            'duskfox',
+            'dracula',
+            'elflord',
+            'evening',
+            'github_dark',
+            'github_dark_dimmed',
+            'github_dark_high_contrast',
+            'github_dark_colorblind',
+            'github_dark_tritanopia',
+            'habamax',
+            'industry',
+            'koehler',
+            'lunaperche',
+            'moonfly',
+            'murphy',
+            'neon',
             'nightfox',
+            'nightfly',
+            'retrobox',
+            'ron',
+            'slate',
+            'sorbet',
             'terafox',
+            'tokyonight-night',
+            'tokyonight-storm',
+            'tokyonight-moon',
+            'torte',
+            'vim-monokai-tasty',
+            'wildcharm',
+            'zaibatsu',
             'carbonfox',
             'PaperColor',
             'onedark',
+            'onedarker',
+            'ofirkai',
             'vscode',
             'material',
-            'notelight',
+            'kanagawa-wave',
+            'kanagawa-dragon',
+            'tender',
+            'zephyr',
           },
-          themeConfigFile = "~/.config/nvim/lua/settings/theme.lua", -- Described below
+          themeConfigFile = "~/.config/nvim/lua/user/polish.lua",
           livePreview = true,
         })
       end,
     },
-
     -- themes goes here -----------------------------------
     {"folke/tokyonight.nvim",opts = {}},
     {'EdenEast/nightfox.nvim'},
@@ -59,30 +113,38 @@ return {
     {'Mofiqul/vscode.nvim'},
     {'kaicataldo/material.vim'},
     {'yasukotelin/notelight'},
-    {'bluz71/vim-moonfly-colors', name = 'moonfly', priority = 1000},
-    {'bluz71/vim-nightfly-colors', name = "nightfly", priority = 1000 },
+    {'bluz71/vim-moonfly-colors', name = 'moonfly'},
+    {'bluz71/vim-nightfly-colors', name = "nightfly"},
     {'patstockwell/vim-monokai-tasty'},
-    {'catppuccin/nvim', name = "catppuccin", priority = 1000 },
+    {'catppuccin/nvim', name = "catppuccin"},
     {'rebelot/kanagawa.nvim'},
     {'jacoborus/tender.vim'},
     {'lunarvim/Onedarker.nvim'},
+    {'Abstract-IDE/Abstract-cs'},
+    {'rafamadriz/neon'},
+    {'sainnhe/sonokai'},
+    {'glepnir/zephyr-nvim'},
+    {'ray-x/aurora'},
+    {'ofirgall/ofirkai.nvim'},
+    {'dracula/vim', name = 'dracula'},
+    {'projekt0n/github-nvim-theme'},
 
     -- code plugins overide settings ----------------------
-    {
-      'lukas-reineke/indent-blankline.nvim',
-      opts={
-        char = " ",
-        context_char = " ",
-      }
-    }
+    -- {
+    --   'lukas-reineke/indent-blankline.nvim',
+    --   opts={
+    --     char = " ",
+    --     context_char = " ",
+    --   }
+    -- }
   },
   diagnostics = {
-    virtual_text = false,
-    underline = false,
+    virtual_text = true,
+    underline = true,
   },
   mappings = {
     n = {
-      -- normal mode keymaps ------------------------------
+      -- normal mode keymaps
       ["<Tab>"] = ":bnext<cr>",
       ["<S-Tab>"] = ":bprev<cr>"
     },
@@ -90,25 +152,42 @@ return {
       -- edit mode keymaps
     }
   },
-  g = {
-    cmp_enabled = true,
-    -- diagnostics_mode = 0,
+  -- g = {
+  --   cmp_enabled = true,
+  --   diagnostics_mode = 3,
+  --   wrap = true,
+  -- },
+  options = {
+    opt = {
+      relativenumber = true, -- sets vim.opt.relativenumber
+      wrap = true,
+    },
+    g = {
+      mapleader = " ", -- sets vim.g.mapleader
+      wrap = true,
+    },
   },
-
   -- opt ={
   --   diagnostic = {
   --     config = { virtual_lines = false }
   --   }
   -- },
-  
   polish = function()
-    -- vmirc commands
     vim.cmd [[TransparentDisable]]
     vim.cmd [[let g:vim_monokai_tasty_italic = 1]]
     vim.cmd [[:colorscheme vim-monokai-tasty]]
-
+    -- Sonokai theme
+    -- vim.cmd[[let g:sonokai_better_performance = 1]]
+    -- vim.cmd[[let g:sonokai_style = 'atlantis']]
+    -- vim.cmd[[let g:sonokai_style = 'andromeda']]
+    -- vim.cmd[[let g:sonokai_style = 'default']]
+    -- vim.cmd[[colorscheme sonokai]]
   end,
-
+  dap = {
+    adapters = {
+      --
+    }
+  },
   lsp = {
     config = {
       intelephense = {