commit 241ab13e5fa32ce38814c4388313faa362219baa from: amb date: Mon Apr 20 19:01:17 2026 UTC Update colors, makepgr commit - a3c5c52849b8cb8be257fe2f70e5173aa2739852 commit + 241ab13e5fa32ce38814c4388313faa362219baa blob - e14115a263b4e359d754b2f9ec37e796d079cc58 blob + e408e3953660e2913b4269ba46e084559ec3350f --- lua/colors.lua +++ lua/colors.lua @@ -1,11 +1,16 @@ vim.opt.termguicolors = true + +vim.api.nvim_set_hl(0, "Normal", { fg = "#c6c6c6", bg = "#090909" }) vim.cmd('syntax off') -vim.api.nvim_set_hl(0, "Normal", { fg = "#d5c494", bg = "#090909" }) -vim.api.nvim_set_hl(0, "Comment", { fg = "#948967", italic = true }) -vim.api.nvim_set_hl(0, "TelescopeMatching", { fg = "#a99c76" }) -vim.api.nvim_set_hl(0, "Visual", { bg = "#474032" }) +vim.api.nvim_set_hl(0, "TelescopeMatching", { fg = "#808080" }) +vim.api.nvim_set_hl(0, "Visual", { bg = "#696969" }) +vim.api.nvim_set_hl(0, "Comment", { fg = "#c6c6c6" }) +vim.api.nvim_set_hl(0, "Search", { fg = "#090909", bg = "#c6c6c6" }) +vim.api.nvim_set_hl(0, "IncSearch", { fg = "#090909", bg = "#c6c6c6" }) +vim.api.nvim_set_hl(0, "CurSearch", { fg = "#090909", bg = "#c6c6c6" }) + local groups = { "Constant", "Identifier", "Statement", "PreProc", "Type", "Special", "String", "Character", "Number", "Boolean", "Float", "Function", @@ -20,6 +25,7 @@ for _, group in ipairs(groups) do vim.api.nvim_set_hl(0, group, { link = "Normal" }) end +-- Disable some mistic built-int treesitter that ignores syntax off vim.api.nvim_create_autocmd("FileType", { pattern = "*", callback = function(a) blob - cc1d8f49329aeb43dd17f64f96ee8e8b6b9fd58b blob + 777ab1df80f95aa90067c5d7c66fa93d0ae4490c --- lua/keymaps.lua +++ lua/keymaps.lua @@ -1,21 +1,19 @@ vim.g.mapleader = ' ' vim.g.maplocalleader = ' ' --- Clear highlights on search when pressing in normal mode -vim.keymap.set('n', '', 'nohlsearch') - --- Faster netrw mapping -vim.keymap.set('n', 'e', ':Ex') - --- Quickfix -vim.keymap.set('n', 'q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' }) - -- Disable arrow keys in normal mode vim.keymap.set('n', '', '') vim.keymap.set('n', '', '') vim.keymap.set('n', '', '') vim.keymap.set('n', '', '') +-- Clear highlights on search when pressing in normal mode +vim.keymap.set('n', '', 'nohlsearch') + +vim.keymap.set('n', 'e', ':Ex', { desc = 'Open netrw'}) +vim.keymap.set('n', 'q', 'copen', { desc = 'Open/Focus Quickfix list' }) +vim.keymap.set('n', 'm', ':make:cwindow', { desc = 'Run :make' }) + -- External plugins -- Telescope vim.keymap.set('n', 'sf', 'Telescope find_files', { desc = 'Find files' }) blob - 546067cf565f4ca36851f8f4ac29fbfddef9004f blob + fd1b5db24662b196f0f5feb2ed9088fb6dea655f --- lua/options.lua +++ lua/options.lua @@ -68,3 +68,12 @@ vim.opt.fillchars:append({ -- Keep the ruller to the essential vim.opt.rulerformat = '%l,%c' vim.opt.shortmess:append("I") + +-- Set makeprg on go files, maybe move this elsewhere? +vim.api.nvim_create_autocmd("FileType", { + pattern = "go", + callback = function() + vim.cmd.compiler("go") + vim.opt_local.makeprg = "go build . 2>&1" + end, +}) blob - 8f819bddf9d3baad1332b5ed5a274ff5874bc859 blob + 1241fd7c8ec98acf266c7997738901ddda6eca6f --- plugin/conform.lua +++ plugin/conform.lua @@ -7,6 +7,7 @@ require('conform').setup { formatters_by_ft = { go = { 'gofmt' }, htmlangular = { 'prettier' }, + html = { 'prettier' }, typescript = { 'prettier' }, javascript = { 'prettier' }, python = { 'black' },