repos / dotfiles

commit

6fac95c

parent

7ffea92

author

Eric Bower

date

2025-07-07 00:23:27 -0400 EDT

refactor(nvim): simplify config

1@@ -1,7 +1,5 @@
2-set termguicolors
3 set rtp+=/usr/local/opt/fzf
4 
5 let $FZF_DEFAULT_COMMAND = 'rg --files --hidden --glob "!.git/"'
6-let $NVIM_TUI_ENABLE_TRUE_COLOR=1
7 
8 lua require'init'

  1@@ -1,29 +1,21 @@
  2 local o = vim.o
  3-o.termguicolors  = true
  4-o.background     = 'dark'
  5-o.encoding       = 'utf-8'
  6-o.fileencoding   = 'utf-8'
  7-o.number         = true
  8 o.tabstop        = 2
  9 o.shiftwidth     = 2
 10 o.softtabstop    = 2
 11 o.expandtab      = true
 12-o.colorcolumn    = '80'
 13-o.laststatus     = 2
 14 o.wrap           = false
 15-o.cursorline     = false
 16 o.autoread       = true
 17-o.updatetime     = 250
 18-o.cursorline     = false
 19+o.list           = true
 20+o.signcolumn     = 'yes'
 21 o.backspace      = 'indent,eol,start'
 22 o.completeopt    = 'menuone,noselect'
 23-o.signcolumn     = 'yes'
 24 o.shell          = '/bin/bash'
 25-o.list           = true
 26+o.laststatus     = 0
 27+o.colorcolumn    = '80'
 28+-- o.number         = true
 29 
 30-local g = vim.g
 31-g.mapleader      = ','
 32-g.maplocalleader = ','
 33+vim.g.mapleader      = ','
 34+vim.g.maplocalleader = ','
 35 
 36 local opts = { noremap=true, silent=true }
 37 local set_keymap = vim.keymap.set
 38@@ -32,53 +24,21 @@ set_keymap('n', 'Q', '<nop>', opts)
 39 set_keymap('n', '<leader>w', ':!make fmt<CR>', opts)
 40 set_keymap('n', '<Esc>', [[<C-\><C-n>]], opts)
 41 
 42-local api = vim.api
 43+local autocmd = vim.api.nvim_create_autocmd
 44 
 45--- Taken from https://github.com/norcalli/nvim_utils
 46-local function nvim_create_augroups(definitions)
 47-  for group_name, definition in pairs(definitions) do
 48-    api.nvim_command('augroup '..group_name)
 49-    api.nvim_command('autocmd!')
 50-    for _, def in ipairs(definition) do
 51-      local command = table.concat(vim.tbl_flatten{'autocmd', def}, ' ')
 52-      api.nvim_command(command)
 53-    end
 54-    api.nvim_command('augroup END')
 55-  end
 56-end
 57+autocmd('Filetype', {
 58+  pattern = { 'make' },
 59+  command = 'setlocal tabstop=4 shiftwidth=4 softtabstop=4',
 60+})
 61 
 62-local autocmds = {
 63-  language_spacing = {
 64-    {
 65-      'BufRead,BufNewFile,BufEnter',
 66-      'make',
 67-      'setlocal tabstop=4 shiftwidth=4 softtabstop=4',
 68-    },
 69-  },
 70-  golang = {
 71-    {
 72-      'BufRead,BufNewFile,BufEnter',
 73-      '*.go',
 74-      'setlocal noexpandtab copyindent preserveindent softtabstop=0 shiftwidth=4 tabstop=4',
 75-    },
 76-  },
 77-  typescript = {
 78-    { 'BufNewFile,BufRead', '*.ts,*.mts', 'setlocal filetype=typescript' },
 79-  },
 80-  markdown = {
 81-    { 'BufNewFile,BufRead', '*.md,*.mdx', 'setlocal filetype=markdown' },
 82-  },
 83-  quickfix = {
 84-    { 'FileType', 'qf', 'setlocal wrap' }
 85-  },
 86-  wrapmdfiles = {
 87-    { 'FileType', 'markdown', 'setlocal wrap tw=79 formatoptions+=t tabstop=2 shiftwidth=2 softtabstop=2' },
 88-  },
 89-  wraptextfiles = {
 90-    { 'FileType', 'text', 'setlocal wrap tw=79 formatoptions+=t tabstop=2 shiftwidth=2 softtabstop=2' },
 91-  },
 92-}
 93+autocmd('Filetype', {
 94+  pattern = { 'qf' },
 95+  command = 'setlocal wrap',
 96+})
 97 
 98-nvim_create_augroups(autocmds)
 99+autocmd('Filetype', {
100+  pattern = { 'markdown' },
101+  command = 'setlocal wrap tw=79 formatoptions+=t tabstop=2 shiftwidth=2 softtabstop=2',
102+})
103 
104 require 'plugins'

 1@@ -111,14 +111,11 @@ function setup_lsp()
 2     --Enable completion triggered by <c-x><c-o>
 3     vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
 4 
 5-    -- Mappings.
 6-
 7     -- See `:help vim.lsp.*` for documentation on any of the below functions
 8     vim.keymap.set('n', '<leader>d', vim.lsp.buf.definition, bufopts)
 9     vim.keymap.set('n', '<leader>D', vim.lsp.buf.type_definition, bufopts)
10     vim.keymap.set('n', '<leader>h', vim.lsp.buf.hover, bufopts)
11     vim.keymap.set('n', '<leader>r', vim.lsp.buf.references, bufopts)
12-    vim.keymap.set('n', '<leader>k', vim.lsp.buf.signature_help, bufopts)
13     vim.keymap.set('n', '<leader>i', vim.lsp.buf.implementation, bufopts)
14   end
15 
16@@ -173,22 +170,10 @@ require("lazy").setup({
17     },
18     {
19       "hrsh7th/nvim-cmp",
20-      dependencies = {
21-        "hrsh7th/cmp-buffer",
22-        "hrsh7th/cmp-vsnip",
23-        "hrsh7th/vim-vsnip"
24-      },
25+      dependencies = { "hrsh7th/cmp-buffer", "hrsh7th/cmp-vsnip", "hrsh7th/vim-vsnip" },
26       config = setup_comp,
27     },
28     "hrsh7th/cmp-nvim-lsp",
29-    {
30-      'lukas-reineke/indent-blankline.nvim',
31-      config = function()
32-        require("ibl").setup({
33-          scope = { enabled = false },
34-        })
35-      end
36-    },
37     {
38       'ruifm/gitlinker.nvim',
39       dependencies = 'nvim-lua/plenary.nvim',
40@@ -223,12 +208,6 @@ require("lazy").setup({
41         vim.cmd[[colorscheme dracula]]
42       end
43     },
44-    {
45-      "karb94/neoscroll.nvim",
46-      config = function()
47-        require('neoscroll').setup({})
48-      end
49-    },
50     {
51       "ibhagwan/fzf-lua",
52       config = function()
53@@ -246,27 +225,5 @@ require("lazy").setup({
54         fzf.setup({'max-perf'})
55       end
56     },
57-    {
58-      "nvim-treesitter/nvim-treesitter-context",
59-      config = function()
60-        require'treesitter-context'.setup({
61-          max_lines = 1,
62-        })
63-      end,
64-    },
65-    {
66-      "chentoast/marks.nvim",
67-      config = function()
68-        require'marks'.setup({})
69-      end,
70-    },
71-    {
72-      'nvim-lualine/lualine.nvim',
73-      config = function()
74-        require'lualine'.setup({})
75-      end
76-    },
77-    -- vim plugins
78-    'rhysd/git-messenger.vim'
79   },
80 })