diff --git a/nvim/init.lua b/nvim/init.lua index 47336d8..1988c57 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -1,5 +1,6 @@ require('plugins') require('settings') +require('color_scheme') require('lsp_config') require('telescope_config') require('treesitter_config') diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index fb3defa..b6ccc32 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -10,10 +10,8 @@ "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, "flash.nvim": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" }, "formatter.nvim": { "branch": "master", "commit": "cb4778b8432f1ae86dae4634c0b611cb269a4c2f" }, - "github-nvim-theme": { "branch": "main", "commit": "d3199bc5074a80b123b6cd5b6797076b1727576a" }, "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, "lualine.nvim": { "branch": "master", "commit": "566b7036f717f3d676362742630518a47f132fff" }, - "lush.nvim": { "branch": "main", "commit": "e8a58f36c256af65cda36878f6f2024a612154c3" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "0989bdf4fdf7b5aa4c74131d7ffccc3f399ac788" }, "mason.nvim": { "branch": "main", "commit": "e110bc3be1a7309617cecd77bfe4bf86ba1b8134" }, "neogit": { "branch": "master", "commit": "bd69620be5a2f50fe0ef39236f8c0009d16e4993" }, @@ -30,7 +28,6 @@ "telescope-fzy-native.nvim": { "branch": "master", "commit": "282f069504515eec762ab6d6c89903377252bf5b" }, "telescope-undo.nvim": { "branch": "main", "commit": "d3afc1c105535a90caec092ce27a113f77ba7b84" }, "telescope.nvim": { "branch": "master", "commit": "da8b3d485975a8727bea127518b65c980521ae22" }, - "tokyodark.nvim": { "branch": "master", "commit": "402fca501a459d8985c997711eaade4ad5bbe396" }, "tree-sitter-hypr": { "branch": "master", "commit": "42aa7274b5f093cec92b7a5bab629ba26b4be439" }, "trim.nvim": { "branch": "master", "commit": "629b96a303a3a0bb5fd050e6cd9d627ca7831cc7" }, "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, @@ -38,6 +35,6 @@ "vim-hypr-nav": { "branch": "main", "commit": "6ab4865a7eb5aad35305298815a4563c9d48556a" }, "vim-rooter": { "branch": "master", "commit": "1353fa47ee3a81083c284e28ff4f7d92655d7c9e" }, "vim-snippets": { "branch": "master", "commit": "ba72b08e04e184ecd0a2a1b8012a81ddb040dbc3" }, - "vimtex": { "branch": "master", "commit": "f9b19d09ee6f0ba70dad0b5c2e710dd700681000" }, + "vimtex": { "branch": "master", "commit": "8352d7380a0ea26f9f2ad09e57ccf90b4bd1c746" }, "vimwiki": { "branch": "dev", "commit": "0bb1b4945bb205a076a35b66174e5d66be8eaafe" } } \ No newline at end of file diff --git a/nvim/lua/lualine_config.lua b/nvim/lua/lualine_config.lua index 2a03c28..51d2d96 100644 --- a/nvim/lua/lualine_config.lua +++ b/nvim/lua/lualine_config.lua @@ -10,6 +10,7 @@ end lualine.setup({ options = { theme = 'nightfly', + globalstatus = true }, sections = { lualine_a = {'mode'}, diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua index 9fd9a7d..7f1ff90 100644 --- a/nvim/lua/plugins.lua +++ b/nvim/lua/plugins.lua @@ -19,33 +19,7 @@ require('lazy').setup({ 'luckasRanarison/tree-sitter-hypr', 'debugloop/telescope-undo.nvim', 'mhartington/formatter.nvim', - { "catppuccin/nvim", name = "catppuccin", priority = 1000, config=function () - require("catppuccin").setup({ - flavour = "mocha", - color_overrides = { - -- mocha = { - -- base = "#11121D", - -- }, - mocha = { - -- this 16 colors are changed to onedark - base = "#11121D", - text = "#abb2bf", - rosewater = "#b6bdca", - lavender = "#ed8897", - red = "#e06c75", - peach = "#d19a66", - yellow = "#e5c07b", - green = "#98c379", - teal = "#56b6c2", - blue = "#61afef", - mauve = "#c678dd", - flamingo = "#be5046", - pink="#ef9f76" - } - } - }) - vim.cmd("colorscheme catppuccin") - end}, + { "catppuccin/nvim", name = "catppuccin"}, {'vimwiki/vimwiki', init = function () vim.g.vimwiki_list = {{path = '~/Workspace/DnD/Lumentis Campaign Setting/', syntax = 'markdown', ext = '.md'}} vim.g.vimwiki_key_mappings = { table_mappings = 0 } diff --git a/nvim/lua/treesitter_config.lua b/nvim/lua/treesitter_config.lua index 8802894..628b810 100644 --- a/nvim/lua/treesitter_config.lua +++ b/nvim/lua/treesitter_config.lua @@ -8,6 +8,7 @@ treesitter.setup({ auto_install = true, highlight = { enable = true, + additional_vim_regex_highlighting = false, disable = function(lang, buf) -- Disable if file size is too big if lang == "ini" or lang == "markdown" then return true @@ -22,7 +23,6 @@ treesitter.setup({ indent = { enable = true }, - additional_vim_regex_highlighting = false, }) local parser_config = require("nvim-treesitter.parsers").get_parser_configs()