This commit is contained in:
Christoph J. Scherr 2023-11-20 15:53:56 +01:00
parent e4841da451
commit dcc1f206d4
4 changed files with 116 additions and 49 deletions

111
init.lua
View File

@ -1,51 +1,100 @@
-- rafi Neovim entry-point local config = require("plex.config")
-- https://git.cscherr.de/PlexSheep/neovim-conf
local config = require('plex.config')
config.ensure_lazy() config.ensure_lazy()
if vim.g.started_by_firenvim == true then
vim.o.guifont = "FiraCode Nerd Font:h18"
vim.o.lines = vim.o.lines + 10
vim.o.columns = vim.o.columns + 10
-- Start lazy.nvim plugin manager. -- Start lazy.nvim plugin manager.
require('lazy').setup(vim.tbl_extend('keep', config.user_lazy_opts(), { require("lazy").setup(vim.tbl_extend("keep", config.user_lazy_opts(), {
spec = { spec = {
{ import = 'plex.plugins' }, { import = "plex.plugins.core" },
{ import = 'plex.plugins.extras.coding' }, { import = "plex.plugins.editor" },
{ import = 'plex.plugins.extras.ui' }, { import = "plex.plugins.extras.browser" },
{ import = 'plex.plugins.extras.treesitter' },
{ import = 'plex.plugins.extras.formatting' },
{ import = 'plex.plugins.extras.editor' },
{ import = 'plex.plugins.extras.org' },
{ import = 'plex.plugins.extras.lang.go' },
{ import = 'plex.plugins.extras.lang.cpp' }, -- also does C and rust
{ import = 'plex.plugins.extras.lang.json' },
{ import = 'plex.plugins.extras.lang.polyglot' },
{ import = 'plex.plugins.extras.lang.python' },
{ import = 'plex.plugins.extras.lang.yaml' },
-- This will load a custom user lua/plugins.lua or lua/plugins/* -- This will load a custom user lua/plugins.lua or lua/plugins/*
config.has_user_plugins() and { import = 'plugins' } or nil, config.has_user_plugins() and { import = "plugins" } or nil,
}, },
concurrency = vim.loop.available_parallelism() * 2, concurrency = vim.loop.available_parallelism() * 2,
defaults = { lazy = true, version = false }, defaults = { lazy = true, version = false },
dev = { path = config.path_join(vim.fn.stdpath('config'), 'dev') }, dev = { path = config.path_join(vim.fn.stdpath("config"), "dev") },
install = { missing = true, colorscheme = {} }, install = { missing = true, colorscheme = {} },
checker = { enabled = true, notify = false }, checker = { enabled = true, notify = false },
change_detection = { notify = false }, change_detection = { notify = false },
ui = { border = 'rounded' }, ui = { border = "rounded" },
diff = { cmd = 'terminal_git' }, diff = { cmd = "terminal_git" },
performance = { performance = {
rtp = { rtp = {
disabled_plugins = { disabled_plugins = {
'gzip', "gzip",
'vimballPlugin', "vimballPlugin",
'matchit', "matchit",
'matchparen', "noice.nvim",
'2html_plugin', "nvim-notify",
'tarPlugin', "2html_plugin",
'tutor', "tarPlugin",
'zipPlugin', "bufferline.nvim",
"tutor",
"zipPlugin",
}, },
}, },
}, },
})) }))
config.setup() config.setup()
vim.keymap.set("n", "<C-DOWN>", function()
vim.o.lines = vim.o.lines + 1
end, { expr = true, desc = "Make Display bigger" })
vim.keymap.set("n", "<C-UP>", function()
vim.o.lines = vim.o.lines - 1
end, { expr = true, desc = "Make Display smaller" })
else
vim.o.laststatus = 2
vim.o.showtabline = 2
-- Start lazy.nvim plugin manager.
require("lazy").setup(vim.tbl_extend("keep", config.user_lazy_opts(), {
spec = {
{ import = "plex.plugins" },
{ import = "plex.plugins.extras.coding" },
{ import = "plex.plugins.extras.ui" },
{ import = "plex.plugins.extras.treesitter" },
{ import = "plex.plugins.extras.formatting" },
{ import = "plex.plugins.extras.editor" },
{ import = "plex.plugins.extras.org" },
{ import = "plex.plugins.extras.lang.go" },
{ import = "plex.plugins.extras.lang.cpp" }, -- also does C and rust
{ import = "plex.plugins.extras.lang.json" },
{ import = "plex.plugins.extras.lang.polyglot" },
{ import = "plex.plugins.extras.lang.python" },
{ import = "plex.plugins.extras.lang.yaml" },
-- This will load a custom user lua/plugins.lua or lua/plugins/*
config.has_user_plugins() and { import = "plugins" } or nil,
},
concurrency = vim.loop.available_parallelism() * 2,
defaults = { lazy = true, version = false },
dev = { path = config.path_join(vim.fn.stdpath("config"), "dev") },
install = { missing = true, colorscheme = {} },
checker = { enabled = true, notify = false },
change_detection = { notify = false },
ui = { border = "rounded" },
diff = { cmd = "terminal_git" },
performance = {
rtp = {
disabled_plugins = {
"gzip",
"vimballPlugin",
"matchit",
"matchparen",
"2html_plugin",
"tarPlugin",
"tutor",
"zipPlugin",
},
},
},
}))
config.setup()
end

View File

@ -32,8 +32,8 @@ map('n', '<leader>l', '<cmd>Lazy<cr>', { desc = 'Open Lazy UI' })
-- Move faster between lines -- Move faster between lines
-- See vim-smoothie -- See vim-smoothie
--map({ 'n', 'x' }, 'K', "<C-u>") map({ 'n', 'x' }, 'K', "<C-u>")
--map({ 'n', 'x' }, 'J', "<C-d>") map({ 'n', 'x' }, 'J', "<C-d>")
-- Easier line-wise movement -- Easier line-wise movement
map({'n', 'v'}, 'H', '<HOME>') map({'n', 'v'}, 'H', '<HOME>')

View File

@ -140,7 +140,13 @@ opt.number = true -- Show line numbers
opt.ruler = true -- Default status ruler opt.ruler = true -- Default status ruler
opt.list = true -- Show hidden characters opt.list = true -- Show hidden characters
if vim.g.started_by_firenvim == false then
opt.showtabline = 2 -- Always show the tabs line opt.showtabline = 2 -- Always show the tabs line
opt.laststatus = 2 -- Always show laststatus
else
opt.showtabline = 1 -- Don't show tabline in firenvim, unless multitab
opt.laststatus = 1 -- Don't show laststatus in firenvim
end
opt.helpheight = 0 -- Disable help window resizing opt.helpheight = 0 -- Disable help window resizing
opt.winwidth = 30 -- Minimum width for active window opt.winwidth = 30 -- Minimum width for active window
opt.winminwidth = 1 -- Minimum width for inactive windows opt.winminwidth = 1 -- Minimum width for inactive windows

View File

@ -0,0 +1,12 @@
return {
{
"glacambre/firenvim",
-- Lazy load firenvim
-- Explanation: https://github.com/folke/lazy.nvim/discussions/463#discussioncomment-4819297
lazy = not vim.g.started_by_firenvim,
build = function()
vim.fn["firenvim#install"](0)
end,
},
}