commit - 6f0170686ae15266983412377814e2fc14b594a8
commit + b35fcb0c6666abc91e87ab6a0d5d9ea454bcc30b
blob - 131338cd2884b6016038b5546e4a3939f3f28e34
blob + d1a07e917b90de0d852da6b2f6eb0f49810cbe95
--- lazy-lock.json
+++ lazy-lock.json
{
"conform.nvim": { "branch": "master", "commit": "c2526f1cde528a66e086ab1668e996d162c75f4f" },
- "gitsigns.nvim": { "branch": "main", "commit": "42d6aed4e94e0f0bbced16bbdcc42f57673bd75e" },
+ "gitsigns.nvim": { "branch": "main", "commit": "abf82a65f185bd54adc0679f74b7d6e1ada690c9" },
"lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
- "mason-lspconfig.nvim": { "branch": "main", "commit": "80c0130c5f16b551865a69e832f1feadeedb5fbe" },
- "mason-tool-installer.nvim": { "branch": "main", "commit": "517ef5994ef9d6b738322664d5fdd948f0fdeb46" },
+ "mason-lspconfig.nvim": { "branch": "main", "commit": "fb179adb7161b53ec998b1139002473434586c3f" },
+ "mason-tool-installer.nvim": { "branch": "main", "commit": "443f1ef8b5e6bf47045cb2217b6f748a223cf7dc" },
"mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" },
- "mini.nvim": { "branch": "main", "commit": "4f53281c51ad9384ef790178b9643740fa763979" },
+ "mini.nvim": { "branch": "main", "commit": "9b935c218ddba02e5dc75c94f90143bce1f7c646" },
"nvim-autopairs": { "branch": "master", "commit": "c2a0dd0d931d0fb07665e1fedb1ea688da3b80b4" },
- "nvim-lspconfig": { "branch": "master", "commit": "92ee7d42320edfbb81f3cad851314ab197fa324a" },
+ "nvim-lspconfig": { "branch": "master", "commit": "54baa4beeeabed24be24379d5b3ce402fe7b5208" },
"plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
"telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" },
"telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
- "telescope.nvim": { "branch": "master", "commit": "a8c2223ea6b185701090ccb1ebc7f4e41c4c9784" }
+ "telescope.nvim": { "branch": "master", "commit": "ad7d9580338354ccc136e5b8f0aa4f880434dcdc" }
}
blob - e893ec11373e9971bc619ddcb9f85733ebda407c
blob + da05898502694c53e47230dd9328ae4746c37199
--- lua/config/colors.lua
+++ lua/config/colors.lua
vim.opt.termguicolors = true
-vim.opt.background = 'dark'
-vim.cmd.colorscheme('quiet')
+vim.api.nvim_set_hl(0, "Normal", { fg = "#ffffff", bg = "#000000" })
+vim.cmd('syntax off')
-vim.api.nvim_set_hl(0, 'keyword', { bold = true })
-vim.api.nvim_set_hl(0, 'comment', {fg = '#696969', italic = true })
-vim.api.nvim_set_hl(0, 'string', { fg = '#dadada' })
-vim.api.nvim_set_hl(0, 'htmlerror', { fg = '#dadada' })
-vim.api.nvim_set_hl(0, 'constant', { fg = '#999999' })
-vim.api.nvim_set_hl(0, 'visual', { bg = '#555555' })
-vim.api.nvim_set_hl(0, 'diagnosticerror', { fg = '#708090' })
-vim.api.nvim_set_hl(0, 'diagnosticvirtualtexterror', { fg = '#708090' })
-vim.api.nvim_set_hl(0, 'diagnosticwarn', { fg = '#708090' })
-vim.api.nvim_set_hl(0, 'diagnosticvirtualtextwarn', { fg = '#708090' })
-vim.api.nvim_set_hl(0, 'matchparen', { fg = '#888888', bg = '#333333' })
+vim.api.nvim_set_hl(0, "GitSignsAdd", { fg = "#ffffff" })
+vim.api.nvim_set_hl(0, "GitSignsChange", { fg = "#ffffff" })
+vim.api.nvim_set_hl(0, "GitSignsDelete", { fg = "#ffffff" })
+
+vim.api.nvim_set_hl(0, "TelescopeMatching", { fg = "#ffffff" })
blob - f62800acdf12eec276be33cf4facbe3e88f6fa1b
blob + 8ae962a221f4c7b574f9a42b5a610e3dfaee3f32
--- lua/config/keymaps.lua
+++ lua/config/keymaps.lua
-- Diagnostic keymaps
vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' })
--- TIP: Disable arrow keys in normal mode
+-- Disable arrow keys in normal mode
vim.keymap.set('n', '<left>', '')
vim.keymap.set('n', '<right>', '')
vim.keymap.set('n', '<up>', '')
vim.keymap.set('n', '<C-j>', '<C-w><C-j>', { desc = 'Move focus to the lower window' })
vim.keymap.set('n', '<C-k>', '<C-w><C-k>', { desc = 'Move focus to the upper window' })
--- Highlight when yanking (copying) text
--- Try it with `yap` in normal mode
--- See `:help vim.highlight.on_yank()`
-vim.api.nvim_create_autocmd('TextYankPost', {
- desc = 'Highlight when yanking (copying) text',
- group = vim.api.nvim_create_augroup('kickstart-highlight-yank', { clear = true }),
- callback = function()
- vim.highlight.on_yank()
- end,
-})
-
-- Telescope keymaps
-- See `:help telescope.builtin`
vim.keymap.set('n', '<leader>sf', '<cmd>Telescope find_files<CR>', { desc = 'Find files' })
vim.keymap.set('n', '<leader>sg', '<cmd>Telescope live_grep<CR>', { desc = 'Search text in files' })
vim.keymap.set('n', '<leader>sb', '<cmd>Telescope buffers<CR>', { desc = 'List open buffers' })
vim.keymap.set('n', '<leader>st', '<cmd>Telescope help_tags<CR>', { desc = 'Search help tags' })
-vim.keymap.set('n', '<leader>sr', '<cmd>Telescope oldfiles<CR>', { desc = 'List recent files' })
vim.keymap.set('n', '<leader>sh', '<cmd>Telescope git_bcommits<CR>', { desc = 'List git history' })
--- Conform
+-- Conform (external plugin) bind
vim.keymap.set({ 'n', 'x' }, '<leader>f', function()
require('conform').format({ async = true, lsp_fallback = false })
-end, { desc = 'Format code' })
+end, { desc = 'Format the current buffer' })
-- LSP keymaps (set on LspAttach)
vim.api.nvim_create_autocmd('LspAttach', {
vim.keymap.set(mode, keys, func, { buffer = event.buf, desc = 'LSP: ' .. desc })
end
- -- Core navigation (single-key, no prefix)
+ -- Core navigation
lsp_map('gd', require('telescope.builtin').lsp_definitions, 'Go to Definition')
lsp_map('gD', vim.lsp.buf.declaration, 'Go to Declaration')
lsp_map('gt', vim.lsp.buf.type_definition, 'Go to Type Definition')
blob - 0ac13d639fe4313210e5ac1ee30f0ef2161c654c
blob + 1f608f8049def613ebcdf5d23e82f14628935f78
--- lua/config/options.lua
+++ lua/config/options.lua
-vim.o.number = true
+vim.o.number = false
vim.o.relativenumber = false
--- Enable mouse mode, can be useful for resizing splits for example!
-vim.o.mouse = 'a'
-
vim.opt.expandtab = true -- Use spaces instead of tabs
vim.opt.shiftwidth = 4 -- Number of spaces to insert for indentation
vim.opt.tabstop = 4 -- Display width of tabs (doesn't affect actual indentation)
vim.opt.softtabstop = 4 -- Number of spaces for <Tab> key to insert (for convenience)
+
-- Don't show the mode, since it's already in the status line
vim.o.showmode = false
vim.o.ignorecase = true
vim.o.smartcase = true
--- Keep signcolumn on by default
+-- Keep signcolumn on (required by gitsigns)
vim.o.signcolumn = 'yes'
-- Decrease update time
-- Sets how neovim will display certain whitespace characters in the editor.
vim.o.list = true
-vim.opt.listchars = { tab = '» ', trail = '·', nbsp = '␣' }
+vim.opt.listchars = { tab = ' ', trail = '·', nbsp = '␣' }
-- Preview substitutions live, as you type!
vim.o.inccommand = 'split'
-- See `:help 'confirm'`
vim.o.confirm = true
+-- Make netrw simpler
vim.g.netrw_banner = 0
+
+-- Amount of lines to scroll
vim.opt.scroll = 10
-- This is done to sync terminal background with neovim background
-- Remove the gigantic status bar and the command padding
vim.o.laststatus = 0
+
+-- Keep the ruller to the essential
+vim.opt.rulerformat = '%l,%c'
blob - 7463e569015d6e87befcac4daf36bb0a37a7d369
blob + 30d4a1174a7064671689f69e9530194f22e103bf
--- lua/plugins/conform.lua
+++ lua/plugins/conform.lua
opts = {
notify_on_error = true,
formatters_by_ft = {
- lua = { 'stylua' },
go = { 'gofmt' },
htmlangular = { 'prettier' },
typescript = { 'prettier' },
javascript = { 'prettier' },
- vue = { 'prettier' },
python = { 'black' },
php = { 'pretty-php' },
},
blob - da0d894275b8984aeb18c81e6cf592675e7b0876
blob + 05fa8a986d71425b2af3100106a62d9f036aa202
--- lua/plugins/mason.lua
+++ lua/plugins/mason.lua
},
{
'williamboman/mason-lspconfig.nvim',
- opts = {
- ensure_installed = { 'lua_ls' },
- automatic_installation = false,
- },
- },
- {
- 'WhoIsSethDaniel/mason-tool-installer.nvim',
- opts = {
- ensure_installed = { 'stylua' },
- },
- },
+ opts = {},
+ }
}
blob - b352dd7109ae42c6169064ca7bbec6b5e605cb6c (mode 644)
blob + /dev/null
--- stylua.toml
+++ /dev/null
-indent_type = "Spaces"
-indent_width = 4
-column_width = 120
-quote_style = "AutoPreferSingle"