commit - 50aae84cc8d08513ab471fadd7951c59d4bc064e
commit + 23e08ceeaaa083ecae7023d409f832e0a2dddd83
blob - e408e3953660e2913b4269ba46e084559ec3350f
blob + b4246dfa520d278702a5d58622d8732f74b46f09
--- lua/colors.lua
+++ lua/colors.lua
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, "Search", { fg = "#090909", bg = "#808080" })
vim.api.nvim_set_hl(0, "IncSearch", { fg = "#090909", bg = "#c6c6c6" })
vim.api.nvim_set_hl(0, "CurSearch", { fg = "#090909", bg = "#c6c6c6" })
blob - 777ab1df80f95aa90067c5d7c66fa93d0ae4490c
blob + 7d208b3d0cb6e3723b3009ecec352fbbef136c15
--- lua/keymaps.lua
+++ lua/keymaps.lua
vim.keymap.set({ 'n', 'x' }, '<leader>f', function()
require('conform').format({ async = true, lsp_fallback = false })
end, { desc = 'Format the current buffer' })
-
--- Gitsigns
-vim.api.nvim_create_autocmd('BufEnter', {
- group = vim.api.nvim_create_augroup('GitSignsConfig', { clear = true }),
- callback = function(event)
- local gs_map = function(keys, func, desc, mode)
- mode = mode or 'n'
- vim.keymap.set(mode, keys, func, { buffer = event.buf, desc = 'GitSigns: ' .. desc })
- end
-
- local gitsigns = require('gitsigns')
-
- gs_map('<leader>b', gitsigns.blame_line, 'toggle git show blame line')
- gs_map('tb', gitsigns.toggle_current_line_blame, 'toggle git show blame line')
- gs_map('td', gitsigns.toggle_deleted, 'Toggle git show deleted')
- end,
-})
blob - fd1b5db24662b196f0f5feb2ed9088fb6dea655f
blob + f8f6dec8000b8e3dd72d1ee3b0c8c64adafa84f4
--- lua/options.lua
+++ lua/options.lua
vim.o.ignorecase = true
vim.o.smartcase = true
--- Keep signcolumn on (required by gitsigns)
-vim.o.signcolumn = 'yes'
-
-- Decrease update time
vim.o.updatetime = 100
-- Make netrw simpler
vim.g.netrw_banner = 0
--- Amount of lines to scroll
-vim.opt.scroll = 10
-
--- Remove mouse menu (spawnable on MOUSE2)
+-- Nuke mouse menu
vim.cmd('aunmenu PopUp')
vim.api.nvim_create_augroup('nvim_popupmenu', { clear = true })
blob - 6371fac130d15b90e0f51eb90f043bf00c6b3c6d
blob + c107334da872d3964e94e50fe02ff4ab3374bfd5
--- nvim-pack-lock.json
+++ nvim-pack-lock.json
"rev": "086a40dc7ed8242c03be9f47fbcee68699cc2395",
"src": "https://github.com/stevearc/conform.nvim"
},
- "gitsigns.nvim": {
- "rev": "8d82c240f190fc33723d48c308ccc1ed8baad69d",
- "src": "https://github.com/lewis6991/gitsigns.nvim"
- },
"plenary.nvim": {
"rev": "74b06c6c75e4eeb3108ec01852001636d85a932b",
"src": "https://github.com/nvim-lua/plenary.nvim"
},
- "telescope-fzf-native.nvim": {
- "rev": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c",
- "src": "https://github.com/nvim-telescope/telescope-fzf-native.nvim"
- },
- "telescope-ui-select.nvim": {
- "rev": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2",
- "src": "https://github.com/nvim-telescope/telescope-ui-select.nvim"
- },
"telescope.nvim": {
"rev": "f7c673b8e46e8f233ff581d3624a517d33a7e264",
"src": "https://github.com/nvim-telescope/telescope.nvim"
blob - b876ff7f0d14267737d1104029577ff58a5b62f3 (mode 644)
blob + /dev/null
--- plugin/gitsigns.lua
+++ /dev/null
-vim.pack.add({
- 'https://github.com/lewis6991/gitsigns.nvim',
-})
-
-require('gitsigns').setup {
- signs = {
- add = { text = '+' },
- change = { text = '~' },
- delete = { text = '_' },
- topdelete = { text = '‾' },
- changedelete = { text = '~' },
- },
- current_line_blame_opts = {
- virt_text = true,
- virt_text_pos = 'eol', -- 'eol' | 'overlay' | 'right_align'
- delay = 0,
- ignore_whitespace = false,
- virt_text_priority = 100,
- use_focus = true,
- },
- current_line_blame_formatter = '<author>, <author_time:%R> - <summary>',
-}
blob - 28e3ab962c170e893e10d096b7e812ecc18e2122
blob + bd41967a633b3608260dbc74e559fd780d3aa253
--- plugin/telescope.lua
+++ plugin/telescope.lua
vim.pack.add({
'https://github.com/nvim-lua/plenary.nvim',
- 'https://github.com/nvim-telescope/telescope-ui-select.nvim',
- 'https://github.com/nvim-telescope/telescope-fzf-native.nvim',
'https://github.com/nvim-telescope/telescope.nvim',
})
-pcall(require('telescope').load_extension, 'fzf')
-pcall(require('telescope').load_extension, 'ui-select')
-
require('telescope').setup{
defaults = {
layout_strategy = 'horizontal',
},
},
},
- extensions = {
- ['ui-select'] = {
- require('telescope.themes').get_dropdown(),
- },
- },
}