PlexSheep
/
neovim-confs
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/master' into server

This commit is contained in:
Christoph J. Scherr 2023-09-20 18:49:33 +02:00
parent 8fb1afa21a 3cbed5dd74
commit 54fe9c5a79
10 changed files with 133 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
init.lua
View File

@ -10,6 +10,7 @@ require('lazy').setup(vim.tbl_extend('keep', config.user_lazy_opts(), {
{ import = 'plex.plugins' },
{ import = 'plex.plugins.extras.ui' },
{ import = 'plex.plugins.extras.treesitter' },
{ import = 'plex.plugins.extras.formatting' },
{ import = 'plex.plugins.extras.editor' },
{ import = 'plex.plugins.extras.lang.json' },
{ import = 'plex.plugins.extras.lang.python' },

4
lua/plex/config/keymaps.lua
View File

@ -57,10 +57,10 @@ map('n', '<A-k>', '<cmd>lnext<CR>', { desc = 'Next Loclist Item' })
map('n', '<A-j>', '<cmd>lprev<CR>', { desc = 'Previous Loclist Item' })
-- go to next diagnostics entry
map('n', '<C-j>', function ()
map('n', '<leader>cj', function ()
vim.diagnostic.goto_next()
end, { desc = 'go to next diagnostic'})
map('n', '<C-k>', function ()
map('n', '<leader>ck', function ()
vim.diagnostic.goto_prev()
end, { desc = 'go to last diagnostic'})

27
lua/plex/plugins/coding.lua
View File

@ -198,19 +198,20 @@ return {
-----------------------------------------------------------------------------
{
'echasnovski/mini.surround',
enabled = false,
-- stylua: ignore
keys = function(_, keys)
-- Populate the keys based on the user's options
local plugin = require('lazy.core.config').spec.plugins['mini.surround']
local opts = require('lazy.core.plugin').values(plugin, 'opts', false)
local mappings = {
{ opts.mappings.add, desc = 'Add surrounding', mode = { 'n', 'x' } },
{ opts.mappings.delete, desc = 'Delete surrounding' },
{ opts.mappings.find, desc = 'Find right surrounding' },
{ opts.mappings.find_left, desc = 'Find left surrounding' },
{ opts.mappings.highlight, desc = 'Highlight surrounding' },
{ opts.mappings.replace, desc = 'Replace surrounding' },
{ opts.mappings.update_n_lines, desc = 'Update `MiniSurround.config.n_lines`' },
{ opts.mappings.add, desc = 'Add surrounding', mode = { 'n', 'x', 'v' } },
{ opts.mappings.delete, desc = 'Delete surrounding', mode = { 'n', 'x', 'v' } },
{ opts.mappings.find, desc = 'Find right surrounding', mode = { 'n', 'x', 'v' } },
{ opts.mappings.find_left, desc = 'Find left surrounding', mode = { 'n', 'x', 'v' } },
{ opts.mappings.highlight, desc = 'Highlight surrounding', mode = { 'n', 'x', 'v' } },
{ opts.mappings.replace, desc = 'Replace surrounding', mode = { 'n', 'x', 'v' } },
{ opts.mappings.update_n_lines, desc = 'Update `MiniSurround.config.n_lines`', mode = { 'n', 'x', 'v' } },
}
mappings = vim.tbl_filter(function(m)
return m[1] and #m[1] > 0
@ -220,12 +221,12 @@ return {
opts = {
mappings = {
add = '<leader>sa', -- Add surrounding in Normal and Visual modes
delete = 'ds', -- Delete surrounding
find = 'gzf', -- Find surrounding (to the right)
find_left = 'gzF', -- Find surrounding (to the left)
highlight = 'gzh', -- Highlight surrounding
replace = 'cs', -- Replace surrounding
update_n_lines = 'gzn', -- Update `n_lines`
delete = '<leader>sd', -- Delete surrounding
find = '<leader>sf', -- Find surrounding (to the right)
find_left = '<leader>sF', -- Find surrounding (to the left)
highlight = '<leader>sh', -- Highlight surrounding
replace = '<leader>cs', -- Replace surrounding
update_n_lines = '<leader>su', -- Update `n_lines`
},
},
},

2
lua/plex/plugins/editor.lua
View File

@ -191,7 +191,7 @@ return {
keys = {
{ 'gl', '<Plug>(leap-forward-to)', mode = { 'n', 'x', 'o' }, desc = 'Leap forward to' },
{ 'gL', '<Plug>(leap-backward-to)', mode = { 'n', 'x', 'o' }, desc = 'Leap backward to' },
{ '<leader>wl', '<Plug>(leap-from-window)', mode = { 'n', 'x', 'o' }, desc = 'Leap to windows' },
{ '<leader>wgl', '<Plug>(leap-from-window)', mode = { 'n', 'x', 'o' }, desc = 'Leap to windows' },
},
config = function ()
local leap = require('leap')

4
lua/plex/plugins/extras/coding/sandwich.lua
View File

@ -11,8 +11,8 @@ return {
{ '<leader>sc', '<Plug>(operator-sandwich-replace)<Plug>(operator-sandwich-release-count)<Plug>(textobj-sandwich-query-a)', silent = true },
{ '<leader>ssc', '<Plug>(operator-sandwich-replace)<Plug>(operator-sandwich-release-count)<Plug>(textobj-sandwich-auto-a)', silent = true },
{ '<leader>sa', '<Plug>(operator-sandwich-add)', silent = true, mode = { 'n', 'x', 'o' }},
{ '<leader>ir', '<Plug>(textobj-sandwich-auto-i)', silent = true, mode = { 'x', 'o' }},
{ '<leader>ab', '<Plug>(textobj-sandwich-auto-a)', silent = true, mode = { 'x', 'o' }},
{ '<leader>si', '<Plug>(textobj-sandwich-auto-i)', silent = true, mode = { 'x', 'o' }},
{ '<leader>sa', '<Plug>(textobj-sandwich-auto-a)', silent = true, mode = { 'x', 'o' }},
},
init = function()
vim.g.sandwich_no_default_key_mappings = 1

33
lua/plex/plugins/extras/formatting/prettier.lua
View File

@ -4,32 +4,49 @@
return {
{
'williamboman/mason.nvim',
"williamboman/mason.nvim",
opts = function(_, opts)
if type(opts.ensure_installed) == 'table' then
table.insert(opts.ensure_installed, 'prettierd')
if type(opts.ensure_installed) == "table" then
table.insert(opts.ensure_installed, "prettierd")
end
end,
},
{
'mhartington/formatter.nvim',
"mhartington/formatter.nvim",
optional = true,
keys = {
{ "<Leader>ff", "<cmd>Format<CR>", desc = "Use Formatter" },
},
opts = function(_, opts)
opts = opts or {}
local filetypes = {
-- FIXME:add more filetypes
json = { require('formatter.defaults.prettierd') },
json = { require("formatter.defaults.prettierd") },
rust = {
rustfmt = function()
return {
exe = "rustfmt",
args = { "--emit=std ut" },
stdin = true,
}
end,
},
["*"] = {
-- "formatter.filetypes.any" defines default configurations for any
-- filetype
require("formatter.filetypes.any").remove_trailing_whitespace,
},
}
opts.filetype = vim.tbl_extend('keep', opts.filetype or {}, filetypes)
opts.filetype = vim.tbl_extend("keep", opts.filetype or {}, filetypes)
end,
},
{
'jose-elias-alvarez/null-ls.nvim',
"jose-elias-alvarez/null-ls.nvim",
optional = true,
opts = function(_, opts)
local nls = require('null-ls')
local nls = require("null-ls")
table.insert(opts.sources, nls.builtins.formatting.prettierd)
end,
},

28
lua/plex/plugins/extras/lang/tex.lua Normal file
View File

@ -0,0 +1,28 @@
return {
{
"nvim-treesitter/nvim-treesitter",
opts = function(_, opts)
if type(opts.ensure_installed) == "table" then
vim.list_extend(opts.ensure_installed, { "rust" })
end
end,
},
{
"neovim/nvim-lspconfig",
-- dependencies = { 'b0o/SchemaStore.nvim', version = false },
opts = {
servers = {
texlab = {
rootDirectory = ".",
auxDirectory = ".",
latexFormatter = "latexindent",
latexindent = {
modifyLineBreaks = true,
},
},
},
},
},
}

20
lua/plex/plugins/extras/ui/dashboard.lua
View File

@ -2,16 +2,16 @@ local function get_header()
-- see https://github.com/MaximilianLloyd/ascii.nvim
return {
-- The following is a customized version!
[[ ]],
[[ ██ ]],
[[ █ ███████ █████ ██ ]],
[[ ███ █████ █████  ]],
[[ █████ ███ ███████████████████ ███ ███████████ ]],
[[ ██ ██ █ ███ █████████████ █████ ██████████████ ]],
[[ ████ ████ ██████████ █████████ █████ █████ ████ █████ ]],
[[ ██████ ██ ███ ███ █████████ █████ █████ ████ █████ ]],
[[ ████████  ██████████████████ ████ █████ █████ ████ ██████ ]],
[[ ]],
[[ ]],
[[ ]],
[[ █ ████████ █████ ███████ ████ ]],
[[ ███ ██████ █████ █████████ ██████ ]],
[[ █████ ██████████████████████ ████ ███████████████ ]],
[[ ██ ██ █████ █████████████ ████ ████████████████ ]],
[[ ████ ███████████████ █████████ ████ █████ ██████ ████ ]],
[[ ██████ ██████ ███ █████████ ████ █████ █████ ████ ]],
[[ ████████ ███████████████████ ████ ████ █████ ████ ████ ]],
[[ ]],
}
end

11
lua/plex/plugins/lsp/init.lua
View File

@ -74,6 +74,9 @@ return {
},
},
},
texlab = {
}
},
-- you can do any additional lsp server setup here
-- return true if you don't want this server to be setup with lspconfig
@ -243,7 +246,13 @@ return {
build = ':MasonUpdate',
keys = { { '<leader>mm', '<cmd>Mason<cr>', desc = 'Mason' } },
opts = {
ensure_installed = {},
ensure_installed = {
'rust-analyzer',
'clangd',
'pyright',
'bash-language-server',
'codelldb',
},
ui = {
border = 'rounded',
},

40
spell/en.utf-8.add
View File

@ -68,3 +68,43 @@ SHA
Etablierungs
the
strikethrough
RustBook
IEC62443
DHBW
gelinked
openssl
Yocto
gls
ECC
Kryptosystem
github
sfackler
mathmatics
www
sagemath
PlexSheep
plexcryptool
ECDSA
EdDSA
Stringverarbeitung
#onblocking
OOP
Fifo
serde
Deserialisierung
serde
Skripte
mathmatics
bbc
Kryptographischen/!
PyO3
#yo3
JSON
json
#yo3
Verifikationsmechanismus
projektinterne
Theoriephase
weise/!
Weise
merksam