add indent_line and simplify uv

This commit is contained in:
Jason Miller 2024-12-07 12:44:06 -05:00
parent 29efb5d532
commit 9936f43124
2 changed files with 17 additions and 14 deletions

View File

@ -3,19 +3,6 @@ vim.g.mapleader = ' '
vim.g.maplocalleader = ' ' vim.g.maplocalleader = ' '
vim.g.have_nerd_font = true vim.g.have_nerd_font = true
local function nvim_ver(major, minor)
local version = vim.version()
return (version.major > major or version.minor >= minor)
end
-- fs_stat moves based on version :(
local fs_stat = function(path)
if nvim_ver(0, 10) then
return vim.uv.fs_stat(path)
end
return vim.loop.fs_stat(path)
end
-- Margins -- Margins
vim.opt.title = false -- in status, not great with tmux vim.opt.title = false -- in status, not great with tmux
vim.opt.number = true -- show line number vim.opt.number = true -- show line number
@ -92,8 +79,9 @@ vim.api.nvim_create_autocmd('TextYankPost', {
-- Install Lazy from Github -- Install Lazy from Github
local lazypath = vim.fn.stdpath 'data' .. '/lazy/lazy.nvim' local lazypath = vim.fn.stdpath 'data' .. '/lazy/lazy.nvim'
local uv = vim.uv or vim.loop
if not fs_stat(lazypath) then if not uv.fs_stat(lazypath) then
local lazyrepo = 'https://github.com/folke/lazy.nvim.git' local lazyrepo = 'https://github.com/folke/lazy.nvim.git'
local out = vim.fn.system { 'git', 'clone', '--filter=blob:none', '--branch=stable', lazyrepo, lazypath } local out = vim.fn.system { 'git', 'clone', '--filter=blob:none', '--branch=stable', lazyrepo, lazypath }
if vim.v.shell_error ~= 0 then if vim.v.shell_error ~= 0 then
@ -106,6 +94,7 @@ vim.opt.rtp:prepend(lazypath)
require('lazy').setup({ require('lazy').setup({
require 'plugins.indentguess', -- Detects tabstop and shiftwidth to match orig require 'plugins.indentguess', -- Detects tabstop and shiftwidth to match orig
require 'plugins.indent_line', -- Mark indent with vertical ruler (default as toggle off)
require 'plugins.neovimacs', -- Emacs-style keybindings while in insert mode require 'plugins.neovimacs', -- Emacs-style keybindings while in insert mode
require 'plugins.gitsigns', -- Add git changes to gutter require 'plugins.gitsigns', -- Add git changes to gutter
require 'plugins.which-key', -- Show keybindings as you go require 'plugins.which-key', -- Show keybindings as you go

View File

@ -0,0 +1,14 @@
return {
{ -- Add indentation guides even on blank lines
'lukas-reineke/indent-blankline.nvim',
main = 'ibl',
config = function()
-- passing as an option does not work correctly at present w/ toggle
require('ibl').setup {}
require('ibl').update { enabled = false }
end,
keys = {
{ '<Leader>ib', '<cmd>IBLToggle<cr>', desc = 'Indent lines toggle' },
},
},
}