update

lua/plugins.lua

@@ -276,6 +276,7 @@ require('packer').startup(function(use)
     use { 'nvimtools/none-ls.nvim' }
     use { 'neovim/nvim-lspconfig' }
     use { 'onsails/lspkind-nvim' }
+    use { 'lukas-reineke/lsp-format.nvim' }
 
     -- DAP {{{
 
@@ -351,10 +352,10 @@ require('packer').startup(function(use)
         config = function()
             require('neorg').setup {
                 load = {
-                    ["core.defaults"] = {},                                 -- Loads default behaviour
-                    ["core.concealer"] = {},                                -- Adds pretty icons to your documents
+                    ["core.defaults"] = {},                                     -- Loads default behaviour
+                    ["core.concealer"] = {},                                    -- Adds pretty icons to your documents
                     ["core.completion"] = { config = { engine = "nvim-cmp" } }, -- Adds completion
-                    ["core.dirman"] = {                                     -- Manages Neorg workspaces
+                    ["core.dirman"] = {                                         -- Manages Neorg workspaces
                         config = { workspaces = { notes = "~/notes" } }
                     }
                 }
@@ -375,50 +376,57 @@ require('packer').startup(function(use)
     -- COLORSCHEMES {{{
 
     use { 'Mofiqul/dracula.nvim' }
-    use({
-        'NTBBloodbath/doom-one.nvim',
-        setup = function()
-            -- Add color to cursor
-            vim.g.doom_one_cursor_coloring = false
-            -- Set :terminal colors
-            vim.g.doom_one_terminal_colors = true
-            -- Enable italic comments
-            vim.g.doom_one_italic_comments = false
-            -- Enable TS support
-            vim.g.doom_one_enable_treesitter = true
-            -- Color whole diagnostic text or only underline
-            vim.g.doom_one_diagnostics_text_color = false
-            -- Enable transparent background
-            vim.g.doom_one_transparent_background = false
+    -- use({
+    --     'NTBBloodbath/doom-one.nvim',
+    --     setup = function()
+    --         -- Add color to cursor
+    --         vim.g.doom_one_cursor_coloring = false
+    --         -- Set :terminal colors
+    --         vim.g.doom_one_terminal_colors = true
+    --         -- Enable italic comments
+    --         vim.g.doom_one_italic_comments = false
+    --         -- Enable TS support
+    --         vim.g.doom_one_enable_treesitter = true
+    --         -- Color whole diagnostic text or only underline
+    --         vim.g.doom_one_diagnostics_text_color = false
+    --         -- Enable transparent background
+    --         vim.g.doom_one_transparent_background = false
 
-            -- Pumblend transparency
-            vim.g.doom_one_pumblend_enable = false
-            vim.g.doom_one_pumblend_transparency = 20
+    --         -- Pumblend transparency
+    --         vim.g.doom_one_pumblend_enable = false
+    --         vim.g.doom_one_pumblend_transparency = 20
 
-            -- Plugins integration
-            vim.g.doom_one_plugin_neorg = true
-            vim.g.doom_one_plugin_barbar = false
-            vim.g.doom_one_plugin_telescope = true
-            vim.g.doom_one_plugin_neogit = true
-            vim.g.doom_one_plugin_nvim_tree = true
-            vim.g.doom_one_plugin_dashboard = true
-            vim.g.doom_one_plugin_startify = true
-            vim.g.doom_one_plugin_whichkey = true
-            vim.g.doom_one_plugin_indent_blankline = true
-            vim.g.doom_one_plugin_vim_illuminate = false
-            vim.g.doom_one_plugin_lspsaga = false
-        end,
-        config = function()
-            vim.cmd("colorscheme doom-one")
-            vim.cmd(
-                "highlight Pmenu ctermfg=white ctermbg=black gui=NONE guifg=white guibg=#282C34")
-            vim.cmd("highlight PmenuSel guifg=purple guibg=red")
-        end
-    })
+    --         -- Plugins integration
+    --         vim.g.doom_one_plugin_neorg = true
+    --         vim.g.doom_one_plugin_barbar = false
+    --         vim.g.doom_one_plugin_telescope = true
+    --         vim.g.doom_one_plugin_neogit = true
+    --         vim.g.doom_one_plugin_nvim_tree = true
+    --         vim.g.doom_one_plugin_dashboard = true
+    --         vim.g.doom_one_plugin_startify = true
+    --         vim.g.doom_one_plugin_whichkey = true
+    --         vim.g.doom_one_plugin_indent_blankline = true
+    --         vim.g.doom_one_plugin_vim_illuminate = false
+    --         vim.g.doom_one_plugin_lspsaga = false
+    --     end
+    -- config = function()
+    --     vim.cmd("colorscheme doom-one")
+    --     vim.cmd(
+    --         "highlight Pmenu ctermfg=white ctermbg=black gui=NONE guifg=white guibg=#282C34")
+    --     vim.cmd("highlight PmenuSel guifg=purple guibg=red")
+    -- end
+    -- })
     use { 'olimorris/onedarkpro.nvim' }
     use { 'projekt0n/github-nvim-theme' }
 
-    use { "catppuccin/nvim", as = "catppuccin" }
+    use {
+        "catppuccin/nvim",
+        as = "catppuccin",
+        config = function()
+            vim.cmd("colorscheme catppuccin-macchiato")
+        end
+
+    }
 
     -- }}}
 end)

lua/settings.lua

@@ -46,8 +46,11 @@ o.updatetime = 300
 o.timeoutlen = 500
 o.pumwidth = 35
 o.foldmethod = 'marker'
+-- g.colorscheme = 'catppuccin-macchiato'
 g.db_ui_use_nerd_fonts = 1
 
+vim.cmd("colorscheme catppuccin-macchiato")
+
 local border = {
     { "╭", "FloatBorder" }, { "─", "FloatBorder" }, { "╮", "FloatBorder" },
     { "│", "FloatBorder" }, { "╯", "FloatBorder" }, { "─", "FloatBorder" },