mirror of
https://github.com/davegallant/nix-config
synced 2025-08-06 11:23:40 +00:00
Refactor init.lua
This commit is contained in:
Dave Gallant
@@ -334,7 +334,6 @@ in
|
||||
tabular
|
||||
telescope-nvim
|
||||
trouble-nvim
|
||||
twilight-nvim
|
||||
typescript-vim
|
||||
vim-commentary
|
||||
vim-go
|
||||
|
||||
@@ -1,63 +1,59 @@
|
||||
-----------------------------------------------------------------------------
|
||||
-- Options {{{1 ---------------------------------------------------------------
|
||||
-------------------------------------------------------------------------------
|
||||
vim.opt.autoindent = true -- maintain indent of current line
|
||||
vim.opt.backup = false -- don't make backups before writing
|
||||
vim.opt.belloff = "all" -- never ring the bell for any reason
|
||||
vim.opt.autoindent = true
|
||||
vim.opt.backup = false
|
||||
vim.opt.belloff = "all"
|
||||
vim.opt.breakindent = true
|
||||
vim.opt.completeopt = "menuone" -- show menu even if there is only one candidate (for nvim-compe)
|
||||
vim.opt.completeopt = vim.opt.completeopt + "noselect" -- don't automatically select canditate (for nvim-compe)
|
||||
vim.opt.cursorline = true -- highlight current line
|
||||
vim.opt.expandtab = true -- always use spaces instead of tabs
|
||||
vim.opt.completeopt = "menuone"
|
||||
vim.opt.completeopt = vim.opt.completeopt + "noselect"
|
||||
vim.opt.cursorline = true
|
||||
vim.opt.expandtab = true
|
||||
vim.opt.fillchars = {
|
||||
diff = "∙", -- BULLET OPERATOR (U+2219, UTF-8: E2 88 99)
|
||||
eob = " ", -- NO-BREAK SPACE (U+00A0, UTF-8: C2 A0) to suppress ~ at EndOfBuffer
|
||||
vert = "┃", -- BOX DRAWINGS HEAVY VERTICAL (U+2503, UTF-8: E2 94 83)
|
||||
diff = "∙",
|
||||
eob = " ",
|
||||
vert = "┃",
|
||||
}
|
||||
vim.opt.hlsearch = true
|
||||
vim.opt.ignorecase = true
|
||||
vim.opt.incsearch = true
|
||||
vim.opt.mouse = "a" -- enable mouse
|
||||
vim.opt.modelines = 5
|
||||
vim.opt.mouse = "a"
|
||||
vim.opt.number = true
|
||||
vim.opt.pumblend = 10
|
||||
vim.opt.relativenumber = true
|
||||
vim.opt.scrolloff = 3
|
||||
vim.opt.shell = "bash"
|
||||
vim.opt.shiftround = false
|
||||
vim.opt.shiftwidth = 2
|
||||
vim.opt.shiftwidth = 2
|
||||
vim.opt.shortmess = vim.opt.shortmess + "A"
|
||||
vim.opt.shortmess = vim.opt.shortmess + "I"
|
||||
vim.opt.shortmess = vim.opt.shortmess + "O"
|
||||
vim.opt.shortmess = vim.opt.shortmess + "T"
|
||||
vim.opt.shortmess = vim.opt.shortmess + "W"
|
||||
vim.opt.shortmess = vim.opt.shortmess + "a"
|
||||
vim.opt.shortmess = vim.opt.shortmess + "c"
|
||||
vim.opt.shortmess = vim.opt.shortmess + "o"
|
||||
vim.opt.shortmess = vim.opt.shortmess + "t"
|
||||
vim.opt.showbreak = "↳ "
|
||||
vim.opt.showcmd = false
|
||||
vim.opt.showcmd = true
|
||||
vim.opt.sidescroll = 0
|
||||
vim.opt.sidescrolloff = 3
|
||||
vim.opt.smartcase = true
|
||||
vim.opt.smarttab = true
|
||||
vim.opt.spellcapcheck = ""
|
||||
vim.opt.splitbelow = true
|
||||
vim.opt.splitright = true
|
||||
vim.opt.swapfile = false
|
||||
vim.opt.switchbuf = "usetab"
|
||||
vim.opt.synmaxcol = 200
|
||||
vim.opt.tabstop = 2
|
||||
vim.opt.tabstop = 2
|
||||
vim.opt.termguicolors = true
|
||||
vim.opt.wildmenu = true
|
||||
|
||||
vim.opt.modelines = 5 -- scan this many lines looking for modeline
|
||||
vim.opt.number = true -- show line numbers in gutter
|
||||
vim.opt.pumblend = 10 -- pseudo-transparency for popup-menu
|
||||
vim.opt.relativenumber = true -- show relative numbers in gutter
|
||||
vim.opt.scrolloff = 3 -- start scrolling 3 lines before edge of viewport
|
||||
|
||||
vim.opt.spellcapcheck = "" -- don't check for capital letters at start of sentence
|
||||
vim.opt.splitbelow = true -- open horizontal splits below current window
|
||||
vim.opt.splitright = true -- open vertical splits to the right of the current window
|
||||
vim.opt.suffixes = vim.opt.suffixes - ".h" -- don't sort header files at lower priority
|
||||
vim.opt.swapfile = false -- don't create swap files
|
||||
vim.opt.switchbuf = "usetab" -- try to reuse windows/tabs when switching buffers
|
||||
vim.opt.synmaxcol = 200 -- don't bother syntax highlighting long lines
|
||||
vim.opt.tabstop = 2 -- spaces per tab
|
||||
vim.opt.termguicolors = true -- use guifg/guibg instead of ctermfg/ctermbg in terminal
|
||||
|
||||
vim.opt.shell = "bash" -- shell to use for `!`, `:!`, `system()` etc.
|
||||
vim.opt.shiftround = false -- don't always indent by multiple of shiftwidth
|
||||
vim.opt.shiftwidth = 2 -- spaces per tab (when shifting)
|
||||
vim.opt.shortmess = vim.opt.shortmess + "A" -- ignore annoying swapfile messages
|
||||
vim.opt.shortmess = vim.opt.shortmess + "I" -- no splash screen
|
||||
vim.opt.shortmess = vim.opt.shortmess + "O" -- file-read message overwrites previous
|
||||
vim.opt.shortmess = vim.opt.shortmess + "T" -- truncate non-file messages in middle
|
||||
vim.opt.shortmess = vim.opt.shortmess + "W" -- don't echo "[w]"/"[written]" when writing
|
||||
vim.opt.shortmess = vim.opt.shortmess + "a" -- use abbreviations in messages eg. `[RO]` instead of `[readonly]`
|
||||
vim.opt.shortmess = vim.opt.shortmess + "c" -- completion messages
|
||||
vim.opt.shortmess = vim.opt.shortmess + "o" -- overwrite file-written messages
|
||||
vim.opt.shortmess = vim.opt.shortmess + "t" -- truncate file messages at start
|
||||
vim.opt.showbreak = "↳ " -- DOWNWARDS ARROW WITH TIP RIGHTWARDS (U+21B3, UTF-8: E2 86 B3)
|
||||
vim.opt.showcmd = false -- don't show extra info at end of command line
|
||||
vim.opt.sidescroll = 0 -- sidescroll in jumps because terminals are slow
|
||||
vim.opt.sidescrolloff = 3 -- same as scrolloff, but for columns
|
||||
vim.opt.smarttab = true -- <tab>/<BS> indent/dedent in leading whitespace
|
||||
|
||||
-- Format JSON
|
||||
vim.cmd([[command! JsonFormat execute "::%!jq '.'"]])
|
||||
|
||||
@@ -178,46 +174,45 @@ vim.api.nvim_exec(
|
||||
-- trouble
|
||||
require("trouble").setup({
|
||||
{
|
||||
position = "bottom", -- position of the list can be: bottom, top, left, right
|
||||
height = 10, -- height of the trouble list when position is top or bottom
|
||||
width = 50, -- width of the list when position is left or right
|
||||
icons = true, -- use devicons for filenames
|
||||
mode = "lsp_workspace_diagnostics", -- "lsp_workspace_diagnostics", "lsp_document_diagnostics", "quickfix", "lsp_references", "loclist"
|
||||
fold_open = "", -- icon used for open folds
|
||||
fold_closed = "", -- icon used for closed folds
|
||||
action_keys = { -- key mappings for actions in the trouble list
|
||||
close = "q", -- close the list
|
||||
cancel = "<esc>", -- cancel the preview and get back to your last window / buffer / cursor
|
||||
refresh = "r", -- manually refresh
|
||||
jump = { "<cr>", "<tab>" }, -- jump to the diagnostic or open / close folds
|
||||
open_split = { "<c-x>" }, -- open buffer in new split
|
||||
open_vsplit = { "<c-v>" }, -- open buffer in new vsplit
|
||||
open_tab = { "<c-t>" }, -- open buffer in new tab
|
||||
jump_close = { "o" }, -- jump to the diagnostic and close the list
|
||||
toggle_mode = "m", -- toggle between "workspace" and "document" diagnostics mode
|
||||
toggle_preview = "P", -- toggle auto_preview
|
||||
hover = "K", -- opens a small popup with the full multiline message
|
||||
preview = "p", -- preview the diagnostic location
|
||||
close_folds = { "zM", "zm" }, -- close all folds
|
||||
open_folds = { "zR", "zr" }, -- open all folds
|
||||
toggle_fold = { "zA", "za" }, -- toggle fold of current file
|
||||
previous = "k", -- preview item
|
||||
next = "j", -- next item
|
||||
position = "bottom",
|
||||
height = 10,
|
||||
width = 50,
|
||||
icons = true,
|
||||
mode = "lsp_workspace_diagnostics",
|
||||
fold_open = "",
|
||||
fold_closed = "",
|
||||
action_keys = {
|
||||
close = "q",
|
||||
cancel = "<esc>",
|
||||
refresh = "r",
|
||||
jump = { "<cr>", "<tab>" },
|
||||
open_split = { "<c-x>" },
|
||||
open_vsplit = { "<c-v>" },
|
||||
open_tab = { "<c-t>" },
|
||||
jump_close = { "o" },
|
||||
toggle_mode = "m",
|
||||
toggle_preview = "P",
|
||||
hover = "K",
|
||||
preview = "p",
|
||||
close_folds = { "zM", "zm" },
|
||||
open_folds = { "zR", "zr" },
|
||||
toggle_fold = { "zA", "za" },
|
||||
previous = "k",
|
||||
next = "j",
|
||||
},
|
||||
indent_lines = true, -- add an indent guide below the fold icons
|
||||
auto_open = false, -- automatically open the list when you have diagnostics
|
||||
auto_close = false, -- automatically close the list when you have no diagnostics
|
||||
auto_preview = true, -- automatically preview the location of the diagnostic. <esc> to close preview and go back to last window
|
||||
auto_fold = false, -- automatically fold a file trouble list at creation
|
||||
indent_lines = true,
|
||||
auto_open = false,
|
||||
auto_close = false,
|
||||
auto_preview = true,
|
||||
auto_fold = false,
|
||||
signs = {
|
||||
-- icons / text used for a diagnostic
|
||||
error = "",
|
||||
warning = "",
|
||||
hint = "",
|
||||
information = "",
|
||||
other = "",
|
||||
},
|
||||
use_lsp_diagnostic_signs = false, -- enabling this will use the signs defined in your lsp client
|
||||
use_lsp_diagnostic_signs = false,
|
||||
},
|
||||
})
|
||||
vim.api.nvim_set_keymap("n", "<leader>xx", "<cmd>Trouble<cr>", { silent = true, noremap = true })
|
||||
@@ -237,23 +232,6 @@ vim.api.nvim_set_keymap("n", "<leader>xl", "<cmd>Trouble loclist<cr>", { silent
|
||||
vim.api.nvim_set_keymap("n", "<leader>xq", "<cmd>Trouble quickfix<cr>", { silent = true, noremap = true })
|
||||
vim.api.nvim_set_keymap("n", "gR", "<cmd>Trouble lsp_references<cr>", { silent = true, noremap = true })
|
||||
|
||||
-- twilight
|
||||
require("twilight").setup({
|
||||
dimming = {
|
||||
alpha = 0.25, -- amount of dimming
|
||||
-- we try to get the foreground from the highlight groups or fallback color
|
||||
color = { "Normal", "#cccccc" },
|
||||
},
|
||||
context = 10, -- amount of lines we will try to show around the current line
|
||||
expand = { -- for treesitter, we we always try to expand to the top-most ancestor with these types
|
||||
"function",
|
||||
"method",
|
||||
"table",
|
||||
"if_statement",
|
||||
},
|
||||
exclude = {}, -- exclude these filetypes
|
||||
})
|
||||
|
||||
-- hound.nvim
|
||||
require("hound").setup({
|
||||
hound_base_url = "http://hound", -- Rely on Tailscale's MagicDNS
|
||||
@@ -267,7 +245,6 @@ vim.api.nvim_set_keymap("n", "<leader>hs", ":Hound", { silent = true, noremap =
|
||||
-- neoclip
|
||||
require('telescope').load_extension('neoclip')
|
||||
|
||||
|
||||
-- vim-go
|
||||
vim.g.go_auto_sameids = 0
|
||||
vim.g.go_fmt_command = "goimports"
|
||||
|
||||
Reference in New Issue
Block a user