This commit is contained in:
Christoph J. Scherr 2024-01-20 14:22:03 +01:00
parent 3a524bc43d
commit 25c43ed3a7
Signed by: PlexSheep
GPG Key ID: 7CDD0B14851A08EF
2 changed files with 91 additions and 61 deletions

View File

@ -49,7 +49,7 @@ opt.incsearch = true -- Incremental search
opt.wrap = false -- No wrap by default
opt.linebreak = true -- Break long lines at 'breakat'
opt.breakat = '\\ \\ ;:,!?' -- Long lines break chars
opt.breakat = "\\ \\ ;:,!?" -- Long lines break chars
opt.startofline = false -- Cursor in same column for few commands
opt.splitbelow = true -- Splits open bottom right
opt.splitright = true
@ -59,12 +59,13 @@ opt.formatoptions = "qnlmBjp" -- see :h fo-table & :h formatoptions
-- Diff
-- ===
opt.diffopt:append({ 'iwhite', 'indent-heuristic', 'algorithm:patience' })
opt.wildmode = 'longest:full,full' -- Command-line completion mode
opt.diffopt:append { "iwhite", "indent-heuristic", "algorithm:patience" }
opt.wildmode = "longest:full,full" -- Command-line completion mode
-- Editor UI
-- ===
vim.o.guifont = "FiraCode Nerd Font:h15"
opt.termguicolors = true
opt.shortmess = "xsTOInfFitloCaAs"
opt.showmode = true -- Show mode in cmd window
@ -80,7 +81,7 @@ if vim.g.started_by_firenvim == false then
opt.laststatus = 3 -- Always show laststatus
else
opt.showtabline = 1 -- Don't show tabline in firenvim, unless multitab
opt.laststatus = 3 -- Don't show laststatus in firenvim
opt.laststatus = 1 -- Don't show laststatus in firenvim
end
opt.helpheight = 0 -- Disable help window resizing
opt.winwidth = 30 -- Minimum width for active window
@ -92,16 +93,15 @@ opt.showcmd = false -- show command in status line
opt.cmdheight = 0
opt.cmdwinheight = 5 -- Command-line lines
opt.equalalways = true -- Resize windows on split or close
opt.colorcolumn = '+0' -- Column highlight at textwidth's max character-limit
opt.colorcolumn = "+0" -- Column highlight at textwidth's max character-limit
opt.cursorline = true
opt.cursorlineopt = { 'number', 'screenline' }
opt.cursorlineopt = { "number", "screenline" }
opt.pumheight = 10 -- Maximum number of items to show in the popup menu
opt.pumwidth = 10 -- Minimum width for the popup menu
opt.pumblend = 10 -- Popup blend
-- autocommands
-- ===
local function augroup(name)
@ -117,28 +117,38 @@ vim.api.nvim_create_autocmd("TextYankPost", {
})
-- Disable conceallevel for specific file-types.
vim.api.nvim_create_autocmd('FileType', {
group = augroup('fix_conceallevel'),
pattern = { 'latex', 'tex' },
vim.api.nvim_create_autocmd("FileType", {
group = augroup "fix_conceallevel",
pattern = { "latex", "tex" },
callback = function()
vim.opt_local.conceallevel = 0
end,
})
-- Resize splits if window got resized
vim.api.nvim_create_autocmd('VimResized', {
group = augroup('resize_splits'),
vim.api.nvim_create_autocmd("VimResized", {
group = augroup "resize_splits",
callback = function()
vim.cmd('wincmd =')
vim.cmd "wincmd ="
end,
})
-- Wrap and enable spell-checker in text filetypes
vim.api.nvim_create_autocmd('FileType', {
group = augroup('spell_conceal'),
pattern = { 'gitcommit', 'markdown', 'tex', 'latex', 'norg' },
vim.api.nvim_create_autocmd("FileType", {
group = augroup "spell_conceal",
pattern = { "gitcommit", "markdown", "tex", "latex", "norg" },
callback = function()
vim.opt_local.spell = true
vim.opt_local.conceallevel = 0
end,
})
-- map resizing for firenvim
if vim.g.started_by_firenvim == true then
vim.keymap.set("n", "<leader><C-DOWN>", function()
vim.o.lines = vim.o.lines + 1
end, { expr = true, desc = "Make Display bigger" })
vim.keymap.set("n", "<leader><C-UP>", function()
vim.o.lines = vim.o.lines - 1
end, { expr = true, desc = "Make Display smaller" })
end

View File

@ -310,6 +310,7 @@ local plugins = {
-- lazy.nvim
{
"folke/noice.nvim",
enabled = not vim.g.started_by_firenvim,
event = "VeryLazy",
opts = {
-- add any options here
@ -330,6 +331,7 @@ local plugins = {
["vim.lsp.util.convert_input_to_markdown_lines"] = true,
["vim.lsp.util.stylize_markdown"] = true,
["cmp.entry.get_documentation"] = true,
["hover.enabled"] = false,
},
},
-- you can enable a preset for easier configuration
@ -458,6 +460,24 @@ local plugins = {
opacity = 10,
},
},
{
"glacambre/firenvim",
lazy = not vim.g.started_by_firenvim,
build = function()
vim.fn["firenvim#install"](0)
end,
config = function()
vim.g.firenvim_config = {
localSettings = {
[".*"] = {
filename = "/tmp/{hostname}_{pathname%10}.{extension%5}",
cmdline = "firenvim",
takeover = "never", -- activate manually (<C-e>)
},
},
}
end,
},
}
return plugins