From faf06f4706ad95ba0ca46d468d7cc95263a02d22 Mon Sep 17 00:00:00 2001 From: Toby Vincent Date: Fri, 16 Jun 2023 11:14:31 -0500 Subject: refactor(nvim): clean unnecessary options --- nvim/.config/nvim/init.lua | 5 +---- nvim/.config/nvim/lua/plugins/gruvbox.lua | 1 - nvim/.config/nvim/lua/tobyvin/options.lua | 27 +++++++++------------------ nvim/.config/nvim/lua/tobyvin/utils.lua | 8 ++++++++ 4 files changed, 18 insertions(+), 23 deletions(-) create mode 100644 nvim/.config/nvim/lua/tobyvin/utils.lua diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua index 87bca0c..61460b2 100644 --- a/nvim/.config/nvim/init.lua +++ b/nvim/.config/nvim/init.lua @@ -1,3 +1,4 @@ +U = require("tobyvin.utils") require("tobyvin.options") require("tobyvin.filetype") require("tobyvin.autocmds") @@ -8,7 +9,3 @@ require("tobyvin.diagnostic") require("tobyvin.lazy") vim.cmd.colorscheme("gruvbox") - --- if require("tobyvin.utils").normal_startup() then --- require("tobyvin.utils.dashboard") --- end diff --git a/nvim/.config/nvim/lua/plugins/gruvbox.lua b/nvim/.config/nvim/lua/plugins/gruvbox.lua index 7399001..b9966b7 100644 --- a/nvim/.config/nvim/lua/plugins/gruvbox.lua +++ b/nvim/.config/nvim/lua/plugins/gruvbox.lua @@ -5,7 +5,6 @@ local M = { contrast = "hard", transparent_mode = true, overrides = { - CursorLineNr = { bg = "" }, DiffDelete = { reverse = false }, DiffAdd = { reverse = false }, DiffChange = { reverse = false }, diff --git a/nvim/.config/nvim/lua/tobyvin/options.lua b/nvim/.config/nvim/lua/tobyvin/options.lua index 9982058..2b434c0 100644 --- a/nvim/.config/nvim/lua/tobyvin/options.lua +++ b/nvim/.config/nvim/lua/tobyvin/options.lua @@ -1,25 +1,23 @@ vim.g.mapleader = " " vim.g.maplocalleader = vim.g.mapleader -vim.g.tex_flavor = "latex" -vim.opt.autoindent = true vim.opt.background = "dark" -vim.opt.backspace = { "indent", "start", "eol" } vim.opt.breakindent = true vim.opt.clipboard = "unnamedplus" -vim.opt.colorcolumn = "+0" +vim.opt.colorcolumn = "+1" vim.opt.completeopt = { "menuone", "noselect", "noinsert" } vim.opt.conceallevel = 2 vim.opt.cursorline = true -vim.opt.cursorlineopt = "number" +vim.opt.diffopt = { "internal", "filler", "closeoff", "hiddenoff" } +vim.opt.equalalways = false vim.opt.expandtab = true +vim.opt.foldmethod = "marker" vim.opt.formatoptions = "cqrnj" -vim.opt.hidden = true -vim.opt.hlsearch = true vim.opt.ignorecase = true vim.opt.inccommand = "split" vim.opt.jumpoptions:append("stack") vim.opt.linebreak = true +vim.opt.modelines = 1 vim.opt.mouse = "a" vim.opt.number = true vim.opt.pumheight = 10 @@ -27,20 +25,12 @@ vim.opt.pumwidth = 40 vim.opt.relativenumber = true vim.opt.scrolloff = 10 vim.opt.sessionoptions = { "buffers", "curdir", "folds", "help", "tabpages", "winsize", "winpos" } -vim.opt.shell = "zsh" vim.opt.shiftround = true vim.opt.shiftwidth = 0 -vim.opt.showmode = false -vim.opt.shortmess:append("c") vim.opt.showbreak = string.rep(" ", 3) -vim.opt.showmatch = true -vim.opt.sidescrolloff = 2 vim.opt.signcolumn = "yes:1" vim.opt.smartcase = true vim.opt.smartindent = true -vim.opt.smarttab = true -vim.opt.softtabstop = 0 -vim.opt.spelllang = "en_us" vim.opt.spelloptions = { "camel" } vim.opt.splitbelow = true vim.opt.splitright = true @@ -48,10 +38,11 @@ vim.opt.swapfile = false vim.opt.switchbuf = { "useopen", "split", "uselast" } vim.opt.tabstop = 4 vim.opt.termguicolors = true -vim.opt.textwidth = 100 +vim.opt.textwidth = 99 vim.opt.timeoutlen = 500 vim.opt.undofile = true -vim.opt.updatetime = 250 -vim.opt.wildignore = { "*.o", "*.rej", "*.so" } +vim.opt.undolevels = 500 +vim.opt.updatetime = 500 +vim.opt.wildignore:append({ "*.o", "*.rej", "*.so", "*~", "*.pyc", "*pycache*", "Cargo.lock" }) vim.opt.wildmode = "longest:full,full" vim.opt.wrap = false diff --git a/nvim/.config/nvim/lua/tobyvin/utils.lua b/nvim/.config/nvim/lua/tobyvin/utils.lua new file mode 100644 index 0000000..40d45e9 --- /dev/null +++ b/nvim/.config/nvim/lua/tobyvin/utils.lua @@ -0,0 +1,8 @@ +local M = {} + +function M.inspect(v) + print(vim.inspect(v)) + return v +end + +return M -- cgit v1.2.3-70-g09d2