From 7135b926ce011c34de5a68afb2b4bf8396f76123 Mon Sep 17 00:00:00 2001 From: bh Date: Wed, 19 Nov 2025 16:09:08 +0800 Subject: Improved Theming of the Config --- init.lua | 23 +++++++++++++++---- lazy-lock.json | 3 ++- lua/config/treesitter.lua | 2 +- lua/plugins/init.lua | 58 ++++++++++++++++++++++++----------------------- 4 files changed, 52 insertions(+), 34 deletions(-) diff --git a/init.lua b/init.lua index 799adc2..81cf5e1 100644 --- a/init.lua +++ b/init.lua @@ -36,7 +36,7 @@ require("config.lazy") -- 🪶 Theme -------------------------------------------------------- local dark_teal = "#003636" -vim.cmd("colorscheme default") +vim.cmd("colorscheme terafox") -------------------------------------------------------- -- 🪶 Basic Settings @@ -103,9 +103,6 @@ vim.keymap.set('n', 'ff', builtin.find_files, {}) vim.keymap.set('n', 'fg', builtin.live_grep, {}) vim.keymap.set('n', 'fb', builtin.buffers, {}) - - - -------------------------------------------------------- -- 🪶 GUI and Colour Configuration -------------------------------------------------------- @@ -123,10 +120,28 @@ vim.api.nvim_set_hl(0, "Normal", { ctermbg = "none", bg = "none" }) vim.api.nvim_set_hl(0, "Normal", { fg = "#8affff", bg = "none", ctermbg = "none" }) vim.api.nvim_set_hl(0, "NormalFloat", { fg = "#8affff", bg = "#003636" }) + -- Set font and size -- vim.o.guifont = "JetBrainsMono Nerd Font:h14" vim.o.guifont = "Source Code Pro:h10.5" + +-- General Neovim GUI +vim.cmd([[ + highlight Normal guibg=NONE ctermbg=NONE + highlight NormalNC guibg=NONE ctermbg=NONE + highlight LineNr guibg=NONE + highlight SignColumn guibg=NONE + highlight WinSeparator guifg=#74c4c4 guibg=NONE + + + highlight Pmenu guibg=NONE + highlight PmenuSel guifg=#FFFFFF guibg=#008282 + highlight FloatBorder guifg=#74c4c4 +]]) + + +-- For Tabs and Folds vim.cmd [[ highlight BufferCurrent guifg=#FFFFFF guibg=#003636 highlight BufferVisible guifg=#CCCCCC guibg=#003636 diff --git a/lazy-lock.json b/lazy-lock.json index 06e695d..3722c7a 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -14,9 +14,10 @@ "lspkind.nvim": { "branch": "master", "commit": "3ddd1b4edefa425fda5a9f95a4f25578727c0bb3" }, "lualine.nvim": { "branch": "master", "commit": "3946f0122255bc377d14a59b27b609fb3ab25768" }, "neoscroll.nvim": { "branch": "master", "commit": "f957373912e88579e26fdaea4735450ff2ef5c9c" }, + "nightfox.nvim": { "branch": "main", "commit": "ba47d4b4c5ec308718641ba7402c143836f35aa9" }, "nvim-autopairs": { "branch": "master", "commit": "7a2c97cccd60abc559344042fefb1d5a85b3e33b" }, "nvim-cmp": { "branch": "main", "commit": "d97d85e01339f01b842e6ec1502f639b080cb0fc" }, - "nvim-lspconfig": { "branch": "master", "commit": "d4f77e7a9a4b910622a0bc225e482c4c808e4099" }, + "nvim-lspconfig": { "branch": "master", "commit": "b7c48a7111534b66bee077da8035ac7208a294ff" }, "nvim-surround": { "branch": "main", "commit": "fcfa7e02323d57bfacc3a141f8a74498e1522064" }, "nvim-tree.lua": { "branch": "master", "commit": "1eda2569394f866360e61f590f1796877388cb8a" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, diff --git a/lua/config/treesitter.lua b/lua/config/treesitter.lua index a38d5c0..897f758 100644 --- a/lua/config/treesitter.lua +++ b/lua/config/treesitter.lua @@ -19,7 +19,7 @@ return function() auto_install = true, highlight = { enable = true, - disable = {}, + disable = {"latex"}, additional_vim_regex_highlighting = false, }, indent = { diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua index bec9119..d9bf221 100644 --- a/lua/plugins/init.lua +++ b/lua/plugins/init.lua @@ -35,39 +35,40 @@ return { end }, - { - "hrsh7th/nvim-cmp", - event = "InsertEnter", -- lazy load when entering insert mode - dependencies = { - "hrsh7th/cmp-nvim-lsp", - "hrsh7th/cmp-buffer", - "hrsh7th/cmp-path", - "saadparwaiz1/cmp_luasnip", - "L3MON4D3/LuaSnip", - "rafamadriz/friendly-snippets", - "onsails/lspkind.nvim", - }, - config = function() - require("config.completion")() -- load the separate config file - end, + -- Auto Completion + { + "hrsh7th/nvim-cmp", + event = "InsertEnter", -- lazy load when entering insert mode + dependencies = { + "hrsh7th/cmp-nvim-lsp", + "hrsh7th/cmp-buffer", + "hrsh7th/cmp-path", + "saadparwaiz1/cmp_luasnip", + "L3MON4D3/LuaSnip", + "rafamadriz/friendly-snippets", + "onsails/lspkind.nvim", }, + config = function() + require("config.completion")() -- load the separate config file + end, + }, -- Autocompletion - { "hrsh7th/nvim-cmp" }, - { "hrsh7th/cmp-nvim-lsp" }, + -- { "hrsh7th/nvim-cmp" }, + -- { "hrsh7th/cmp-nvim-lsp" }, -- Snippets - { - "L3MON4D3/LuaSnip", - version = "v2.*", - dependencies = { "rafamadriz/friendly-snippets" }, - build = "make install_jsregexp", - config = function() - -- Call the returned function from your module - require("config.luasnip")() - end, - }, + { + "L3MON4D3/LuaSnip", + version = "v2.*", + dependencies = { "rafamadriz/friendly-snippets" }, + build = "make install_jsregexp", + config = function() + -- Call the returned function from your module + require("config.luasnip")() + end, + }, -- File Explorer { "nvim-tree/nvim-tree.lua", config = require("config.tree") }, @@ -113,6 +114,7 @@ return { -- Themes "martinsione/darkplus.nvim", "folke/tokyonight.nvim", - "navarasu/onedark.nvim" + "navarasu/onedark.nvim", + "EdenEast/nightfox.nvim" } -- cgit v1.2.3