diff --git a/lazy-lock.json b/lazy-lock.json index 32a1585..ad6a6ea 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -21,7 +21,6 @@ "lazy.nvim": { "branch": "main", "commit": "9b208696e139a404d159963b975a5b90af38439b" }, "live-server": { "branch": "main", "commit": "ecd7c1418823b65dd2bca710587c80afe42c973e" }, "lualine.nvim": { "branch": "master", "commit": "a52f078026b27694d2290e34efa61a6e4a690621" }, - "lunar.nvim": { "branch": "master", "commit": "29eedf78c430ad9acebdcba814d77619edbe2bac" }, "markdown-preview.nvim": { "branch": "master", "commit": "9becceee5740b7db6914da87358a183ad11b2049" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "c29f9a9f9b01528ca6a44cd14814f5af20778f7a" }, "mason-null-ls.nvim": { "branch": "main", "commit": "93946aef86b1409958c97ee5feaf30bdd1053e24" }, @@ -32,7 +31,6 @@ "mini.pairs": { "branch": "main", "commit": "fec9aba50912d8c3d92d07d6a77952de84f8d7ad" }, "mini.surround": { "branch": "main", "commit": "df41f1c009afbb3eef39d979977fb14404576f9b" }, "neoscroll.nvim": { "branch": "master", "commit": "d7601c26c8a183fa8994ed339e70c2d841253e93" }, - "nord-vim": { "branch": "main", "commit": "2272dcf8ef7d6c1f13a5a1a86a23906dc0c6b39e" }, "nui.nvim": { "branch": "main", "commit": "b99e6cb13dc51768abc1c4c8585045a0c0459ef1" }, "null-ls.nvim": { "branch": "main", "commit": "c0c19f32b614b3921e17886c541c13a72748d450" }, "nvim-autopairs": { "branch": "master", "commit": "4fc96c8f3df89b6d23e5092d31c866c53a346347" }, @@ -40,7 +38,7 @@ "nvim-colorizer.lua": { "branch": "master", "commit": "760e27df4dd966607e8fb7fd8b6b93e3c7d2e193" }, "nvim-lsp-installer": { "branch": "main", "commit": "17e0bfa5f2c8854d1636fcd036dc8284db136baa" }, "nvim-lspconfig": { "branch": "master", "commit": "f11fdff7e8b5b415e5ef1837bdcdd37ea6764dda" }, - "nvim-navic": { "branch": "master", "commit": "7a2b823152fe4de65ee7925b0e32d26ed73bc57c" }, + "nvim-navic": { "branch": "master", "commit": "7f3743eb542834b4430d012ce1a2495655b18e3d" }, "nvim-notify": { "branch": "master", "commit": "bdd647f61a05c9b8a57c83b78341a0690e9c29d7" }, "nvim-scrollview": { "branch": "main", "commit": "ba6c48bf7919dd48a371e7b9c683b8858053e885" }, "nvim-tree.lua": { "branch": "master", "commit": "7282f7de8aedf861fe0162a559fc2b214383c51c" }, diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua index 078aedd..d8ec55f 100644 --- a/lua/plugins/init.lua +++ b/lua/plugins/init.lua @@ -15,7 +15,6 @@ return { require("user.tokyonight") end, }, - { "lunarvim/lunar.nvim" }, { "navarasu/onedark.nvim", init = function() @@ -23,7 +22,15 @@ return { require("onedark").load() end, }, - { "arcticicestudio/nord-vim" }, + -- { "lunarvim/lunar.nvim" }, + -- { "arcticicestudio/nord-vim" }, + -- { + -- "catppuccin/nvim", + -- name = "catppuccin", + -- init = function() + -- require("user.catppuccin") + -- end, + -- }, -- { -- "ellisonleao/gruvbox.nvim", -- init = function() @@ -55,6 +62,7 @@ return { -- vim.g.material_style = "darker" -- end, -- }, + -- dashboard { "goolord/alpha-nvim", diff --git a/lua/user/catppuccin.lua b/lua/user/catppuccin.lua new file mode 100644 index 0000000..3e19584 --- /dev/null +++ b/lua/user/catppuccin.lua @@ -0,0 +1,42 @@ +require("catppuccin").setup({ + flavour = "macchiato", -- latte, frappe, macchiato, mocha + background = { -- :h background + light = "latte", + dark = "macchiato", + }, + transparent_background = true, + show_end_of_buffer = false, -- show the '~' characters after the end of buffers + term_colors = false, + dim_inactive = { + enabled = false, + shade = "dark", + percentage = 0.15, + }, + no_italic = false, -- Force no italic + no_bold = false, -- Force no bold + styles = { + comments = { "italic" }, + conditionals = { "italic" }, + loops = {}, + functions = {}, + keywords = {}, + strings = {}, + variables = {}, + numbers = {}, + booleans = {}, + properties = {}, + types = {}, + operators = {}, + }, + color_overrides = {}, + custom_highlights = {}, + integrations = { + cmp = true, + gitsigns = true, + nvimtree = true, + telescope = true, + notify = false, + mini = false, + -- For more plugins integrations please scroll down (https://github.com/catppuccin/nvim#integrations) + }, +}) diff --git a/lua/user/colorscheme.lua b/lua/user/colorscheme.lua index 6193088..d860ee2 100644 --- a/lua/user/colorscheme.lua +++ b/lua/user/colorscheme.lua @@ -1,11 +1,12 @@ --- local colorscheme = "tokyonight" +local colorscheme = "tokyonight" -- local colorscheme = "gruvbox" -- local colorscheme = "sonokai" -- local colorscheme = "nordfox" -- local colorscheme = "material" -local colorscheme = "onedark" +-- local colorscheme = "onedark" -- local colorscheme = "lunar" -- local colorscheme = "nord" +-- local colorscheme = "catppuccin" local status_ok, _ = pcall(vim.cmd, "colorscheme " .. colorscheme) if not status_ok then diff --git a/lua/user/tokyonight.lua b/lua/user/tokyonight.lua index 08e8125..0dd75b1 100644 --- a/lua/user/tokyonight.lua +++ b/lua/user/tokyonight.lua @@ -7,7 +7,7 @@ tokyonight.setup({ -- or leave it empty to use the default settings style = "night", -- The theme comes in three styles, `storm`, `moon`, a darker variant `night` and `day` light_style = "day", -- The theme is used when the background is set to light - transparent = false, -- Enable this to disable setting the background color + transparent = true, -- Enable this to disable setting the background color terminal_colors = true, -- Configure the colors used when opening a `:terminal` in Neovim styles = { -- Style to be applied to different syntax groups @@ -18,8 +18,8 @@ tokyonight.setup({ functions = {}, variables = {}, -- Background styles. Can be "dark", "transparent" or "normal" - sidebars = "dark", -- style for sidebars, see below - floats = "dark", -- style for floating windows + sidebars = "transparent", -- style for sidebars, see below + floats = "transparent", -- style for floating windows }, sidebars = { "qf", "help" }, -- Set a darker background on sidebar-like windows. For example: `["qf", "vista_kind", "terminal", "packer"]` day_brightness = 0.2, -- Adjusts the brightness of the colors of the **Day** style. Number between 0 and 1, from dull to vibrant colors