include i3 and nvim configuration in the central repository, rather than keep them in their seperate respective ones.
This commit is contained in:
73
.config/nvim/lua/config/autocmds.lua
Normal file
73
.config/nvim/lua/config/autocmds.lua
Normal file
@@ -0,0 +1,73 @@
|
||||
-- highlight when yanking text
|
||||
Autocmd('TextYankPost', {
|
||||
desc = 'highlight when yanking text',
|
||||
group = vim.api.nvim_create_augroup('kickstart-highlight-yank', { clear = true }),
|
||||
callback = function()
|
||||
vim.highlight.on_yank()
|
||||
end,
|
||||
})
|
||||
|
||||
-- disable new line comment
|
||||
Autocmd("BufEnter", {
|
||||
desc = "disable bew line comment",
|
||||
callback = function()
|
||||
vim.opt.formatoptions:remove({ "c", "r", "o" })
|
||||
end,
|
||||
})
|
||||
|
||||
-- go to last location when opening a buffer
|
||||
Autocmd("BufReadPost", {
|
||||
desc = "go to last location when opening a buffer",
|
||||
callback = function()
|
||||
local mark = vim.api.nvim_buf_get_mark(0, '"')
|
||||
local lcount = vim.api.nvim_buf_line_count(0)
|
||||
if mark[1] > 0 and mark[1] <= lcount then
|
||||
pcall(vim.api.nvim_win_set_cursor, 0, mark)
|
||||
end
|
||||
end,
|
||||
})
|
||||
|
||||
-- close certain windows with q
|
||||
Autocmd('FileType', {
|
||||
desc = 'close certain windows with q',
|
||||
pattern = { 'help', 'man', 'qf', 'query', 'messages', 'netrw' },
|
||||
callback = function(evt)
|
||||
vim.bo[evt.buf].buflisted = false
|
||||
Map('n', 'q', '<cmd>close<cr>')
|
||||
end
|
||||
})
|
||||
|
||||
-- disable spellcheck in terminal
|
||||
Autocmd('TermOpen', {
|
||||
callback = function()
|
||||
vim.opt.spell = false
|
||||
end,
|
||||
})
|
||||
|
||||
-- closes the first buffer if it is empty
|
||||
Autocmd('BufEnter', {
|
||||
pattern = '*',
|
||||
callback = function()
|
||||
local bufs = vim.api.nvim_list_bufs()
|
||||
|
||||
-- check if the first buffer is an empty one
|
||||
if #bufs == 0 and vim.api.nvim_get_option_value('buftype', { buf = bufs[1] }) and vim.api.nvim_buf_get_name(bufs[1]) then
|
||||
vim.api.nvim_buf_delete(bufs[1], {})
|
||||
end
|
||||
end,
|
||||
})
|
||||
|
||||
---@type table<string, string>
|
||||
local filemap = {
|
||||
['*.h'] = 'c',
|
||||
['*/i3/**.conf'] = 'i3config'
|
||||
}
|
||||
|
||||
for pat, file in pairs(filemap) do
|
||||
Autocmd('BufRead', {
|
||||
pattern = pat,
|
||||
callback = function()
|
||||
vim.bo.filetype = file
|
||||
end
|
||||
})
|
||||
end
|
||||
4
.config/nvim/lua/config/init.lua
Normal file
4
.config/nvim/lua/config/init.lua
Normal file
@@ -0,0 +1,4 @@
|
||||
require('config.opts')
|
||||
require('config.maps')
|
||||
require('config.autocmds')
|
||||
require('config.lazy')
|
||||
24
.config/nvim/lua/config/lazy.lua
Normal file
24
.config/nvim/lua/config/lazy.lua
Normal file
@@ -0,0 +1,24 @@
|
||||
-- bootstrap lazy
|
||||
local lazypath = vim.fn.stdpath 'data' .. '/lazy/lazy.nvim'
|
||||
if not (vim.uv or vim.loop).fs_stat(lazypath) then
|
||||
local lazyrepo = 'https://github.com/folke/lazy.nvim.git'
|
||||
local out = vim.fn.system { 'git', 'clone', '--filter=blob:none', '--branch=stable', lazyrepo, lazypath }
|
||||
if vim.v.shell_error ~= 0 then
|
||||
vim.api.nvim_echo({
|
||||
{ 'Failed to clone lazy.nvim:\n', 'ErrorMsg' },
|
||||
{ out, 'WarningMsg' },
|
||||
}, true, {})
|
||||
return 1
|
||||
end
|
||||
end
|
||||
vim.opt.rtp:prepend(lazypath)
|
||||
|
||||
require('lazy').setup({
|
||||
change_detection = { enabled = false },
|
||||
defaults = {
|
||||
lazy = true,
|
||||
},
|
||||
spec = { { import = 'plugin' } },
|
||||
})
|
||||
|
||||
Map('n', '<leader>L', '<cmd>Lazy<cr>', { desc = 'open Lazy' })
|
||||
45
.config/nvim/lua/config/maps.lua
Normal file
45
.config/nvim/lua/config/maps.lua
Normal file
@@ -0,0 +1,45 @@
|
||||
-- unmap arrow keys in non-insert modes
|
||||
Map({ 'n', 'v' }, '<up>', '<nop>')
|
||||
Map({ 'n', 'v' }, '<down>', '<nop>')
|
||||
Map({ 'n', 'v' }, '<left>', '<nop>')
|
||||
Map({ 'n', 'v' }, '<right>', '<nop>')
|
||||
|
||||
-- tab management / navigation
|
||||
Map('n', '<c-t>', '<cmd>enew<cr>', { desc = 'create a new tab' })
|
||||
|
||||
-- for help exiting certain modes
|
||||
Map({ 'n', 'i' }, '<esc>', '<cmd>nohlsearch<cr><esc>', { desc = 'cancel search highlighting and escape' })
|
||||
Map('t', '<c-esc>', '<c-\\><c-n>', { desc = 'exit terminal mode' })
|
||||
|
||||
-- window management
|
||||
Map('n', '<m-s>', '<cmd>wincmd s<cr>', { desc = 'horizontal split' })
|
||||
Map('n', '<m-v>', '<cmd>wincmd v<cr>', { desc = 'vertical split' })
|
||||
Map('n', '<c-h>', '<cmd>wincmd h<cr>', { desc = 'move focus to the left window' })
|
||||
Map('n', '<c-l>', '<cmd>wincmd l<cr>', { desc = 'move focus to the right window' })
|
||||
Map('n', '<c-j>', '<cmd>wincmd j<cr>', { desc = 'move focus to the lower window' })
|
||||
Map('n', '<c-k>', '<cmd>wincmd k<cr>', { desc = 'move focus to the upper window' })
|
||||
Map('n', '<m-H>', '<cmd>wincmd H<cr>', { desc = 'move window to left' })
|
||||
Map('n', '<m-L>', '<cmd>wincmd L<cr>', { desc = 'move window to right' })
|
||||
Map('n', '<m-K>', '<cmd>wincmd K<cr>', { desc = 'move window to top' })
|
||||
Map('n', '<m-J>', '<cmd>wincmd J<cr>', { desc = 'move window to bottom' })
|
||||
|
||||
-- diagnostic / lsp key bindings
|
||||
Map('n', 'K', vim.lsp.buf.hover, { desc = 'symbol hover' })
|
||||
Map('n', '<F2>', vim.lsp.buf.rename, { desc = 'rename symbol' })
|
||||
Map('n', '<leader>lm', vim.diagnostic.open_float, { desc = 'view line\'s diagnostic messages' })
|
||||
Map('n', '<leader>q', vim.lsp.buf.code_action, { desc = 'view quickfix list' })
|
||||
|
||||
-- smart tabulation
|
||||
Map('i', '<tab>', function()
|
||||
local _, col = unpack(vim.api.nvim_win_get_cursor(0)) -- get cursor position
|
||||
local isindent = vim.api.nvim_get_current_line():sub(1, col):match('^%s*$')
|
||||
local tabexpnd = vim.bo.expandtab
|
||||
local tabwidth = vim.bo.shiftwidth > 0 and vim.bo.shiftwidth or vim.bo.tabstop
|
||||
|
||||
if not tabexpnd and isindent then
|
||||
return '\t'
|
||||
else
|
||||
local spaces = tabwidth - col % tabwidth
|
||||
return string.rep(' ', spaces == 0 and tabwidth or spaces)
|
||||
end
|
||||
end, { expr = true, desc = "smart tabulation" })
|
||||
59
.config/nvim/lua/config/opts.lua
Normal file
59
.config/nvim/lua/config/opts.lua
Normal file
@@ -0,0 +1,59 @@
|
||||
local o = vim.opt
|
||||
|
||||
-- set options
|
||||
o.clipboard = "unnamedplus" -- keep the clipboard in sync with the one provided by the OS
|
||||
o.termguicolors = true -- allows for colour in the terminal
|
||||
o.number = true -- show line numbers
|
||||
o.cursorline = true -- highlight the current line
|
||||
o.cursorcolumn = false -- highlight the current column
|
||||
o.dir = vim.fn.stdpath('cache') .. '/swp' -- swap directory location for recovery
|
||||
o.sessionoptions = 'buffers,curdir,folds,help,localoptions,tabpages,terminal'
|
||||
o.expandtab = false -- whether tabs are expanded to spaces (overridden by .editorconfig)
|
||||
o.diffopt = 'internal,filler,closeoff,linematch:60' -- diff visualisation
|
||||
o.foldenable = true -- whether folding is enabled
|
||||
o.wrap = false -- whether to wrap text to a new line when it goes off-screen
|
||||
o.breakindent = true -- wrapped lines start at the same location as the start of the line
|
||||
o.list = true -- shows invisible characters
|
||||
o.listchars = { -- whitespace characters
|
||||
eol = nil,
|
||||
trail = '~',
|
||||
extends = nil,
|
||||
precedes = '<',
|
||||
tab = '•-',
|
||||
space = '·',
|
||||
nbsp = '␣',
|
||||
}
|
||||
o.mouse = 'nv' -- which modes the mouse is enabled in 'a:all'
|
||||
o.relativenumber = true -- whether line numbers are relative to the cursor
|
||||
o.scrolloff = 10 -- minimal number of screen lines to keep above and below the cursor
|
||||
o.showtabline = 2 -- whether to show the tab line
|
||||
o.signcolumn = 'yes' -- always show the signcolumn, otherwise it shifts text all the time
|
||||
o.tabstop = 8 -- visual spaces per tab
|
||||
o.softtabstop = 8 -- spaces inserted per tab in insert mode
|
||||
o.shiftwidth = 8 -- spaces for auto-indent
|
||||
o.smartindent = true -- behave a bit more nuanced with when to indent
|
||||
o.ignorecase = true -- whether case should be ignored whilst searching
|
||||
o.smartcase = true -- overrides the above option if contains capital letters
|
||||
o.inccommand = 'split' -- split|nosplit whether substitutions should appear whilst typing.
|
||||
o.splitbelow = true -- force all horizontal splits below the current window
|
||||
o.splitright = true -- force all vertical splits to the right of this window
|
||||
o.showmode = false -- don't show mode as this is already in the status line
|
||||
o.undodir = vim.fn.stdpath('cache') .. '/undo' -- directory for undo files
|
||||
o.undofile = true -- for saving the undo history
|
||||
o.undolevels = 1024 -- the amount of changes that can be undone
|
||||
o.timeoutlen = 300 -- number of MS to wait for a mapped sequence to complete
|
||||
o.ttimeoutlen = 0 -- number of MS to wait for a key sequence to complete
|
||||
o.updatetime = 250 -- number of MS of nothing typed to write a swap file to disk.
|
||||
o.spell = true -- whether spell checking is enabled
|
||||
o.spelllang = 'en_gb,nl' -- set the spell languages
|
||||
o.spellfile = vim.fn.stdpath('config') .. '/spell/user.utf-8.add'
|
||||
|
||||
vim.diagnostic.config({
|
||||
underline = true, -- use underline for diagnostics
|
||||
virtual_text = true, -- shows diagnostics at the end of the line
|
||||
virtual_lines = false, -- shows one diagnostic per line
|
||||
severity_sort = true, -- sort diagnostics by severity
|
||||
update_in_insert = true, -- update diagnostics whilst in insert mode
|
||||
float = true, -- options for floating windows
|
||||
signs = true,
|
||||
})
|
||||
Reference in New Issue
Block a user