change colorscheme to zenwritten

lazy-lock.json

@@ -4,29 +4,31 @@
   "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
-  "colorful-menu.nvim": { "branch": "master", "commit": "0041037582353a2101f0ba8bd8cae21c064921dc" },
+  "colorful-menu.nvim": { "branch": "master", "commit": "91621b22c334812e5bbf0c8f82fc03869279acfe" },
-  "conform.nvim": { "branch": "master", "commit": "db8a4a9edb217067b1d7a2e0362c74bfe9cc944d" },
+  "conform.nvim": { "branch": "master", "commit": "f9ef25a7ef00267b7d13bfc00b0dea22d78702d5" },
   "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" },
   "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
   "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
   "lsp_signature.nvim": { "branch": "master", "commit": "8b681c86b0bd7f932cd91987983d91497e43d83f" },
   "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" },
+  "lush.nvim": { "branch": "main", "commit": "45a79ec4acb5af783a6a29673a999ce37f00497e" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" },
   "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" },
   "mellifluous.nvim": { "branch": "main", "commit": "9add9975a067e448da077dab92b70473aab41a76" },
   "mini.icons": { "branch": "main", "commit": "ec61af6e606fc89ee3b1d8f2f20166a3ca917a36" },
-  "mini.nvim": { "branch": "main", "commit": "2d873a0eaa9f37b105c7751bb0a2e30eb448120d" },
+  "mini.nvim": { "branch": "main", "commit": "3ad46cdb7a51281e0024416023b56cf5c7909ae7" },
   "nordic.nvim": { "branch": "main", "commit": "62acfd4eb008153180670daf81874eb47dd37739" },
   "nvim-bufdel": { "branch": "main", "commit": "523d58e94e7212fff3e05c247b962dc8f93bcfde" },
   "nvim-cmp": { "branch": "main", "commit": "1e1900b0769324a9675ef85b38f99cca29e203b3" },
-  "nvim-lspconfig": { "branch": "master", "commit": "8a1529e46eef5efc86c34c8d9bdd313abc2ecba0" },
+  "nvim-lspconfig": { "branch": "master", "commit": "401e50fae626c4707af12114b5ddb7bb9f4236a4" },
   "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" },
-  "nvim-treesitter": { "branch": "master", "commit": "8b79cddc708cb8549562f0101f7f509ad7cebf97" },
+  "nvim-treesitter": { "branch": "master", "commit": "85168f15808d89b0222313652b9d2777eda3cb08" },
-  "nvim-web-devicons": { "branch": "master", "commit": "ab4cfee554e501f497bce0856788d43cf2eb93d7" },
+  "nvim-web-devicons": { "branch": "master", "commit": "4c3a5848ee0b09ecdea73adcd2a689190aeb728c" },
-  "oil.nvim": { "branch": "master", "commit": "548587d68b55e632d8a69c92cefd981f360634fa" },
+  "oil.nvim": { "branch": "master", "commit": "ab887d926c2665a708fbe9e6c4654042cc5f4c60" },
   "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
   "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
   "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
   "vesper.nvim": { "branch": "main", "commit": "4e96a753a964192b5904598e64366a93eef5449d" },
-  "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
+  "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" },
+  "zenbones.nvim": { "branch": "main", "commit": "dbd485fa5d5230d175e024374d41dab5ad71b119" }
 }

lua/config/settings.lua

@@ -1,28 +1,30 @@
 local m = {}
 
 m.init = function()
-  vim.opt.shiftwidth = 4
+    vim.opt.shiftwidth = 4
-  vim.opt.softtabstop = 4
+    vim.opt.softtabstop = 4
-  vim.opt.tabstop = 4
+    vim.opt.tabstop = 4
-  vim.opt.expandtab = true
+    vim.opt.expandtab = true
 
-  vim.opt.showmode = false
+    vim.opt.showmode = false
 
-  vim.opt.hlsearch = false
+    vim.opt.hlsearch = false
-  vim.opt.incsearch = true
+    vim.opt.incsearch = true
 
-  vim.opt.termguicolors = true
+    vim.opt.termguicolors = true
 
-  vim.opt.updatetime = 50
+    vim.opt.updatetime = 50
 
-  vim.opt.wrap = false
+    vim.opt.wrap = false
-  vim.opt.number = true
+    vim.opt.number = true
-  vim.opt.relativenumber = true
+    vim.opt.relativenumber = true
-  vim.opt.mouse = ""
+    vim.opt.mouse = ""
 
