commit bdcdf3705eb40b91d0a8cff8638e8a0f36482302
parent f0854b80db9dec403e3ec78d67b12324e8e8c10e
Author: Andrew <andrewlaack1@gmail.com>
Date: Thu, 19 Dec 2024 21:33:38 -0600
Moved to all black
Diffstat:
4 files changed, 49 insertions(+), 86 deletions(-)
diff --git a/init.lua b/init.lua
@@ -1,5 +1,3 @@
require("core.plugins")
require("core.lsp_config")
-
-vim.cmd('colorscheme catppuccin-mocha')
require("core.keymaps")
diff --git a/lua/core/keymaps.lua b/lua/core/keymaps.lua
@@ -1,5 +1,8 @@
vim.opt.spelllang = { "en_us" }
+
+
+
-- General config
vim.opt.conceallevel = 0
vim.opt.number = true
@@ -83,7 +86,7 @@ vim.keymap.set("n", "s", ":Pounce <CR>", { noremap = true, silent = true }) -- b
-- Set custom highlight groups
--- Set custom highlight groups for Pounce with Catppuccin colors
+-- Set custom highlight groups for Pounce
local highlights = {
PounceGap = { bold = true, fg = "#cdd6f4", bg = "#45475a" }, -- this is the space intra line selections
PounceAcceptBest = { bold = true, fg = "#000000", bg = "#89dceb" }, -- standard selection cap letter
@@ -113,7 +116,7 @@ local map = vim.api.nvim_set_keymap
local opts = { noremap = true, silent = true }
for i = 1, 9 do
- map('n', '<leader>' .. i, ':lua require("harpoon.ui").nav_file(' .. i .. ')<CR>', opts)
+ map('n', '<leader>h' .. i, ':lua require("harpoon.ui").nav_file(' .. i .. ')<CR>', opts)
end
@@ -132,3 +135,46 @@ vim.api.nvim_set_keymap(
{ noremap = true, silent = true }
)
+
+-- Background
+vim.cmd("highlight Normal guibg=#000000")
+
+-- Core Syntax Groups
+vim.cmd("highlight Keyword guifg=#9400D3 gui=bold") -- Dark violet keywords
+vim.cmd("highlight Function guifg=#DA70D6") -- Orchid functions
+vim.cmd("highlight String guifg=#00FF7F gui=bold") -- Spring green strings
+vim.cmd("highlight Type guifg=#2E90FF gui=bold") -- Dodger blue types
+vim.cmd("highlight Statement guifg=#FFD700 gui=bold") -- Gold return statements and control flow
+vim.cmd("highlight Boolean guifg=#FF4500 gui=bold") -- Orange-red booleans (true/false)
+vim.cmd("highlight Constant guifg=#FF1493 gui=italic") -- Deep pink constants (e.g., numbers, other literals)
+vim.cmd("highlight Comment guifg=#808080 gui=italic") -- Gray comments
+vim.cmd("highlight Identifier guifg=#87CEEB") -- Sky blue variables and identifiers
+vim.cmd("highlight Operator guifg=#FFFFFF gui=bold") -- White operators
+
+-- Code Structure Groups
+vim.cmd("highlight PreProc guifg=#FF69B4 gui=italic") -- Hot pink preprocessor directives
+vim.cmd("highlight Include guifg=#FFA07A gui=bold") -- Light salmon includes
+vim.cmd("highlight Conditional guifg=#FF6347 gui=bold") -- Tomato conditionals (if, else)
+vim.cmd("highlight Repeat guifg=#FFDAB9") -- Peach puff loops
+
+-- Error and Diagnostic Groups
+vim.cmd("highlight Error guifg=#FF0000 gui=bold,underline") -- Bright red errors
+vim.cmd("highlight WarningMsg guifg=#FFA500") -- Orange warnings
+vim.cmd("highlight DiagnosticError guifg=#FF5555") -- Soft red LSP errors
+vim.cmd("highlight DiagnosticWarn guifg=#FFCC00") -- Yellow LSP warnings
+
+-- User Interaction Groups
+vim.cmd("highlight Visual guibg=#444444") -- Dark gray for visual selection
+vim.cmd("highlight CursorLine guibg=#333333") -- Darker gray for cursor line
+vim.cmd("highlight CursorColumn guibg=#444444") -- Dark gray for cursor column
+vim.cmd("highlight LineNr guifg=#FFFFFF") -- White line numbers
+
+-- Miscellaneous Groups
+vim.cmd("highlight Special guifg=#FF00FF") -- Magenta special characters
+vim.cmd("highlight Title guifg=#00CED1 gui=bold") -- Turquoise titles
+vim.cmd("highlight Todo guifg=#FFD700 guibg=#000000 gui=bold") -- Gold TODO comments
+vim.cmd("highlight SpecialKey guifg=#B22222 gui=bold") -- Firebrick red special keys
+vim.cmd("highlight NonText guifg=#696969") -- Dim gray non-text characters
+vim.cmd("highlight MatchParen guifg=#2E90FF guibg=#444444 gui=bold") -- Blue matching parentheses
+
+
diff --git a/lua/core/plugins.lua b/lua/core/plugins.lua
@@ -35,10 +35,8 @@ require("luasnip").config.set_config({ -- Setting LuaSnip config
local npairs = require("nvim-autopairs")
npairs.setup({})
- -- theme
- use({ "catppuccin/nvim", as = "catppuccin" })
-
+
-- lsp
use({
"VonHeikemen/lsp-zero.nvim",
@@ -66,18 +64,6 @@ require("luasnip").config.set_config({ -- Setting LuaSnip config
-- beautify markdown in vim
use("OXY2DEV/markview.nvim")
- -- preview in browser
- use({
- "iamcco/markdown-preview.nvim",
- run = "cd app && npm install",
- setup = function()
- vim.g.mkdp_filetypes = {
- "markdown",
- }
- end,
- ft = { "markdown" },
- })
-
-- needed for icons for telescope
use("nvim-tree/nvim-web-devicons")
@@ -90,13 +76,6 @@ require("luasnip").config.set_config({ -- Setting LuaSnip config
requires = { "nvim-tree/nvim-web-devicons", opt = true },
})
- require("lualine").setup({
- options = {
- theme = "catppuccin",
- -- ... the rest of your lualine config
- },
- })
-
-- this is freaking awesome
use('rlane/pounce.nvim')
@@ -107,38 +86,6 @@ require("luasnip").config.set_config({ -- Setting LuaSnip config
debug = false,
}
- use ('ThePrimeagen/harpoon')
- require("harpoon").setup({
-
- global_settings = {
- -- sets the marks upon calling `toggle` on the ui, instead of require `:w`.
- save_on_toggle = false,
-
- -- saves the harpoon file upon every change. disabling is unrecommended.
- save_on_change = true,
-
- -- sets harpoon to run the command immediately as it's passed to the terminal when calling `sendCommand`.
- enter_on_sendcmd = false,
-
- -- closes any tmux windows harpoon that harpoon creates when you close Neovim.
- tmux_autoclose_windows = false,
-
- -- filetypes that you want to prevent from adding to the harpoon list menu.
- excluded_filetypes = { "harpoon" },
-
- -- set marks specific to each git branch inside git repository
- mark_branch = false,
-
- -- enable tabline with harpoon marks
- tabline = false,
- tabline_prefix = " ",
- tabline_suffix = " ",
- }
-
-
- })
-
-
use({
"kylechui/nvim-surround",
tag = "*", -- Use for stability; omit to use `main` branch for the latest features
diff --git a/plugin/packer_compiled.lua b/plugin/packer_compiled.lua
@@ -79,21 +79,11 @@ _G.packer_plugins = {
path = "/home/andrew/.local/share/nvim/site/pack/packer/start/LuaSnip",
url = "https://github.com/L3MON4D3/LuaSnip"
},
- catppuccin = {
- loaded = true,
- path = "/home/andrew/.local/share/nvim/site/pack/packer/start/catppuccin",
- url = "https://github.com/catppuccin/nvim"
- },
["cmp-nvim-lsp"] = {
loaded = true,
path = "/home/andrew/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp",
url = "https://github.com/hrsh7th/cmp-nvim-lsp"
},
- harpoon = {
- loaded = true,
- path = "/home/andrew/.local/share/nvim/site/pack/packer/start/harpoon",
- url = "https://github.com/ThePrimeagen/harpoon"
- },
["lsp-zero.nvim"] = {
loaded = true,
path = "/home/andrew/.local/share/nvim/site/pack/packer/start/lsp-zero.nvim",
@@ -104,13 +94,6 @@ _G.packer_plugins = {
path = "/home/andrew/.local/share/nvim/site/pack/packer/start/lualine.nvim",
url = "https://github.com/nvim-lualine/lualine.nvim"
},
- ["markdown-preview.nvim"] = {
- loaded = false,
- needs_bufread = false,
- only_cond = false,
- path = "/home/andrew/.local/share/nvim/site/pack/packer/opt/markdown-preview.nvim",
- url = "https://github.com/iamcco/markdown-preview.nvim"
- },
["markview.nvim"] = {
loaded = true,
path = "/home/andrew/.local/share/nvim/site/pack/packer/start/markview.nvim",
@@ -185,21 +168,10 @@ _G.packer_plugins = {
}
time([[Defining packer_plugins]], false)
--- Setup for: markdown-preview.nvim
-time([[Setup for markdown-preview.nvim]], true)
-try_loadstring("\27LJ\2\n=\0\0\2\0\4\0\0056\0\0\0009\0\1\0005\1\3\0=\1\2\0K\0\1\0\1\2\0\0\rmarkdown\19mkdp_filetypes\6g\bvim\0", "setup", "markdown-preview.nvim")
-time([[Setup for markdown-preview.nvim]], false)
-- Config for: nvim-surround
time([[Config for nvim-surround]], true)
try_loadstring("\27LJ\2\n?\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\18nvim-surround\frequire\0", "config", "nvim-surround")
time([[Config for nvim-surround]], false)
-vim.cmd [[augroup packer_load_aucmds]]
-vim.cmd [[au!]]
- -- Filetype lazy-loads
-time([[Defining lazy-load filetype autocommands]], true)
-vim.cmd [[au FileType markdown ++once lua require("packer.load")({'markdown-preview.nvim'}, { ft = "markdown" }, _G.packer_plugins)]]
-time([[Defining lazy-load filetype autocommands]], false)
-vim.cmd("augroup END")
_G._packer.inside_compile = false
if _G._packer.needs_bufread == true then