-  vim.opt.fillchars = { eob = " " }
+    vim.opt.fillchars = { eob = " " }
 
-  vim.o.clipboard = "unnamed"
+    vim.o.clipboard = "unnamed"
+
+    vim.opt.background = "dark"
 end
 
 return m

lua/plugins/lspconfig.lua

@@ -1,204 +1,204 @@
 return {
-  { "hrsh7th/cmp-nvim-lsp" },
+    { "hrsh7th/cmp-nvim-lsp" },
-  { "hrsh7th/cmp-cmdline" },
+    { "hrsh7th/cmp-cmdline" },
-  { "hrsh7th/cmp-path" },
+    { "hrsh7th/cmp-path" },
-  { "hrsh7th/cmp-buffer" },
+    { "hrsh7th/cmp-buffer" },
-  {
+    {
-    "ray-x/lsp_signature.nvim",
+        "ray-x/lsp_signature.nvim",
-    event = "InsertEnter",
+        event = "InsertEnter",
-    opts = {},
+        opts = {},
-  },
-  {
-    "folke/lazydev.nvim",
-    ft = "lua", -- only load on lua files
-    opts = {
-      library = {
-        -- See the configuration section for more details
-        -- Load luvit types when the `vim.uv` word is found
-        { path = "${3rd}/luv/library", words = { "vim%.uv" } },
-      },
     },
-  },
+    {
-  {
+        "folke/lazydev.nvim",
-    "williamboman/mason-lspconfig.nvim",
+        ft = "lua", -- only load on lua files
-    opts = {
+        opts = {
-      ensure_installed = { "lua_ls", "rust_analyzer", "clangd", "zls" },
+            library = {
-      handlers = {
+                -- See the configuration section for more details
-        function(server_name)
+                -- Load luvit types when the `vim.uv` word is found
-          vim.opt.signcolumn = "yes"
+                { path = "${3rd}/luv/library", words = { "vim%.uv" } },
-          local navic = require "nvim-navic"
-
-          local on_attach = function(client, bufnr)
-            require("lsp_signature").on_attach({}, bufnr)
-            if client.server_capabilities.documentSymbolProvider then
-              navic.attach(client, bufnr)
-            end
-          end
-
-          local capabilities = require("cmp_nvim_lsp").default_capabilities()
-
-          require("lspconfig")[server_name].setup {
-            on_attach = on_attach,
-            capabilities = capabilities,
-          }
-        end,
-      },
-    },
-  },
-  {
-    "onsails/lspkind.nvim",
-    config = function()
-      require("lspkind").init { preset = "codicons" }
-    end,
-  },
-  {
-    "hrsh7th/nvim-cmp",
-    config = function()
-      local cmp = require "cmp"
-      local lspkind = require "lspkind"
-
-      cmp.setup {
-        formatting = {
-          format = lspkind.cmp_format {
-            mode = "symbol", -- show only symbol annotations
-            maxwidth = {
-              menu = 50, -- leading text (labelDetails)
-              abbr = 50, -- actual suggestion item
             },
-            ellipsis_char = "...", -- when popup menu exceed maxwidth, the truncated part would show ellipsis_char instead (must define maxwidth first)
-            show_labelDetails = true, -- show labelDetails in menu. Disabled by default
-
-            before = function(entry, vim_item)
-              local highlights_info = require("colorful-menu").cmp_highlights(entry)
-
-              -- highlight_info is nil means we are missing the ts parser, it's
-              -- better to fallback to use default `vim_item.abbr`. What this plugin
-              -- offers is two fields: `vim_item.abbr_hl_group` and `vim_item.abbr`.
-              if highlights_info ~= nil then
-                vim_item.abbr_hl_group = highlights_info.highlights
-                vim_item.abbr = highlights_info.text
-              end
-
-              return vim_item
-            end,
-          },
         },
-        sources = {
-          { name = "nvim_lsp" },
-          {
-            name = "lazydev",
-            group_index = 0, -- set group index to 0 to skip loading LuaLS completions
-          },
-        },
-        snippet = {
-          expand = function(args)
-            vim.snippet.expand(args.body)
-          end,
-        },
-        mapping = cmp.mapping.preset.insert {
-          ["<C-b>"] = cmp.mapping.scroll_docs(-4),
-          ["<C-f>"] = cmp.mapping.scroll_docs(4),
-          ["<C-Space>"] = cmp.mapping.complete(),
-          ["<C-e>"] = cmp.mapping.abort(),
-          ["<CR>"] = cmp.mapping.confirm { select = true }, -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
-        },
-      }
-
-      cmp.setup.cmdline({ "/", "?" }, {
-        mapping = cmp.mapping.preset.cmdline(),
-        sources = {
-          { name = "buffer" },
-        },
-      })
-
-      -- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore).
-      cmp.setup.cmdline(":", {
-        mapping = cmp.mapping.preset.cmdline(),
-        sources = cmp.config.sources({
-          { name = "path" },
-        }, {
-          { name = "cmdline" },
-        }),
-        matching = { disallow_symbol_nonprefix_matching = false },
-      })
-    end,
-  },
-  {
-    "neovim/nvim-lspconfig",
-    lazy = false,
-    keys = {
-      {
-        "ca",
-        vim.lsp.buf.code_action,
-        desc = "LSP: [C]ode Action",
-      },
-      {
-        "<leader>rr",
-        vim.lsp.buf.rename,
-        desc = "LSP rename",
-      },
-      {
-        "<leader>lh",
-        vim.lsp.buf.hover,
-        desc = "[L]sp: Hover",
-      },
     },
-    config = function()
+    {
-      vim.opt.signcolumn = "yes"
+        "williamboman/mason-lspconfig.nvim",
-      local navic = require "nvim-navic"
+        opts = {
+            ensure_installed = { "lua_ls", "rust_analyzer", "clangd", "zls" },
+            handlers = {
+                function(server_name)
+                    vim.opt.signcolumn = "yes"
+                    local navic = require "nvim-navic"
 
-      local on_attach = function(client, bufnr)
+                    local on_attach = function(client, bufnr)
-        if client.server_capabilities.documentSymbolProvider then
+                        require("lsp_signature").on_attach({}, bufnr)
-          navic.attach(client, bufnr)
+                        if client.server_capabilities.documentSymbolProvider then
-        end
+                            navic.attach(client, bufnr)
-      end
+                        end
+                    end
 
-      vim.filetype.add {
+                    local capabilities = require("cmp_nvim_lsp").default_capabilities()
-        extension = {
+
-          hlsl = "hlsl",
+                    require("lspconfig")[server_name].setup {
+                        on_attach = on_attach,
+                        capabilities = capabilities,
+                    }
+                end,
+            },
         },
-      }
+    },
+    {
+        "onsails/lspkind.nvim",
+        config = function()
+            require("lspkind").init { preset = "codicons" }
+        end,
+    },
+    {
+        "hrsh7th/nvim-cmp",
+        config = function()
+            local cmp = require "cmp"
+            local lspkind = require "lspkind"
 
-      if not require("lspconfig.configs").hlsl_tools then
+            cmp.setup {
-        require("lspconfig.configs").hlsl_tools = {
+                formatting = {
-          default_config = {
+                    format = lspkind.cmp_format {
-            cmd = "/home/hstasonis/.config/nvim/vendor/shader-language-server",
+                        mode = "symbol",          -- show only symbol annotations
-            on_new_config = function(new_config, _)
+                        maxwidth = {
-              new_config.cmd_env.LD_LIBRARY_PATH = "/home/hstasonis/.config/nvim/vendor"
+                            menu = 50,            -- leading text (labelDetails)
-            end,
+                            abbr = 50,            -- actual suggestion item
-          },
+                        },
-          single_file_support = true,
+                        ellipsis_char = "...",    -- when popup menu exceed maxwidth, the truncated part would show ellipsis_char instead (must define maxwidth first)
-          filetypes = { "hlsl" },
+                        show_labelDetails = true, -- show labelDetails in menu. Disabled by default
-        }
-      end
 
-      -- Set it up as usual
+                        before = function(entry, vim_item)
-      require("lspconfig.configs").hlsl_tools.setup {
+                            local highlights_info = require("colorful-menu").cmp_highlights(entry)
-        on_attach = on_attach,
+
-      }
+                            -- highlight_info is nil means we are missing the ts parser, it's
-    end,
+                            -- better to fallback to use default `vim_item.abbr`. What this plugin
-  },
+                            -- offers is two fields: `vim_item.abbr_hl_group` and `vim_item.abbr`.
-  {
+                            if highlights_info ~= nil then
-    "williamboman/mason.nvim",
+                                vim_item.abbr_hl_group = highlights_info.highlights
-    config = function()
+                                vim_item.abbr = highlights_info.text
-      require("mason").setup {}
+                            end
-    end,
+
-  },
+                            return vim_item
-  {
+                        end,
-    "SmiteshP/nvim-navic",
+                    },
-    config = function()
+                },
-      vim.o.winbar = "%{%v:lua.require'nvim-navic'.get_location()%}"
+                sources = {
-    end,
+                    { name = "nvim_lsp" },
-  },
+                    {
-  {
+                        name = "lazydev",
-    "j-hui/fidget.nvim",
+                        group_index = 0, -- set group index to 0 to skip loading LuaLS completions
-    opts = {},
+                    },
-  },
+                },
-  {
+                snippet = {
-    "xzbdmw/colorful-menu.nvim",
+                    expand = function(args)
-    config = function()
+                        vim.snippet.expand(args.body)
-      -- You don't need to set these options.
+                    end,
-      require("colorful-menu").setup {}
+                },
-    end,
+                mapping = cmp.mapping.preset.insert {
-  },
+                    ["<C-b>"] = cmp.mapping.scroll_docs(-4),
+                    ["<C-f>"] = cmp.mapping.scroll_docs(4),
+                    ["<C-Space>"] = cmp.mapping.complete(),
+                    ["<C-e>"] = cmp.mapping.abort(),
+                    ["<CR>"] = cmp.mapping.confirm { select = true }, -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
+                },
+            }
+
+            cmp.setup.cmdline({ "/", "?" }, {
+                mapping = cmp.mapping.preset.cmdline(),
+                sources = {
+                    { name = "buffer" },
+                },
+            })
+
+            -- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore).
+            cmp.setup.cmdline(":", {
+                mapping = cmp.mapping.preset.cmdline(),
+                sources = cmp.config.sources({
+                    { name = "path" },
+                }, {
+                    { name = "cmdline" },
+                }),
+                matching = { disallow_symbol_nonprefix_matching = false },
+            })
+        end,
+    },
+    {
+        "neovim/nvim-lspconfig",
+        lazy = false,
+        keys = {
+            {
+                "ca",
+                vim.lsp.buf.code_action,
+                desc = "LSP: [C]ode Action",
+            },
+            {
+                "<leader>rr",
+                vim.lsp.buf.rename,
+                desc = "LSP rename",
+            },
+            {
+                "<leader>lh",
+                vim.lsp.buf.hover,
+                desc = "[L]sp: Hover",
+            },
+        },
+        config = function()
+            vim.opt.signcolumn = "yes"
+            local navic = require "nvim-navic"
+
+            local on_attach = function(client, bufnr)
+                if client.server_capabilities.documentSymbolProvider then
+                    navic.attach(client, bufnr)
+                end
+            end
+
+            vim.filetype.add {
+                extension = {
+                    hlsl = "hlsl",
+                },
+            }
+
+            if not require("lspconfig.configs").hlsl_tools then
+                require("lspconfig.configs").hlsl_tools = {
+                    default_config = {
+                        cmd = "/home/hstasonis/.config/nvim/vendor/shader-language-server",
+                        on_new_config = function(new_config, _)
+                            new_config.cmd_env.LD_LIBRARY_PATH = "/home/hstasonis/.config/nvim/vendor"
+                        end,
+                    },
+                    single_file_support = true,
+                    filetypes = { "hlsl" },
+                }
+            end
+
+            -- Set it up as usual
+            require("lspconfig.configs").hlsl_tools.setup {
+                on_attach = on_attach,
+            }
+        end,
+    },
+    {
+        "williamboman/mason.nvim",
+        config = function()
+            require("mason").setup {}
+        end,
+    },
+    {
+        "SmiteshP/nvim-navic",
+        config = function()
+            vim.o.winbar = "%{%v:lua.require'nvim-navic'.get_location()%}"
+        end,
+    },
+    {
+        "j-hui/fidget.nvim",
+        opts = {},
+    },
+    {
+        "xzbdmw/colorful-menu.nvim",
+        config = function()
+            -- You don't need to set these options.
+            require("colorful-menu").setup {}
+        end,
+    },
 }

lua/plugins/ui.lua

@@ -1,95 +1,106 @@
 return {
-  {
+    {
-    "ramojus/mellifluous.nvim",
+        "ramojus/mellifluous.nvim",
-    lazy = false,
+        lazy = false,
-    priority = 1000,
+        priority = 1000,
-    enabled = true,
+        enabled = false,
-    config = function()
+        config = function()
-      require("mellifluous").setup {
+            require("mellifluous").setup {
-        colorset = "alduin",
+                --colorset = "alduin",
-      } -- optional, see configuration section.
+                colorset = "mellifluous"
+            } -- optional, see configuration section.
 
-      vim.cmd [[ colorscheme mellifluous ]]
+            vim.cmd [[ colorscheme mellifluous ]]
-    end,
+        end,
-  },
-  {
-    "datsfilipe/vesper.nvim",
-    lazy = false,
-    priority = 1000,
-    enabled = false,
-    config = function()
-      require("vesper").setup {
-        transparent = false,
-      }
-
-      vim.cmd [[ colorscheme vesper ]]
-    end,
-  },
-  {
-    "AlexvZyl/nordic.nvim",
-    lazy = false,
-    priority = 1000,
-    enabled = false,
-    config = function()
-      require("nordic").load {
-        bright_border = true,
-      }
-    end,
-  },
-  {
-    "akinsho/bufferline.nvim",
-    version = "*",
-    lazy = false,
-    dependencies = { "nvim-tree/nvim-web-devicons", "datsfilipe/vesper.nvim" },
-    keys = {
-      {
-        "<leader>[",
-        ":BufferLineCyclePrev<CR>",
-        desc = "Go back a buffer",
-      },
-      {
-        "<leader>]",
-        ":BufferLineCycleNext<CR>",
-        desc = "Go to the next buffer",
-      },
-      {
-        "<leader>-",
-        ":BufferLineCloseLeft<CR>",
-        desc = "Bufferline: Close left",
-      },
-      {
-        "<leader>+",
-        ":BufferLineCloseOthers<CR>",
-        desc = "Bufferline: Close others",
-      },
-      {
-        "<leader>_",
-        ":BufferLineCloseRight<CR>",
-        desc = "Bufferline: Close right",
-      },
-      {
-        "<leader>=",
-        ":BufDel<CR>",
-        desc = "Close current buffer",
-      },
     },
-
+    {
-    opts = {
+        "zenbones-theme/zenbones.nvim",
-      diagnostics = "nvim_lsp",
+        lazy = false,
-
+        priority = 1000,
-      diagnostics_indicator = function(count, level, diagnostics_dict, context)
+        enabled = true,
-        local icon = level:match "error" and " " or " "
+        dependencies = "rktjmp/lush.nvim",
-        return " " .. icon .. count
+        config = function()
-      end,
+            vim.cmd [[ colorscheme zenwritten ]]
+        end,
+    },
+    {
+        "datsfilipe/vesper.nvim",
+        lazy = false,
+        priority = 1000,
+        enabled = false,
+        config = function()
+            require("vesper").setup {
+                transparent = false,
+            }
+
+            vim.cmd [[ colorscheme vesper ]]
+        end,
+    },
+    {
+        "AlexvZyl/nordic.nvim",
+        lazy = false,
+        priority = 1000,
+        enabled = false,
+        config = function()
+            require("nordic").load {
+                bright_border = true,
+            }
+        end,
+    },
+    {
+        "akinsho/bufferline.nvim",
+        version = "*",
+        lazy = false,
+        dependencies = { "nvim-tree/nvim-web-devicons", "datsfilipe/vesper.nvim" },
+        keys = {
+            {
+                "<leader>[",
+                ":BufferLineCyclePrev<CR>",
+                desc = "Go back a buffer",
+            },
+            {
+                "<leader>]",
+                ":BufferLineCycleNext<CR>",
+                desc = "Go to the next buffer",
+            },
+            {
+                "<leader>-",
+                ":BufferLineCloseLeft<CR>",
+                desc = "Bufferline: Close left",
+            },
+            {
+                "<leader>+",
+                ":BufferLineCloseOthers<CR>",
+                desc = "Bufferline: Close others",
+            },
+            {
+                "<leader>_",
+                ":BufferLineCloseRight<CR>",
+                desc = "Bufferline: Close right",
+            },
+            {
+                "<leader>=",
+                ":BufDel<CR>",
+                desc = "Close current buffer",
+            },
+        },
+
+        opts = {
+            diagnostics = "nvim_lsp",
+
+            diagnostics_indicator = function(count, level, diagnostics_dict, context)
+                local icon = level:match "error" and " " or " "
+                return " " .. icon .. count
+            end,
+        },
+        config = function(_, opts)
+            require("bufferline").setup {
+                options = opts,
+            }
+        end,
+    },
+    {
+        "ojroques/nvim-bufdel",
+        opts = {},
     },
-    config = function(_, opts)
-      require("bufferline").setup {
-        options = opts,
-      }
-    end,
-  },
-  {
-    "ojroques/nvim-bufdel",
-    opts = {},
-  },
 }