From 94dbc0d8d294e25f1420883ee3d12aa62bbba638 Mon Sep 17 00:00:00 2001 From: "Christoph J. Scherr" Date: Tue, 12 Sep 2023 10:11:05 +0200 Subject: [PATCH 01/26] dont annoy me with ro --- lua/plex/config/autocmds.lua | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lua/plex/config/autocmds.lua b/lua/plex/config/autocmds.lua index 7c0c790..25ee149 100644 --- a/lua/plex/config/autocmds.lua +++ b/lua/plex/config/autocmds.lua @@ -56,13 +56,13 @@ vim.api.nvim_create_autocmd('TextYankPost', { }) -- Automatically set read-only for files being edited elsewhere -vim.api.nvim_create_autocmd('SwapExists', { - group = augroup('open_swap'), - nested = true, - callback = function() - vim.v.swapchoice = 'o' - end, -}) +-- vim.api.nvim_create_autocmd('SwapExists', { +-- group = augroup('open_swap'), +-- nested = true, +-- callback = function() +-- vim.v.swapchoice = 'o' +-- end, +-- }) -- Create directories when needed, when saving a file (except for URIs "://"). vim.api.nvim_create_autocmd('BufWritePre', { From 2c0ad5ff56afef20eda04f78b950975e54481395 Mon Sep 17 00:00:00 2001 From: "Christoph J. Scherr" Date: Tue, 12 Sep 2023 18:23:39 +0200 Subject: [PATCH 02/26] spell --- spell/en.utf-8.add | 1 + spell/en.utf-8.add.spl | Bin 952 -> 986 bytes 2 files changed, 1 insertion(+) diff --git a/spell/en.utf-8.add b/spell/en.utf-8.add index 03831ee..7321884 100644 --- a/spell/en.utf-8.add +++ b/spell/en.utf-8.add @@ -68,3 +68,4 @@ SHA Etablierungs the strikethrough +RustBook diff --git a/spell/en.utf-8.add.spl b/spell/en.utf-8.add.spl index 60f315f1ae4a483ceb88faa5112eaafdabceb34e..5c91fb5fec0e2f73a96702ca1f5985aa62c85aa4 100644 GIT binary patch delta 99 zcmdnNev6$i%+t5HAT=k)=syDk)1r-hVN9$niK!W-lQWpKg|6i=7BiMGCNbs%AtM7r ob@t?`OfMMCCf6~mt1zXOG8QtrGUkC~_|w5EonR{Yvl&1D0DUtTjsO4v delta 65 zcmcb`zJr}F%+t5HAT=k)=syDk)6|W8VN5K{iK!WrGnurRuI5Z$#`JBobnLt From bff0f07faa858232716ab127fc0fb9b2ae59747d Mon Sep 17 00:00:00 2001 From: "Christoph J. Scherr" Date: Thu, 14 Sep 2023 09:17:42 +0200 Subject: [PATCH 03/26] spell --- spell/en.utf-8.add | 6 ++++++ spell/en.utf-8.add.spl | Bin 986 -> 1075 bytes 2 files changed, 6 insertions(+) diff --git a/spell/en.utf-8.add b/spell/en.utf-8.add index 7321884..92c7d9d 100644 --- a/spell/en.utf-8.add +++ b/spell/en.utf-8.add @@ -69,3 +69,9 @@ Etablierungs the strikethrough RustBook +IEC62443 +DHBW +gelinked +openssl +Yocto +gls diff --git a/spell/en.utf-8.add.spl b/spell/en.utf-8.add.spl index 5c91fb5fec0e2f73a96702ca1f5985aa62c85aa4..deb3be00157ba7c3b38ee7637bacbf78924cb82b 100644 GIT binary patch literal 1075 zcmYjQyK>V&6y3XuTgD}SpcXqZ>Vq>wioguR&`a`K5|Sl(CHaxULy=FQ;|KCNG}L@V zDjMLNE0bY%tkr#=1udSn!`5-}!p(ntxrp%txzIPH+zi$@0Itv)O5>foi%PiDNX zTt3=!*`dA#lKmoy?8RRE>tDH`>JPwjtXw!SNx-Xs?PUN`Mt{_ynw~;7xQXwOg~(gx z*0Qq3PC?&R8?{TsNr8Qp!w>Bfb~bjl8!!)5aCn|GBae3?m2$8v2k4Eo))jW_f`A7M z6Ecu3K%fy1P-s@8^0mz63I_?NOAS-g3f&t_4e!?;US$%+s-}k~@w3n2P1`^9LA-K7 zR`;-D1>B%Ri@44LK$7UtYn*Un4M7)hWa5-AY8xE5AFCjCy=sOaJz;H|JznI6R}op8 zjuam<6}cX*q*Ll#js!o-OwsWPr`8XMrE-r!bfhPTNQFaEt=63t(gBVavC9Xf11uVB zwnf%KX7Wl2&0y*1CsO1`mERR`df=YNIF*yU#R_w}hnOG)8<=`sJ}a|s0@olTVZel( z()`jT`8n7XiORPE+5F<%aF6!GxL;uoFb};`NJu?H&b>w&dB9$J>vA=As7~P=^~DM> zn-kPpFb%Sh?tg22krF{)dr93Us+?c<`SI1QV literal 986 zcmX|A%Wl&^6rDQ`>vY8jAbC$(%m-8jiA6y|h&7IVW4m^2XKW{FvtbYaP>GLX-4#E< z0?xT^D=VJNeVlXdneo>T*F&#ObN1gQJM{?9VMWG`QF}*p(>(`g~f`?8=bf3 zvPXLlBLDpf_eP^;Jc2{naiLJKhMo%hAQKo0#*+bUj8wA4N?t`3GVfX2O75LMLyXyg z9z%+$-(N=n|l}9YjnFs*oT0mL_x=sQpJfhsus0Lsi zW=shQ9?uk30E1k-$9;u3TL7H6VnVa&-l zD5DbKT?VhEZT9HS5S%T=A(M?Wv3)6K8TGO Date: Thu, 14 Sep 2023 16:19:18 +0200 Subject: [PATCH 04/26] spell --- spell/en.utf-8.add | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/spell/en.utf-8.add b/spell/en.utf-8.add index 92c7d9d..ef8fca6 100644 --- a/spell/en.utf-8.add +++ b/spell/en.utf-8.add @@ -75,3 +75,22 @@ gelinked openssl Yocto gls +ECC +Kryptosystem +github +sfackler +mathmatics +www +sagemath +PlexSheep +plexcryptool +ECDSA +EdDSA +Stringverarbeitung +#onblocking +OOP +Fifo +serde +Deserialisierung +serde +Skripte From 36b2ff1baa638c8ad5502c2a4bd59ea34fa4f776 Mon Sep 17 00:00:00 2001 From: "Christoph J. Scherr" Date: Thu, 14 Sep 2023 16:19:30 +0200 Subject: [PATCH 05/26] surround maps --- lua/plex/plugins/coding.lua | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/lua/plex/plugins/coding.lua b/lua/plex/plugins/coding.lua index 7ad2a80..93e590a 100644 --- a/lua/plex/plugins/coding.lua +++ b/lua/plex/plugins/coding.lua @@ -204,13 +204,13 @@ return { 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 +220,12 @@ return { opts = { mappings = { add = '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 = 'sd', -- Delete surrounding + find = 'sf', -- Find surrounding (to the right) + find_left = 'sF', -- Find surrounding (to the left) + highlight = 'sh', -- Highlight surrounding + replace = 'cs', -- Replace surrounding + update_n_lines = 'su', -- Update `n_lines` }, }, }, From 390c02ac9b99e3805043494cd6da60e9cec0aaa5 Mon Sep 17 00:00:00 2001 From: "Christoph J. Scherr" Date: Thu, 14 Sep 2023 16:20:10 +0200 Subject: [PATCH 06/26] set sandwich maps --- lua/plex/plugins/extras/coding/sandwich.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lua/plex/plugins/extras/coding/sandwich.lua b/lua/plex/plugins/extras/coding/sandwich.lua index 29c14eb..960a5c3 100644 --- a/lua/plex/plugins/extras/coding/sandwich.lua +++ b/lua/plex/plugins/extras/coding/sandwich.lua @@ -2,7 +2,7 @@ return { { -- I dont get how this stuff works 'machakann/vim-sandwich', - enabled = false, + enabled = true, -- stylua: ignore keys = { -- See https://github.com/machakann/vim-sandwich/blob/master/macros/sandwich/keymap/surround.vim @@ -11,8 +11,8 @@ return { { 'sc', '(operator-sandwich-replace)(operator-sandwich-release-count)(textobj-sandwich-query-a)', silent = true }, { 'ssc', '(operator-sandwich-replace)(operator-sandwich-release-count)(textobj-sandwich-auto-a)', silent = true }, { 'sa', '(operator-sandwich-add)', silent = true, mode = { 'n', 'x', 'o' }}, - { 'ir', '(textobj-sandwich-auto-i)', silent = true, mode = { 'x', 'o' }}, - { 'ab', '(textobj-sandwich-auto-a)', silent = true, mode = { 'x', 'o' }}, + { 'si', '(textobj-sandwich-auto-i)', silent = true, mode = { 'x', 'o' }}, + { 'sa', '(textobj-sandwich-auto-a)', silent = true, mode = { 'x', 'o' }}, }, init = function() vim.g.sandwich_no_default_key_mappings = 1 From 285664e93a25120bb24daab9258a3ba9df026dec Mon Sep 17 00:00:00 2001 From: "Christoph J. Scherr" Date: Thu, 14 Sep 2023 16:29:37 +0200 Subject: [PATCH 07/26] wsl: reenable neorg --- lua/plex/plugins/extras/org/neorg.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/plex/plugins/extras/org/neorg.lua b/lua/plex/plugins/extras/org/neorg.lua index 0b8bdd7..9f9e716 100644 --- a/lua/plex/plugins/extras/org/neorg.lua +++ b/lua/plex/plugins/extras/org/neorg.lua @@ -1,7 +1,7 @@ return { { "nvim-neorg/neorg", - enabled = false, + enabled = true, lazy = true, build = ":Neorg sync-parsers", dependencies = { "nvim-lua/plenary.nvim" }, From 431ebe09690fbb49eca1b7f8b00beca046163f8f Mon Sep 17 00:00:00 2001 From: "Christoph J. Scherr" Date: Thu, 14 Sep 2023 16:29:45 +0200 Subject: [PATCH 08/26] disable all surround things --- lua/plex/plugins/coding.lua | 1 + lua/plex/plugins/extras/coding/sandwich.lua | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lua/plex/plugins/coding.lua b/lua/plex/plugins/coding.lua index 93e590a..b534fa6 100644 --- a/lua/plex/plugins/coding.lua +++ b/lua/plex/plugins/coding.lua @@ -198,6 +198,7 @@ return { ----------------------------------------------------------------------------- { 'echasnovski/mini.surround', + enabled = false, -- stylua: ignore keys = function(_, keys) -- Populate the keys based on the user's options diff --git a/lua/plex/plugins/extras/coding/sandwich.lua b/lua/plex/plugins/extras/coding/sandwich.lua index 960a5c3..716b8c9 100644 --- a/lua/plex/plugins/extras/coding/sandwich.lua +++ b/lua/plex/plugins/extras/coding/sandwich.lua @@ -2,7 +2,7 @@ return { { -- I dont get how this stuff works 'machakann/vim-sandwich', - enabled = true, + enabled = false, -- stylua: ignore keys = { -- See https://github.com/machakann/vim-sandwich/blob/master/macros/sandwich/keymap/surround.vim From b77762f3733bd36f8c19d69f5813f7fabcbf0880 Mon Sep 17 00:00:00 2001 From: "Christoph J. Scherr" Date: Fri, 15 Sep 2023 11:48:19 +0200 Subject: [PATCH 09/26] spell --- spell/en.utf-8.add | 2 ++ spell/en.utf-8.add.spl | Bin 1075 -> 1345 bytes 2 files changed, 2 insertions(+) diff --git a/spell/en.utf-8.add b/spell/en.utf-8.add index ef8fca6..4dd5aa5 100644 --- a/spell/en.utf-8.add +++ b/spell/en.utf-8.add @@ -94,3 +94,5 @@ serde Deserialisierung serde Skripte +mathmatics +bbc diff --git a/spell/en.utf-8.add.spl b/spell/en.utf-8.add.spl index deb3be00157ba7c3b38ee7637bacbf78924cb82b..9bcf5c1cee99df9ba8bcb9fe38a7ed520c780873 100644 GIT binary patch literal 1345 zcmYjRyKdA_5cP}`5M8td${)C)Ae$^(1Bp_W@9ZO#$CPsvjhhmFO1q7QS}daZ>gd3ahI) zfe8;Gly=(i0J1KlKqzvC6vbEFDX*WR1(mJd+Uh@`b*v$*M(8R%MDUCWvKIfzYR47{{p98d( z7SUB*1+Pakl>>Y**zB8nELs6GYg$c9s+ zO^G-?;@&Xc6!${6$chFJ%{Y%W16+_1WmF zU0BpU2!r)FZ!DoqnStyMni#d8IR?0>0LHoGAkbF7rO0D^ZXu)*^!8FeG3zlKXFUv9 zzy+L12%(;}>N2~~JBD!VDTWi;fTgG)VyRcy*-xVwtU1~GV+DNnqe6TGoUums4u18D zKNz+QNY^20+|NDFdw2Kn==kKttJlChmzStQ2UQ}6a!Sj|V>yzi|38VzK6KQ~EQ>c- id5cj^HtzJ_h)nR_1~~(Ob#RgzvnR;NSWOCq_q;#Ebo$l+ delta 603 zcmX|8%}N|W80`9Hgpk9sftZ{^#1Iy83MQKYk7gI*K?4%J&p7Suvc1ka+v7?OV-B7J z(q6u&>_d1;4w~xTC=LBnT~%N8*FPU$J!A>WW;28l654k%@GWbCmMtiSnW2p%98C2i`&jKg^Z?TMY7Yvp&p3-=Y> zr$bqwN+lI#JS2ttftP69HI`4#E!Baaq!_S##SrNOrh_*{H#SOh9Tf+bCTXx4Gw6i( zp`wVdlT4{!;l1B?sZTiBfGbhP#j_uhFVt7qVuLrX-vewAL&YPT3Tt z`zsw$H||x`KWXR)LmqAo8J5lZZ`_QQ1`}J)e7)1uXE7YLr*4cMvhJ6WF3HIJh3d@w z{KxyL>soT(4O|Y%_C2-iN=5sc&+y~{GWRxqfu7rrpJDEFyeiP{d;Gkyo{*IM6ov}H z=f0C(l_{nAOTEpl?Hzg^;dA(Ag+4yw1J>}KgS_@T^upRDYlbhJJ-R2l#v#e!|Jp@( N^Tz#~+asDQ^$#4XcNG8t From f6f13f50a2d0b378a1c4e8a17a34237a1464be9b Mon Sep 17 00:00:00 2001 From: "Christoph J. Scherr" Date: Fri, 15 Sep 2023 11:48:34 +0200 Subject: [PATCH 10/26] ensure installed mason plugins --- lua/plex/plugins/lsp/init.lua | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/lua/plex/plugins/lsp/init.lua b/lua/plex/plugins/lsp/init.lua index c27fce8..a2fc277 100644 --- a/lua/plex/plugins/lsp/init.lua +++ b/lua/plex/plugins/lsp/init.lua @@ -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 = { { 'mm', 'Mason', desc = 'Mason' } }, opts = { - ensure_installed = {}, + ensure_installed = { + 'rust-analyzer', + 'clangd', + 'pyright', + 'bash-language-server', + 'codelldb', + }, ui = { border = 'rounded', }, From a3744a35cc10f71a211e1c6e686d4a03596fdc32 Mon Sep 17 00:00:00 2001 From: "Christoph J. Scherr" Date: Fri, 15 Sep 2023 11:49:19 +0200 Subject: [PATCH 11/26] better latex --- lua/plex/plugins/extras/lang/tex.lua | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 lua/plex/plugins/extras/lang/tex.lua diff --git a/lua/plex/plugins/extras/lang/tex.lua b/lua/plex/plugins/extras/lang/tex.lua new file mode 100644 index 0000000..e9b017b --- /dev/null +++ b/lua/plex/plugins/extras/lang/tex.lua @@ -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, + }, + }, + }, + }, + }, +} From ca32d0c0404391df42cfd45da3a0ef167c8cf34a Mon Sep 17 00:00:00 2001 From: "Christoph J. Scherr" Date: Fri, 15 Sep 2023 11:49:26 +0200 Subject: [PATCH 12/26] formatting --- init.lua | 1 + .../plugins/extras/formatting/prettier.lua | 33 ++++++++++++++----- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/init.lua b/init.lua index 27ec17f..1498982 100644 --- a/init.lua +++ b/init.lua @@ -11,6 +11,7 @@ require('lazy').setup(vim.tbl_extend('keep', config.user_lazy_opts(), { { 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' }, diff --git a/lua/plex/plugins/extras/formatting/prettier.lua b/lua/plex/plugins/extras/formatting/prettier.lua index dbbeba8..8f85e74 100644 --- a/lua/plex/plugins/extras/formatting/prettier.lua +++ b/lua/plex/plugins/extras/formatting/prettier.lua @@ -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 = { + { "ff", "Format", 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, }, From fd1fcb1ea5914d16c2699ad6f9b6c6b73bcb408e Mon Sep 17 00:00:00 2001 From: "Christoph J. Scherr" Date: Fri, 15 Sep 2023 15:05:50 +0200 Subject: [PATCH 13/26] change window leap --- lua/plex/plugins/editor.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/plex/plugins/editor.lua b/lua/plex/plugins/editor.lua index c1a0f6e..f0fdf65 100644 --- a/lua/plex/plugins/editor.lua +++ b/lua/plex/plugins/editor.lua @@ -191,7 +191,7 @@ return { keys = { { 'gl', '(leap-forward-to)', mode = { 'n', 'x', 'o' }, desc = 'Leap forward to' }, { 'gL', '(leap-backward-to)', mode = { 'n', 'x', 'o' }, desc = 'Leap backward to' }, - { 'wl', '(leap-from-window)', mode = { 'n', 'x', 'o' }, desc = 'Leap to windows' }, + { 'wgl', '(leap-from-window)', mode = { 'n', 'x', 'o' }, desc = 'Leap to windows' }, }, config = function () local leap = require('leap') From 57f5c52ac5a4521ae798b00a6c500ec06cab3073 Mon Sep 17 00:00:00 2001 From: "Christoph J. Scherr" Date: Fri, 15 Sep 2023 15:05:56 +0200 Subject: [PATCH 14/26] spell --- spell/en.utf-8.add | 1 + spell/en.utf-8.add.spl | Bin 1345 -> 1369 bytes 2 files changed, 1 insertion(+) diff --git a/spell/en.utf-8.add b/spell/en.utf-8.add index 4dd5aa5..4b21cc3 100644 --- a/spell/en.utf-8.add +++ b/spell/en.utf-8.add @@ -96,3 +96,4 @@ serde Skripte mathmatics bbc +Kryptographischen/! diff --git a/spell/en.utf-8.add.spl b/spell/en.utf-8.add.spl index 9bcf5c1cee99df9ba8bcb9fe38a7ed520c780873..0af48993b3a32b7c362347beb053134e653c0bdf 100644 GIT binary patch delta 86 zcmX@eb(4!P%+t5HAT=k)=syDkbN5C*ekLiV^kT*$#ze*f#tg&M%2LkwX>u>i76A3a7sdbp delta 79 zcmV-V0I>hr3c(5vR!L2BaAj<4GXDSo19Y(t4*~)KbCWj$CIOtYUIHuu0dSLx1Bn>{ l?r8yO0&8voWdU>nXaRBoZvk}y0RRH4lPv^y0o#+M1hkZQ7ODUM From de02065e7b6963ca321f33dd69f93ecc4684674f Mon Sep 17 00:00:00 2001 From: "Christoph J. Scherr" Date: Fri, 15 Sep 2023 15:51:35 +0200 Subject: [PATCH 15/26] editor tmux keys leader+w+hjkl --- lua/plex/config/keymaps.lua | 4 ++-- lua/plex/plugins/editor.lua | 8 ++++---- spell/en.utf-8.add | 4 ++++ spell/en.utf-8.add.spl | Bin 1369 -> 1392 bytes 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/lua/plex/config/keymaps.lua b/lua/plex/config/keymaps.lua index 674cba0..d7a5ac9 100644 --- a/lua/plex/config/keymaps.lua +++ b/lua/plex/config/keymaps.lua @@ -344,8 +344,8 @@ map('n', '"', 'vsplit', { desc = 'Split window vertically' }) map('n', 'wb', 'buffer#', { desc = 'Alternate buffer' }) map('n', 'wc', 'close', { desc = 'Close window' }) map('n', 'wd', 'bdelete', { desc = 'Buffer delete' }) -map('n', 'wv', 'split', { desc = 'Split window horizontally' }) -map('n', 'wg', 'vsplit', { desc = 'Split window vertically' }) +map('n', 'w%', 'split', { desc = 'Split window horizontally' }) +map('n', 'w"', 'vsplit', { desc = 'Split window vertically' }) map('n', 'wt', 'tabnew', { desc = 'New tab' }) map('n', 'wtp', 'tabprevious', { desc = 'Previous tab' }) map('n', 'wtn', 'tabnext', { desc = 'Next tab' }) diff --git a/lua/plex/plugins/editor.lua b/lua/plex/plugins/editor.lua index f0fdf65..be6cded 100644 --- a/lua/plex/plugins/editor.lua +++ b/lua/plex/plugins/editor.lua @@ -17,10 +17,10 @@ return { cond = not is_windows, -- stylua: ignore keys = { - { '', 'TmuxNavigateLeft', mode = { 'n', 't' }, silent = true, desc = 'Jump to left pane' }, - { '', 'TmuxNavigateDown', mode = { 'n', 't' }, silent = true, desc = 'Jump to lower pane' }, - { '', 'TmuxNavigateUp', mode = { 'n', 't' }, silent = true, desc = 'Jump to upper pane' }, - { '', 'TmuxNavigateRight', mode = { 'n', 't' }, silent = true, desc = 'Jump to right pane' }, + { 'wh', 'TmuxNavigateLeft', mode = { 'n', 't' }, silent = true, desc = 'Jump to left pane' }, + { 'wj', 'TmuxNavigateDown', mode = { 'n', 't' }, silent = true, desc = 'Jump to lower pane' }, + { 'wk', 'TmuxNavigateUp', mode = { 'n', 't' }, silent = true, desc = 'Jump to upper pane' }, + { 'wl', 'TmuxNavigateRight', mode = { 'n', 't' }, silent = true, desc = 'Jump to right pane' }, }, init = function() vim.g.tmux_navigator_no_mappings = true diff --git a/spell/en.utf-8.add b/spell/en.utf-8.add index 4b21cc3..dc24061 100644 --- a/spell/en.utf-8.add +++ b/spell/en.utf-8.add @@ -97,3 +97,7 @@ Skripte mathmatics bbc Kryptographischen/! +PyO3 +#yo3 +JSON +json diff --git a/spell/en.utf-8.add.spl b/spell/en.utf-8.add.spl index 0af48993b3a32b7c362347beb053134e653c0bdf..4715cd63c7714cd57e3a0f182fd25b167989b80a 100644 GIT binary patch delta 169 zcmcb~^?{2o%+t5HAT=k)=syDk^R$h8FBpZHGK(3D7#SHD%o7>&8S|JJm{=w;#WL=m z9LLnh!km*|Ir%-46&p|iV|@N(P3A<#Nt3&o19&U4fx0po3qTSRCcj|TmEg@}%w)>W zV@zc%VaxzZ<};Q8C7I4n)@3PY{5yFmi!o!; Date: Mon, 18 Sep 2023 13:23:10 +0200 Subject: [PATCH 16/26] better move through windows --- lua/plex/config/keymaps.lua | 4 ++-- lua/plex/plugins/editor.lua | 8 ++++---- spell/en.utf-8.add | 7 +++++++ spell/en.utf-8.add.spl | Bin 1392 -> 1504 bytes 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/lua/plex/config/keymaps.lua b/lua/plex/config/keymaps.lua index d7a5ac9..fb10ef1 100644 --- a/lua/plex/config/keymaps.lua +++ b/lua/plex/config/keymaps.lua @@ -57,10 +57,10 @@ map('n', '', 'lnext', { desc = 'Next Loclist Item' }) map('n', '', 'lprev', { desc = 'Previous Loclist Item' }) -- go to next diagnostics entry -map('n', '', function () +map('n', 'cj', function () vim.diagnostic.goto_next() end, { desc = 'go to next diagnostic'}) -map('n', '', function () +map('n', 'ck', function () vim.diagnostic.goto_prev() end, { desc = 'go to last diagnostic'}) diff --git a/lua/plex/plugins/editor.lua b/lua/plex/plugins/editor.lua index be6cded..f0fdf65 100644 --- a/lua/plex/plugins/editor.lua +++ b/lua/plex/plugins/editor.lua @@ -17,10 +17,10 @@ return { cond = not is_windows, -- stylua: ignore keys = { - { 'wh', 'TmuxNavigateLeft', mode = { 'n', 't' }, silent = true, desc = 'Jump to left pane' }, - { 'wj', 'TmuxNavigateDown', mode = { 'n', 't' }, silent = true, desc = 'Jump to lower pane' }, - { 'wk', 'TmuxNavigateUp', mode = { 'n', 't' }, silent = true, desc = 'Jump to upper pane' }, - { 'wl', 'TmuxNavigateRight', mode = { 'n', 't' }, silent = true, desc = 'Jump to right pane' }, + { '', 'TmuxNavigateLeft', mode = { 'n', 't' }, silent = true, desc = 'Jump to left pane' }, + { '', 'TmuxNavigateDown', mode = { 'n', 't' }, silent = true, desc = 'Jump to lower pane' }, + { '', 'TmuxNavigateUp', mode = { 'n', 't' }, silent = true, desc = 'Jump to upper pane' }, + { '', 'TmuxNavigateRight', mode = { 'n', 't' }, silent = true, desc = 'Jump to right pane' }, }, init = function() vim.g.tmux_navigator_no_mappings = true diff --git a/spell/en.utf-8.add b/spell/en.utf-8.add index dc24061..d997495 100644 --- a/spell/en.utf-8.add +++ b/spell/en.utf-8.add @@ -101,3 +101,10 @@ PyO3 #yo3 JSON json +#yo3 +Verifikationsmechanismus +projektinterne +Theoriephase +weise/! +Weise +merksam diff --git a/spell/en.utf-8.add.spl b/spell/en.utf-8.add.spl index 4715cd63c7714cd57e3a0f182fd25b167989b80a..11b79dafd7b939acc466ba8f5382c4ccd9c39bab 100644 GIT binary patch literal 1504 zcmYjRyKdA_5cP}`A-ZTOQ22svB9W)I1rmv%gdjlF_;KxZ?6n;~ve{JpLWC%{N=3yF zQ1KD@2nre+Iyh&%kt*l}pjRs*MP4=Y>i@LWYr8m!?r$>mC8hoG6%>R|btu@s=< zumSlDpp`VpuIfre9mtOC;RlE1t{o3e%i(4<|L8Pphel5V7)!*iDLM@pxkMMT)uEFG zY6rZg^bfG%Slbm@%zXrp);dBuL*1x!tMh}{`DxkNc;q|9QX|xQ0iyJ7nQ{iy4hIO@ zj8+YssYmYnC@MuetXv>f_`!ZxSQYXs@B`NYz)89aEVY``qeAhit;I>$1%3I<`ATu-P8`B-Vw z!zGeyV3`889NY{18oXgdW&|XGQiSddq&h6F%Jj9-CoQ-?TRwM{! zK}hwoQ8%>>qazrH=|kuUpi=n(pdbVCxZyXYgb!yk$D0zcn#UY4y%YTNmE0hDU{gE1 zcl?A=)-xu)>v_%mCvy#liI=FrC>?NK4(heZ+x7h2DZYDD2P2Ki4h-#}; z`~wvqK$#z*M{v$~BOz<=V;*PDJnnutJ?k1*mgB#k=YQJ`qd0NXG|N8~<*cfki?-|M zi`A9ywY`KAOC}X|PfDyEz8rfcs($235zh-^Q}i&*B{7MUS_<52-X>E&j61mW(!zos zjjg4DJ4h*OxA(anx@@?QwYwB58L!03$h^-1Mc5SZ4W#;6B3X!TL2uz}w;d;Czf@S= z#0gAz2%)sonkPrukppyO;CH~OL3aQiLeH?1xq}rvUV(^ChxoN5>gkT}@>0tgf>+4d za0B8q3%QrVHv?t(29d3uhEBUVq%5t&y78K{IKysI$Wjvrr-@4_;l5N% zVtbb(5nOFuFxWN6iDMSw$B|>-Fuf^U#M_+3VkteII z&}DO&^D@`;f&^q=o=_0%<7R`jW>TCky)J>!Bl;%sb@3o{)2wLlAT9Nwbo9=Mamog9 zesKO?+PH_LLP{JtSr(v{gBs3XSo5J7)7nSc$bFbgR#L`fAiHx-n3_J!G3Z4FFwQUM zgtq!C1&`rbhLA?k+lvNxggeh Date: Wed, 20 Sep 2023 09:31:37 +0200 Subject: [PATCH 17/26] better nvim logo design --- lua/plex/plugins/extras/ui/dashboard.lua | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lua/plex/plugins/extras/ui/dashboard.lua b/lua/plex/plugins/extras/ui/dashboard.lua index 49601fa..f2c746c 100644 --- a/lua/plex/plugins/extras/ui/dashboard.lua +++ b/lua/plex/plugins/extras/ui/dashboard.lua @@ -2,16 +2,16 @@ local function get_header() -- see https://github.com/MaximilianLloyd/ascii.nvim return { -- The following is a customized version! - [[ ]], - [[ ██ ]], - [[ █ ███████ █████ ██ ]], - [[ ███ █████ █████  ]], - [[ █████ ███ ███████████████████ ███ ███████████ ]], - [[ ██ ██ █ ███ █████████████ █████ ██████████████ ]], - [[ ████ ████ ██████████ █████████ █████ █████ ████ █████ ]], - [[ ██████ ██ ███ ███ █████████ █████ █████ ████ █████ ]], - [[ ████████  ██████████████████ ████ █████ █████ ████ ██████ ]], - [[ ]], + [[ ]], + [[ ]], + [[ █ ████████ █████ ███████ ████ ]], + [[ ███ ██████ █████ █████████ ██████ ]], + [[ █████ ██████████████████████ ████ ███████████████ ]], + [[ ██ ██ █████ █████████████ ████ ████████████████ ]], + [[ ████ ███████████████ █████████ ████ █████ ██████ ████ ]], + [[ ██████ ██████ ███ █████████ ████ █████ █████ ████ ]], + [[ ████████ ███████████████████ ████ ████ █████ ████ ████ ]], + [[ ]], } end From cc254a40022fdc405517b959767c0829bc7cd836 Mon Sep 17 00:00:00 2001 From: "Christoph J. Scherr" Date: Thu, 21 Sep 2023 12:48:00 +0200 Subject: [PATCH 18/26] disable hotkeys for disabled plugins --- lua/plex/plugins/telescope.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lua/plex/plugins/telescope.lua b/lua/plex/plugins/telescope.lua index ca66875..ecf1545 100644 --- a/lua/plex/plugins/telescope.lua +++ b/lua/plex/plugins/telescope.lua @@ -243,8 +243,8 @@ return { -- Plugins { 'n', plugin_directories, desc = 'Plugins' }, - { 'k', 'Telescope thesaurus lookup', desc = 'Thesaurus' }, - { 'w', 'ZkNotes', desc = 'Zk notes' }, + -- { 'k', 'Telescope thesaurus lookup', desc = 'Thesaurus' }, + -- { 'w', 'ZkNotes', desc = 'Zk notes' }, { 'z', From 898838e61a7d672d605723f14857288d7607fc09 Mon Sep 17 00:00:00 2001 From: "Christoph J. Scherr" Date: Thu, 21 Sep 2023 12:48:10 +0200 Subject: [PATCH 19/26] spell --- spell/en.utf-8.add | 17 +++++++++++++++++ spell/en.utf-8.add.spl | Bin 1504 -> 1711 bytes 2 files changed, 17 insertions(+) diff --git a/spell/en.utf-8.add b/spell/en.utf-8.add index d997495..8d4435b 100644 --- a/spell/en.utf-8.add +++ b/spell/en.utf-8.add @@ -108,3 +108,20 @@ Theoriephase weise/! Weise merksam +Syscall +Enum +deu +JS +JS +getElementById +MDN +WebDocs +src +txt +ERRNO +vvvv +Rustonomicon +Rustdoc +paragraph +rustc +Klabnik diff --git a/spell/en.utf-8.add.spl b/spell/en.utf-8.add.spl index 11b79dafd7b939acc466ba8f5382c4ccd9c39bab..7722a966213474fa1e92656509548c793ada8c52 100644 GIT binary patch delta 955 zcmYjQJ#W-N5ZxI&icm;|(1jurL3{`~Ko!X8A`~DYClsUrL5NTwA)meRS?9Bj&%S&# zG!(R95e;ynNCgEAQW{!{h(8f21qD9>-t48|R^A=Yy_xrB#(OySZG7VC%4#pyNizFa zDfjvA#D`I*M@o6s?$`N+(I8CHqTFJ5_JWXlB!*AN)<7&RzPhGL&PJCCN-Zig<8-g? zB;Ar?xH?0iCjkWjG#SB4@O1H{R8ot!fkcu)Xfj%+cjh}?rGYu5$@!lp$2}XT8a}g| zQOb&4r=1j(!QUqzv65FcH0+iYLF=(O$1~IL9%!oqylbW7huVqKawzn`wE5E9LI4%O zd0j_|ggI<`DHR++xRmb!pJBl~N^B!|%KYG|#rFlY+t@*H+@OfFT!4GIEzNdqqc`Fw zS+Na~K1Fu77_V(y=RC^1?9^+oGcGES1hhkKTMn(6+-bfV44XxY{|I^MwnS18iXy9N z&>5bM099q^X^bSm)Uz>PZ?ro(>{~@yZEk~HdhX+2&P&1E7fAso1p7;3XYCgNC0H_5 z`gF1bF)@i?+Baw2>D%jx*b5bh(saHPQ_P(dL8TR**+9-Cu=U{;h5}QODS+jz*>Nu{ zqmTf8$)p;IquX0jn#Bh=hrKRXX;w1h7|}Vhi*nkxP4!Ci%bjvq_swtj+KZzK!AR!y zS(9?&O>V{93K5w?2Rs*#vwoCGX~ypqXrxi3O4ia^oA=0a+>Dh{Z%!;XS5_Z9db}PP zf8@+eZIPOEm+CZ2H?Y7~yN-`l&N&F&q$k+r&3qoIJ*(LnUwO#7qL&D?SECl$I+s9g eYpluLXd#JxJ1t*g3GDxOV+nU-#ik9RNvVIdhQ68r delta 794 zcmXw1zi-n}5Po+~6d^=~0&3Ju2q8!XU79v30}?+Pp(3?KfS4F?>=)azW2g3W(y-)j zu%4KZr%avNKY)pie;^}bL<}rQhz;(Z(^#?ZefQ)0?(Usm`+jxp?ZII-mQl3*PYCO8 zvGxfuD=r>x)*UxerwBqU92YWR!-kbrvLzYoNqrZdTNsV>39Mto(+k)Kt$)D%$7L4+ zQ1rJUf)J9b$`^$}1}P`+*#yQYu!eq0W(pIE4OUL62e^65u Date: Thu, 21 Sep 2023 15:58:30 +0200 Subject: [PATCH 20/26] tried to do debug things --- init.lua | 2 + lua/plex/plugins/coding.lua | 81 +++++++++++++++----- lua/plex/plugins/extras/lang/cpp.lua | 74 ++++++++++++++++++ lua/plex/plugins/extras/lang/rust.lua | 42 ++++++++++ lua/plex/plugins/extras/lang/typescript.lua | 6 +- spell/en.utf-8.add | 21 +++++ spell/en.utf-8.add.spl | Bin 1711 -> 1914 bytes 7 files changed, 202 insertions(+), 24 deletions(-) create mode 100644 lua/plex/plugins/extras/lang/cpp.lua create mode 100644 lua/plex/plugins/extras/lang/rust.lua diff --git a/init.lua b/init.lua index 1498982..7d76f98 100644 --- a/init.lua +++ b/init.lua @@ -15,6 +15,8 @@ require('lazy').setup(vim.tbl_extend('keep', config.user_lazy_opts(), { { import = 'plex.plugins.extras.editor' }, { import = 'plex.plugins.extras.org' }, { import = 'plex.plugins.extras.lang.go' }, + { import = 'plex.plugins.extras.lang.cpp' }, + { import = 'plex.plugins.extras.lang.rust' }, { import = 'plex.plugins.extras.lang.json' }, { import = 'plex.plugins.extras.lang.python' }, { import = 'plex.plugins.extras.lang.yaml' }, diff --git a/lua/plex/plugins/coding.lua b/lua/plex/plugins/coding.lua index b534fa6..9afb160 100644 --- a/lua/plex/plugins/coding.lua +++ b/lua/plex/plugins/coding.lua @@ -44,11 +44,11 @@ return { }, sources = cmp.config.sources({ { name = 'nvim_lsp', priority = 50 }, - { name = 'path', priority = 40 }, - { name = 'luasnip', priority = 30 }, + { name = 'path', priority = 40 }, + { name = 'luasnip', priority = 30 }, }, { { name = 'buffer', priority = 50, keyword_length = 3 }, - { name = 'emoji', insert = true, priority = 20 }, + { name = 'emoji', insert = true, priority = 20 }, { name = 'tmux', priority = 10, @@ -135,7 +135,7 @@ return { dependencies = { 'rafamadriz/friendly-snippets' }, build = (not jit.os:find('Windows')) and "echo 'jsregexp is optional, so not a big deal if it fails to build'; make install_jsregexp" - or nil, + or nil, -- stylua: ignore keys = { { @@ -205,12 +205,12 @@ return { 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', '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.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) @@ -220,12 +220,12 @@ return { end, opts = { mappings = { - add = 'sa', -- Add surrounding in Normal and Visual modes - delete = 'sd', -- Delete surrounding - find = 'sf', -- Find surrounding (to the right) - find_left = 'sF', -- Find surrounding (to the left) - highlight = 'sh', -- Highlight surrounding - replace = 'cs', -- Replace surrounding + add = 'sa', -- Add surrounding in Normal and Visual modes + delete = 'sd', -- Delete surrounding + find = 'sf', -- Find surrounding (to the right) + find_left = 'sF', -- Find surrounding (to the left) + highlight = 'sh', -- Highlight surrounding + replace = 'cs', -- Replace surrounding update_n_lines = 'su', -- Update `n_lines` }, }, @@ -238,13 +238,13 @@ return { dependencies = { 'JoosepAlviste/nvim-ts-context-commentstring' }, keys = { { 'v', 'gcc', remap = true, silent = true, mode = 'n' }, - { 'v', 'gc', remap = true, silent = true, mode = 'x' }, + { 'v', 'gc', remap = true, silent = true, mode = 'x' }, }, opts = { options = { custom_commentstring = function() return require('ts_context_commentstring.internal').calculate_commentstring() - or vim.bo.commentstring + or vim.bo.commentstring end, }, }, @@ -304,9 +304,9 @@ return { 'AndrewRadev/linediff.vim', cmd = { 'Linediff', 'LinediffAdd' }, keys = { - { 'mdf', ':Linediff', mode = 'x', desc = 'Line diff' }, - { 'mda', ':LinediffAdd', mode = 'x', desc = 'Line diff add' }, - { 'mds', 'LinediffShow', desc = 'Line diff show' }, + { 'mdf', ':Linediff', mode = 'x', desc = 'Line diff' }, + { 'mda', ':LinediffAdd', mode = 'x', desc = 'Line diff add' }, + { 'mds', 'LinediffShow', desc = 'Line diff show' }, { 'mdr', 'LinediffReset', desc = 'Line diff reset' }, }, }, @@ -323,4 +323,43 @@ return { vim.g.dsf_no_mappings = 1 end, }, + + ----------------------------------------------------------------------------- + { + -- TODO: + -- make debugging for C. Cpp, Rust, Python work + 'mfussenegger/nvim-dap', + keys = { + { + 'db', + 'lua require\'dap\'.toggle_breakpoint()', + mode = { 'n', 'x' }, + desc = 'Debugging: Toggle breakpoint', + }, + { + 'db', + 'lua require\'dap\'.continue()', + mode = { 'n', 'x' }, + desc = 'Debugging: Start or continue debug session', + }, + { + 'dsi', + 'lua require\'dap\'.step_into()', + mode = { 'n', 'x' }, + desc = 'Debugging: Step into code', + }, + { + 'dso', + 'lua require\'dap\'.step_over()', + mode = { 'n', 'x' }, + desc = 'Debugging: Step over code', + }, + { + 'dm', + 'lua require\'dap\'.repl.open()', + mode = { 'n', 'x' }, + desc = 'Debugging: Menu', + }, + }, + }, } diff --git a/lua/plex/plugins/extras/lang/cpp.lua b/lua/plex/plugins/extras/lang/cpp.lua new file mode 100644 index 0000000..33cc8be --- /dev/null +++ b/lua/plex/plugins/extras/lang/cpp.lua @@ -0,0 +1,74 @@ +return { + { + 'mfussenegger/nvim-dap', + optional = true, + dependencies = { + 'mfussenegger/nvim-dap-python', + }, + -- stylua: ignore + -- keys = { + -- { 'dPt', function() require('dap-python').test_method() end, desc = 'Debug Method' }, + -- { 'dPc', function() require('dap-python').test_class() end, desc = 'Debug Class' }, + -- }, + config = function() + local dap = require('dap') + dap.adapters.lldb = { + type = 'executable', + command = '/usr/bin/lldb-vscode', -- adjust as needed, must be absolute path + name = 'lldb' + } + dap.configurations.c= { + { + name = 'Launch', + type = 'lldb', + request = 'launch', + program = function() + return vim.fn.input('Path to executable: ', vim.fn.getcwd() .. '/', 'file') + end, + cwd = '${workspaceFolder}', + stopOnEntry = false, + args = {}, + + -- 💀 + -- if you change `runInTerminal` to true, you might need to change the yama/ptrace_scope setting: + -- + -- echo 0 | sudo tee /proc/sys/kernel/yama/ptrace_scope + -- + -- Otherwise you might get the following error: + -- + -- Error on launch: Failed to attach to the target process + -- + -- But you should be aware of the implications: + -- https://www.kernel.org/doc/html/latest/admin-guide/LSM/Yama.html + -- runInTerminal = false, + }, + } + dap.configurations.cpp = { + { + name = 'Launch', + type = 'lldb', + request = 'launch', + program = function() + return vim.fn.input('Path to executable: ', vim.fn.getcwd() .. '/', 'file') + end, + cwd = '${workspaceFolder}', + stopOnEntry = false, + args = {}, + + -- 💀 + -- if you change `runInTerminal` to true, you might need to change the yama/ptrace_scope setting: + -- + -- echo 0 | sudo tee /proc/sys/kernel/yama/ptrace_scope + -- + -- Otherwise you might get the following error: + -- + -- Error on launch: Failed to attach to the target process + -- + -- But you should be aware of the implications: + -- https://www.kernel.org/doc/html/latest/admin-guide/LSM/Yama.html + -- runInTerminal = false, + }, + } + end, + }, +} diff --git a/lua/plex/plugins/extras/lang/rust.lua b/lua/plex/plugins/extras/lang/rust.lua new file mode 100644 index 0000000..d3cb0f9 --- /dev/null +++ b/lua/plex/plugins/extras/lang/rust.lua @@ -0,0 +1,42 @@ +return { + { + 'mfussenegger/nvim-dap', + optional = true, + dependencies = { + 'mfussenegger/nvim-dap-python', + }, + -- stylua: ignore + -- keys = { + -- { 'dPt', function() require('dap-python').test_method() end, desc = 'Debug Method' }, + -- { 'dPc', function() require('dap-python').test_class() end, desc = 'Debug Class' }, + -- }, + config = function() + local dap = require('dap') + dap.configurations.rust = { + { + -- ... the previous config goes here ..., + initCommands = function() + -- Find out where to look for the pretty printer Python module + local rustc_sysroot = vim.fn.trim(vim.fn.system('rustc --print sysroot')) + + local script_import = 'command script import "' .. rustc_sysroot .. '/lib/rustlib/etc/lldb_lookup.py"' + local commands_file = rustc_sysroot .. '/lib/rustlib/etc/lldb_commands' + + local commands = {} + local file = io.open(commands_file, 'r') + if file then + for line in file:lines() do + table.insert(commands, line) + end + file:close() + end + table.insert(commands, 1, script_import) + + return commands + end, + -- ..., + } + } + end, + }, +} diff --git a/lua/plex/plugins/extras/lang/typescript.lua b/lua/plex/plugins/extras/lang/typescript.lua index 8cdd7aa..6415499 100644 --- a/lua/plex/plugins/extras/lang/typescript.lua +++ b/lua/plex/plugins/extras/lang/typescript.lua @@ -25,7 +25,7 @@ return { -- stylua: ignore keys = { { 'co', 'TypescriptOrganizeImports', desc = 'Organize Imports' }, - { 'cR', 'TypescriptRenameFile', desc = 'Rename File' }, + { 'cR', 'TypescriptRenameFile', desc = 'Rename File' }, }, settings = { ---@diagnostic disable: missing-fields @@ -93,8 +93,8 @@ return { -- 💀 Make sure to update this path to point to your installation args = { require('mason-registry') - .get_package('js-debug-adapter') - :get_install_path() .. '/js-debug/src/dapDebugServer.js', + .get_package('js-debug-adapter') + :get_install_path() .. '/js-debug/src/dapDebugServer.js', '${port}', }, }, diff --git a/spell/en.utf-8.add b/spell/en.utf-8.add index 8d4435b..912416b 100644 --- a/spell/en.utf-8.add +++ b/spell/en.utf-8.add @@ -125,3 +125,24 @@ Rustdoc paragraph rustc Klabnik +io +rustbook +Deserialize +deserialisierbaren +SIGTERM +Beendigungsabfrage +SIGKILL +stdout +stderr +Leveln +gedroppt +#ekonstruktor +Dekonstruktor/! +dealloziiert +Dealloziierung +Dealloziieren +vvvv +TODO +vvvv +Structs +nomicon diff --git a/spell/en.utf-8.add.spl b/spell/en.utf-8.add.spl index 7722a966213474fa1e92656509548c793ada8c52..21d15025972eb821535fa66984f17dbd85c240e5 100644 GIT binary patch literal 1914 zcmYjSyN(=16s>!ERtSl}vNnOh5y6OvUE8aUkT7a?i2G5~)9%-7Kjz^8Ik7~7 z`~k=xVOhu@!58=g03k%+yv%f#T7*@WnPv1E=`{TnT&2qme zmgVEBZrW~j*$?Bi-t3-4t{)|lOqSB(?WD$Yz^}x+71b#9wTN@`OcRgu5t^mscI2Uv zV^_$8RRL)tsVt<&yP!twrIQL4o$VG;k`2%tp-~#b%AU2|?{UhD`lA!R?)YWcpB^RE zz>{eWb~Uh`z`7LZM>sz7l#OJ7MO;AM8qXfAD%{lpS8q}sMhO5)C0s=m9BPWqs|k`G zTVk~^SphBS?}Vej_kj_!{Vw0V5|zErk2QH#vele!HL_9${Z+{@%ySBRI9`Te zgQrHmrKp4HnViZU{IK8OHl2`#3Jx%6^3kZ}V2oXysLqf-K+K|LO&@z%BW}jJVqK*c zO?h3ymlZG6g2o9pEX?7GK5qN1g$fH6cii&oOCW{Z)B)q=7$v!nigpb9Tde#QKrDi) z^e!G0W!M0pK?c%`EP%|L$kC;{cpO@kQGs|_JOJ0>2i>?f5B0}nmiTV8JV5=gLc0y* z?$;iuMrofxScX8q4RLV?s9AmwtPj>SOr8x#N!|53bGf*39OrZ9Y^!Lm{yH$G-dQrk z9js|Kc8WjCkawfXZ-DG$EZHlpBOY7lU9j}z_fGo>DjC{tX##oap~6;V$E+YDYG^c2 ziFfdJIYFJ9NsCKpZRJEh<-z;}JFDq^C{JyZm@v4bII5F1V65vPH@SJv2^;avbG6tg?;vC3d>#N&GAmmnt1))a`HSvH8( zs{;tzh+~I6!WcOWR7gM05m<(nDc|7DdR$UI->F}l(E^4Qj2NgeSvgHOBlvw_!!<^F zf>ShHb2LPMZZs`52h#-;IiI3~Q5&$xnVMopV3EfB(Vx z#aCZ{^8>THmWSYv$&L2BFW(aD_;Yz6U;KZ<9N&hFlDp>7BRsjwwBBL4g&F%K99n`u vd8mGpOW;^d9`hqM$~|y3w#OWTDKKq!lf6Gem$h;|RPUkR&h3^QoSpj@--B@I delta 912 zcmXX^zi-n(6!v=;%77Y`iUJBlk@#g61cg?SP%0!8R8SbQ&;=nm_9e06*w)2vS{4>0 z=5mM$GG#(YjFk`r3q$_|MwAip53s=Z&Xwi!ySwjw@B5zL-};y3`m@JRC%I0Njenk3 zdwy7NpQV5%RM3!OiikYVKYY`^t|k(dd!)(WBA^881h4E%N(I;)*cM&f&h_aqN>Wqo zGY;or1e^o`=v*|DNXyxlMy_Oz!QwdP*3z9u2khLhNHdDq;}xajL?vVUhb~-N8z4Qw zJI0$rYmW{f1w=Eu&h3ZqVyWy$!fa401|%Z`8fKkRNL#c)_wY!@U3Xns8Uf}c{;;3< z+NyEdG~D)_I@-0rc>QKdyo!R-BoG{H5QtRj7AlCe8l*+#<=Aejt81;W^6HP3C-pY5 z%x$X9cf3X7s&OMwfi9dIaRz{&ayFIVy+IXsGz%+f^8shMT+MUm-s$bzpX%0fKf_~f&B>>`zy7on_{c2VO=c-s`^^niqFj8=gxca3>sunTD<_)m$Og}?xm;E}&hAL9|k#3XL$ zs6ZrRVYr_uogu03X2X|0&~74YtK>-J^Me=zGD-oLK{b#jSk4EKQO#(8(;n{KSiH60 zPF;SqW8g7#vkUfSqV#ZIT)T`AUuSiJInnH4UXZIHZs<(Wk!!SH*c(ebU2jn$3oQN~ vYw}b) Date: Thu, 21 Sep 2023 17:30:16 +0200 Subject: [PATCH 21/26] dbg shit but does something --- init.lua | 3 +- lua/plex/plugins/extras/lang/cpp.lua | 86 ++++++++++++--------------- lua/plex/plugins/extras/lang/rust.lua | 42 ------------- 3 files changed, 39 insertions(+), 92 deletions(-) delete mode 100644 lua/plex/plugins/extras/lang/rust.lua diff --git a/init.lua b/init.lua index 7d76f98..e0efbb4 100644 --- a/init.lua +++ b/init.lua @@ -15,8 +15,7 @@ require('lazy').setup(vim.tbl_extend('keep', config.user_lazy_opts(), { { import = 'plex.plugins.extras.editor' }, { import = 'plex.plugins.extras.org' }, { import = 'plex.plugins.extras.lang.go' }, - { import = 'plex.plugins.extras.lang.cpp' }, - { import = 'plex.plugins.extras.lang.rust' }, + { import = 'plex.plugins.extras.lang.cpp' }, -- also does C and rust { import = 'plex.plugins.extras.lang.json' }, { import = 'plex.plugins.extras.lang.python' }, { import = 'plex.plugins.extras.lang.yaml' }, diff --git a/lua/plex/plugins/extras/lang/cpp.lua b/lua/plex/plugins/extras/lang/cpp.lua index 33cc8be..c77cc1d 100644 --- a/lua/plex/plugins/extras/lang/cpp.lua +++ b/lua/plex/plugins/extras/lang/cpp.lua @@ -1,7 +1,7 @@ return { { 'mfussenegger/nvim-dap', - optional = true, + -- optional = true, dependencies = { 'mfussenegger/nvim-dap-python', }, @@ -10,65 +10,55 @@ return { -- { 'dPt', function() require('dap-python').test_method() end, desc = 'Debug Method' }, -- { 'dPc', function() require('dap-python').test_class() end, desc = 'Debug Class' }, -- }, - config = function() + opts = function() local dap = require('dap') - dap.adapters.lldb = { + dap.adapters.cppdbg = { + id = 'cppdbg', type = 'executable', - command = '/usr/bin/lldb-vscode', -- adjust as needed, must be absolute path - name = 'lldb' - } - dap.configurations.c= { - { - name = 'Launch', - type = 'lldb', - request = 'launch', - program = function() - return vim.fn.input('Path to executable: ', vim.fn.getcwd() .. '/', 'file') - end, - cwd = '${workspaceFolder}', - stopOnEntry = false, - args = {}, - - -- 💀 - -- if you change `runInTerminal` to true, you might need to change the yama/ptrace_scope setting: - -- - -- echo 0 | sudo tee /proc/sys/kernel/yama/ptrace_scope - -- - -- Otherwise you might get the following error: - -- - -- Error on launch: Failed to attach to the target process - -- - -- But you should be aware of the implications: - -- https://www.kernel.org/doc/html/latest/admin-guide/LSM/Yama.html - -- runInTerminal = false, - }, + command = '/home/cscherr/.local/share/nvim/nvim-dap/debuggers/cpptools/extension/debugAdapters/bin/OpenDebugAD7', } dap.configurations.cpp = { { - name = 'Launch', - type = 'lldb', - request = 'launch', + name = "Launch file", + type = "cppdbg", + request = "launch", program = function() return vim.fn.input('Path to executable: ', vim.fn.getcwd() .. '/', 'file') end, cwd = '${workspaceFolder}', - stopOnEntry = false, - args = {}, + stopAtEntry = true, + setupCommands = { + { + text = '-enable-pretty-printing', + description = 'enable pretty printing', + ignoreFailures = false + }, + }, + + }, + { + name = 'Attach to gdbserver :1234', + type = 'cppdbg', + request = 'launch', + MIMode = 'gdb', + miDebuggerServerAddress = 'localhost:1234', + miDebuggerPath = '/usr/bin/gdb', + cwd = '${workspaceFolder}', + program = function() + return vim.fn.input('Path to executable: ', vim.fn.getcwd() .. '/', 'file') + end, + setupCommands = { + { + text = '-enable-pretty-printing', + description = 'enable pretty printing', + ignoreFailures = false + }, + }, - -- 💀 - -- if you change `runInTerminal` to true, you might need to change the yama/ptrace_scope setting: - -- - -- echo 0 | sudo tee /proc/sys/kernel/yama/ptrace_scope - -- - -- Otherwise you might get the following error: - -- - -- Error on launch: Failed to attach to the target process - -- - -- But you should be aware of the implications: - -- https://www.kernel.org/doc/html/latest/admin-guide/LSM/Yama.html - -- runInTerminal = false, }, } + dap.configurations.c = dap.configurations.cpp + dap.configurations.rust = dap.configurations.cpp end, }, } diff --git a/lua/plex/plugins/extras/lang/rust.lua b/lua/plex/plugins/extras/lang/rust.lua deleted file mode 100644 index d3cb0f9..0000000 --- a/lua/plex/plugins/extras/lang/rust.lua +++ /dev/null @@ -1,42 +0,0 @@ -return { - { - 'mfussenegger/nvim-dap', - optional = true, - dependencies = { - 'mfussenegger/nvim-dap-python', - }, - -- stylua: ignore - -- keys = { - -- { 'dPt', function() require('dap-python').test_method() end, desc = 'Debug Method' }, - -- { 'dPc', function() require('dap-python').test_class() end, desc = 'Debug Class' }, - -- }, - config = function() - local dap = require('dap') - dap.configurations.rust = { - { - -- ... the previous config goes here ..., - initCommands = function() - -- Find out where to look for the pretty printer Python module - local rustc_sysroot = vim.fn.trim(vim.fn.system('rustc --print sysroot')) - - local script_import = 'command script import "' .. rustc_sysroot .. '/lib/rustlib/etc/lldb_lookup.py"' - local commands_file = rustc_sysroot .. '/lib/rustlib/etc/lldb_commands' - - local commands = {} - local file = io.open(commands_file, 'r') - if file then - for line in file:lines() do - table.insert(commands, line) - end - file:close() - end - table.insert(commands, 1, script_import) - - return commands - end, - -- ..., - } - } - end, - }, -} From 7acbe5078b2c6c3081205e0606ee5c783f57793b Mon Sep 17 00:00:00 2001 From: "Christoph J. Scherr" Date: Thu, 21 Sep 2023 17:42:08 +0200 Subject: [PATCH 22/26] dbg for c actually works --- lua/plex/plugins/coding.lua | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/lua/plex/plugins/coding.lua b/lua/plex/plugins/coding.lua index 9afb160..164823c 100644 --- a/lua/plex/plugins/coding.lua +++ b/lua/plex/plugins/coding.lua @@ -337,7 +337,7 @@ return { desc = 'Debugging: Toggle breakpoint', }, { - 'db', + 'dc', 'lua require\'dap\'.continue()', mode = { 'n', 'x' }, desc = 'Debugging: Start or continue debug session', @@ -355,10 +355,30 @@ return { desc = 'Debugging: Step over code', }, { - 'dm', + 'dr', 'lua require\'dap\'.repl.open()', mode = { 'n', 'x' }, - desc = 'Debugging: Menu', + desc = 'Debugging: repl Menu', + }, + { + 'dms', + function() + local widgets = require('dap.ui.widgets') + local my_sidebar = widgets.sidebar(widgets.scopes) + my_sidebar.open() + end, + mode = { 'n', 'x' }, + desc = 'Debugging: Menu scopes', + }, + { + 'dmf', + function() + local widgets = require('dap.ui.widgets') + local my_sidebar = widgets.sidebar(widgets.frames) + my_sidebar.open() + end, + mode = { 'n', 'x' }, + desc = 'Debugging: Menu frames', }, }, }, From a757636e380589d3ba0022d54edbd3bf65818cf4 Mon Sep 17 00:00:00 2001 From: "Christoph J. Scherr" Date: Fri, 22 Sep 2023 13:08:16 +0200 Subject: [PATCH 23/26] colorscheme things --- lua/plex/config/init.lua | 2 +- lua/plex/plugins/colorscheme.lua | 26 +++++++------------------- spell/en.utf-8.add | 7 +++++++ spell/en.utf-8.add.spl | Bin 1914 -> 2006 bytes 4 files changed, 15 insertions(+), 20 deletions(-) diff --git a/lua/plex/config/init.lua b/lua/plex/config/init.lua index 843880a..b0b1f87 100644 --- a/lua/plex/config/init.lua +++ b/lua/plex/config/init.lua @@ -25,7 +25,7 @@ local defaults = { -- String like `habamax` or a function that will load the colorscheme. -- Disabled by default to allow theme-loader.nvim to manage the colorscheme. ---@type string|fun() - colorscheme = '', + colorscheme = 'kanagawa', features = { elite_mode = true, diff --git a/lua/plex/plugins/colorscheme.lua b/lua/plex/plugins/colorscheme.lua index 5ae495f..defed97 100644 --- a/lua/plex/plugins/colorscheme.lua +++ b/lua/plex/plugins/colorscheme.lua @@ -1,15 +1,4 @@ --- Plugins: Colorschemes --- https://github.com/rafi/vim-config - return { - - { - 'rafi/theme-loader.nvim', - lazy = false, - priority = 99, - opts = { initial_colorscheme = 'kanagawa' }, - }, - { 'rafi/neo-hybrid.vim', priority = 100, lazy = false }, { 'rafi/awesome-vim-colorschemes', lazy = false }, { 'AlexvZyl/nordic.nvim' }, @@ -24,7 +13,7 @@ return { lazy = true, name = 'catppuccin', opts = { - flavour = 'mocha', -- latte, frappe, macchiato, mocha + flavour = 'latte', -- latte, frappe, macchiato, mocha dim_inactive = { enabled = false }, integrations = { alpha = true, @@ -72,15 +61,15 @@ return { }, { 'rebelot/kanagawa.nvim', - lazy = true, + lazy = false, name = 'kanagawa', config = function() require('kanagawa').setup({ - compile = false, -- enable compiling the colorscheme + compile = true, -- enable compiling the colorscheme undercurl = true, -- enable undercurls - commentStyle = { italic = true }, + commentStyle = { italic = false }, functionStyle = {}, - keywordStyle = { italic = true}, + keywordStyle = { bold = true }, statementStyle = { bold = true }, typeStyle = {}, transparent = false, -- do not set background color @@ -93,13 +82,12 @@ return { overrides = function(colors) -- add/modify highlights return {} end, - theme = "wave", -- Load "wave" theme when 'background' option is not set + theme = "dragon", -- Load "wave" theme when 'background' option is not set background = { -- map the value of 'background' option to a theme - dark = "wave", -- try "dragon" ! + dark = "wave", -- try "dragon" ! light = "lotus" }, }) - end }, } diff --git a/spell/en.utf-8.add b/spell/en.utf-8.add index 912416b..025978e 100644 --- a/spell/en.utf-8.add +++ b/spell/en.utf-8.add @@ -146,3 +146,10 @@ TODO vvvv Structs nomicon +Wrapperklasse +tx +rx +struct +enum +priorisierbar +仕方がない diff --git a/spell/en.utf-8.add.spl b/spell/en.utf-8.add.spl index 21d15025972eb821535fa66984f17dbd85c240e5..359e8365b987c5e55f11358b6c236c23faade52f 100644 GIT binary patch literal 2006 zcmYjSJC7Vi5bmnk6G9?5Sr#u9O78*8PL5XP1`glz-}L^zM$+41zw?9F2zj%*28 z4iItzDRM$UY$Kuj3;YCUAP2}1+GqpJ_to49wAz{OuBxx=@m0-NC%4*#58>#Qb9+Z` z#z~s_X+A6NmSJAii_@m<`sHeK@6X6Joy3yLOe(yc1Uy^(3cM>(jS?S3oExVadz^RB zEF`ld4~-1FTzaf>NMlK4Dh=K_H6~taDPd9DZW_gD3(XE1g&{2L8SH+KQ(n~U9rAU> z&xZZcUR<_3>6h>>0P7yC3xR%w<7=L>jvin!$sw=I&jwzVxT^-PUZOgTVgM9MxIh#f zYJ$zv9+C!IVpT9%07CC0nw97XiWcx=|5}=bs_E7Wya=LhV>gLaN2nh{9YwRi z7#mq4Z{{`jTItcllu$6SPm7%V|^4voZ|+j8CO3^2axeRat!J!9=i%e%8@b42;ge`pnDuFMtu;E zVqbSw38?>-YrTTp{n}jkw@o1|hE%^CGUIkovkLFX5V9I358J&s)Xm0%&d)=~`IuE( zD;li1NR6r2R!$3hOIEYB6Z}a;<_0|9*Mk1CKPV-A652kFlu(>zbQCiM47ratF;W=R|0VBQ{YLDkv!Yx;_(9Y4s||(`n;?d|KJRGsDH%hG zqed>UXuFs`(|2}-yecKvl5txr?gE4s`)-bRf#6^hC?BXYts`IK=;6>)EUui+#@s^E+gNdu>Y(yDKz2W;MW5uKM$U{ zzf;(F^q=knf@6*uDG?8AIC|8=4-O^yrc->LNNVC!C_fc)CO^mv`B8q8KjeXYXU|{k z$=knm&OLhl#?6ykw?F&*Yf@t=cW?zh3Ml3c`2r~J;6u47AN_xL9bATtlB<@8FY)9q z)v&>G4Kp_2aA@p!_m28rPJv^DKH&GUlk0HZczeM4ngG*wmpD{9=#pp`^ZGg(`NVF? I;Ini80@Q$p6aWAK literal 1914 zcmYjSyN(=16s>!ERtSl}vNnOh5y6OvUE8aUkT7a?i2G5~)9%-7Kjz^8Ik7~7 z`~k=xVOhu@!58=g03k%+yv%f#T7*@WnPv1E=`{TnT&2qme zmgVEBZrW~j*$?Bi-t3-4t{)|lOqSB(?WD$Yz^}x+71b#9wTN@`OcRgu5t^mscI2Uv zV^_$8RRL)tsVt<&yP!twrIQL4o$VG;k`2%tp-~#b%AU2|?{UhD`lA!R?)YWcpB^RE zz>{eWb~Uh`z`7LZM>sz7l#OJ7MO;AM8qXfAD%{lpS8q}sMhO5)C0s=m9BPWqs|k`G zTVk~^SphBS?}Vej_kj_!{Vw0V5|zErk2QH#vele!HL_9${Z+{@%ySBRI9`Te zgQrHmrKp4HnViZU{IK8OHl2`#3Jx%6^3kZ}V2oXysLqf-K+K|LO&@z%BW}jJVqK*c zO?h3ymlZG6g2o9pEX?7GK5qN1g$fH6cii&oOCW{Z)B)q=7$v!nigpb9Tde#QKrDi) z^e!G0W!M0pK?c%`EP%|L$kC;{cpO@kQGs|_JOJ0>2i>?f5B0}nmiTV8JV5=gLc0y* z?$;iuMrofxScX8q4RLV?s9AmwtPj>SOr8x#N!|53bGf*39OrZ9Y^!Lm{yH$G-dQrk z9js|Kc8WjCkawfXZ-DG$EZHlpBOY7lU9j}z_fGo>DjC{tX##oap~6;V$E+YDYG^c2 ziFfdJIYFJ9NsCKpZRJEh<-z;}JFDq^C{JyZm@v4bII5F1V65vPH@SJv2^;avbG6tg?;vC3d>#N&GAmmnt1))a`HSvH8( zs{;tzh+~I6!WcOWR7gM05m<(nDc|7DdR$UI->F}l(E^4Qj2NgeSvgHOBlvw_!!<^F zf>ShHb2LPMZZs`52h#-;IiI3~Q5&$xnVMopV3EfB(Vx z#aCZ{^8>THmWSYv$&L2BFW(aD_;Yz6U;KZ<9N&hFlDp>7BRsjwwBBL4g&F%K99n`u vd8mGpOW;^d9`hqM$~|y3w#OWTDKKq!lf6Gem$h;|RPUkR&h3^QoSpj@--B@I From 38656d0cd397d238cc5129a6f13b05c65d461990 Mon Sep 17 00:00:00 2001 From: "Christoph J. Scherr" Date: Fri, 22 Sep 2023 13:47:57 +0200 Subject: [PATCH 24/26] tab shenanigans --- lua/plex/plugins/extras/ui/bufferline.lua | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/lua/plex/plugins/extras/ui/bufferline.lua b/lua/plex/plugins/extras/ui/bufferline.lua index 9fdeb9c..990c0fd 100644 --- a/lua/plex/plugins/extras/ui/bufferline.lua +++ b/lua/plex/plugins/extras/ui/bufferline.lua @@ -4,11 +4,19 @@ return { event = 'VeryLazy', opts = { options = { + -- :h bufferline-configuration mode = 'tabs', - separator_style = 'slant', + separator_style = {"╱", "╱"}, + themable = true, + numbers = "ordinal", show_close_icon = false, show_buffer_close_icons = false, - diagnostics = false, + diagnostics = true, + indicator = { + -- icon = ' ', -- this should be omitted if indicator style is not 'icon' + -- windows terminal sucks + style = 'none', + }, always_show_bufferline = true, diagnostics_indicator = function(_, _, diag) local icons = require('plex.config').icons.diagnostics @@ -39,6 +47,7 @@ return { text_align = 'center', }, }, + }, }, }, From c0a69723986bc7d214e679ceb84d8e13b2a9c0b7 Mon Sep 17 00:00:00 2001 From: "Christoph J. Scherr" Date: Fri, 22 Sep 2023 14:10:16 +0200 Subject: [PATCH 25/26] auto open nvim-tree --- lua/plex/config/autocmds.lua | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lua/plex/config/autocmds.lua b/lua/plex/config/autocmds.lua index 25ee149..a68ae33 100644 --- a/lua/plex/config/autocmds.lua +++ b/lua/plex/config/autocmds.lua @@ -14,6 +14,14 @@ vim.api.nvim_create_autocmd({ 'FocusGained', 'TermClose', 'TermLeave' }, { command = 'checktime', }) +-- Open Neotree in new tabs +vim.api.nvim_create_autocmd({'TabNewEntered' }, { + group = augroup('automatic_neotree'), + callback = function() + vim.cmd('Neotree') + end, +}) + -- Go to last loc when opening a buffer, see ':h last-position-jump' vim.api.nvim_create_autocmd('BufReadPost', { group = augroup('last_loc'), @@ -79,7 +87,7 @@ vim.api.nvim_create_autocmd('BufWritePre', { -- Disable conceallevel for specific file-types. vim.api.nvim_create_autocmd('FileType', { group = augroup('fix_conceallevel'), - pattern = { 'markdown' }, + pattern = { 'latex', 'tex' }, callback = function() vim.opt_local.conceallevel = 0 end, From fb1c6a971df4d2ed29ba05e349c6d105f38d7fd3 Mon Sep 17 00:00:00 2001 From: "Christoph J. Scherr" Date: Mon, 25 Sep 2023 13:48:17 +0200 Subject: [PATCH 26/26] dont auto open nvim-tree --- lua/plex/config/autocmds.lua | 15 ++++++++------- spell/en.utf-8.add | 9 +++++++++ spell/en.utf-8.add.spl | Bin 2006 -> 2245 bytes 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/lua/plex/config/autocmds.lua b/lua/plex/config/autocmds.lua index a68ae33..a839982 100644 --- a/lua/plex/config/autocmds.lua +++ b/lua/plex/config/autocmds.lua @@ -14,13 +14,14 @@ vim.api.nvim_create_autocmd({ 'FocusGained', 'TermClose', 'TermLeave' }, { command = 'checktime', }) --- Open Neotree in new tabs -vim.api.nvim_create_autocmd({'TabNewEntered' }, { - group = augroup('automatic_neotree'), - callback = function() - vim.cmd('Neotree') - end, -}) +-- Caution: Causes Errors? +-- -- Open Neotree in new tabs +-- vim.api.nvim_create_autocmd({'TabNewEntered' }, { +-- group = augroup('automatic_neotree'), +-- callback = function() +-- vim.cmd('Neotree') +-- end, +-- }) -- Go to last loc when opening a buffer, see ':h last-position-jump' vim.api.nvim_create_autocmd('BufReadPost', { diff --git a/spell/en.utf-8.add b/spell/en.utf-8.add index 025978e..bd01647 100644 --- a/spell/en.utf-8.add +++ b/spell/en.utf-8.add @@ -153,3 +153,12 @@ struct enum priorisierbar 仕方がない +Gleichzeitigkeitsmechanismen +ServiceWrapper +Repräsentierung +Docstrings +Backends +dirs +MessageFrame +Addressor +init diff --git a/spell/en.utf-8.add.spl b/spell/en.utf-8.add.spl index 359e8365b987c5e55f11358b6c236c23faade52f..93f00920106e6f22f522a120d83d121c99e3767b 100644 GIT binary patch literal 2245 zcmYjS&x;&Y5PtP~mdGMu85tNP;5DEO*-heMAP3{dB!n0>;<|Y1A8)#QyQh1$f6R|P zMf9)-uj;{zL{A}qfa1|pu0aIPiU@9B!#@v zNE^gez?&vMR0mA7l-v^TlqkTk5f;yTNXQhiDwr$)VILu%mDs^qXe|OI1q@%E9j5qF zmY%u`aZ*-Ix3=JQ94AoZM+mWg4f&<;h_{!yHK;|SFfy){IRvIb!tQd90LVx#bG*r! zL*NMRh~dwCs7en9iR(9&LGH2 zveL*BVQSZ%vOgnb-VSqQzo18((m2F|4bDolCE@;`3M#C+t|oKqa$xyNmLBC|7lerm z(yH_8?>SWqz$oh$g+^|z%^ENk0!it<6nl{AJTT1aIv(T7Hmyy;uyO*tTDdTXr6y_r zATp=Roz2-?8F7Qq)t%M@D6gcpUNQ9FnzOKF7(>WXLcD!O*cfVT6&bVDI5IGK+-`+s z-E5SL^o$YgPszsGVt$)*##Fsln#hI>IWlaR2!Hl6DZ>!$*qm9gmnmf*Mznnz$`Mwa zP>vI|b>5HI-1bIon;vE{dM{Ifz38CA1Aue7fQ)c{ya6}aY=tiC8S5H0-06dKaSYwH z?8+7HOm|`XtNaK{KUC)f$NA?D)9?c#CitDCcY}zAal#yMnxUs2;Z67$2K5VG&7Jzy z(9N>ESU~t$)Ag&37K$|o+HH&{t9q0y5jKmzLNIJN(oe@+`EijeB~)>GFjHpCp|l5u zq_!YiJPBl6LZ~x6p5vVZ2k@tq`@Wmifvd6g*pD<@!VcB+Qg0JIJD*_6WgGRu>$~3O zy)7!B@*LpQ&@i~2A`Nyt<74eO{@DMwL$sJfc)%SIsTgVL#+0R*0f&PFg;|5I81{OG zP0E4G>a_|93>Z)8VPg#de6z5|JX@HQPWY!d?XZ|~%E&xBW`#GqJfqrlW8D%j|b}swKWQQle!zkMw!1|gsaKRf? z%+?#cUUj;@=qzqf4g&EhlxMm8B45kj@{Rl~f6C|bl|G;7lit5H#{9Isf9vl3_dodP z;Qp?WSt{(lt@Save^BZwuR`M~P1c+_9 z!RH!y9B03&UGwGx>v}nc1HD;Byv#efiKMjEM?CX+g!;xkP!H#gYewwS2w|%3Yi#Wf UNNmsZ%j+f%jk_8{f?SRHAE}U|Gynhq literal 2006 zcmYjSJC7Vi5bmnk6G9?5Sr#u9O78*8PL5XP1`glz-}L^zM$+41zw?9F2zj%*28 z4iItzDRM$UY$Kuj3;YCUAP2}1+GqpJ_to49wAz{OuBxx=@m0-NC%4*#58>#Qb9+Z` z#z~s_X+A6NmSJAii_@m<`sHeK@6X6Joy3yLOe(yc1Uy^(3cM>(jS?S3oExVadz^RB zEF`ld4~-1FTzaf>NMlK4Dh=K_H6~taDPd9DZW_gD3(XE1g&{2L8SH+KQ(n~U9rAU> z&xZZcUR<_3>6h>>0P7yC3xR%w<7=L>jvin!$sw=I&jwzVxT^-PUZOgTVgM9MxIh#f zYJ$zv9+C!IVpT9%07CC0nw97XiWcx=|5}=bs_E7Wya=LhV>gLaN2nh{9YwRi z7#mq4Z{{`jTItcllu$6SPm7%V|^4voZ|+j8CO3^2axeRat!J!9=i%e%8@b42;ge`pnDuFMtu;E zVqbSw38?>-YrTTp{n}jkw@o1|hE%^CGUIkovkLFX5V9I358J&s)Xm0%&d)=~`IuE( zD;li1NR6r2R!$3hOIEYB6Z}a;<_0|9*Mk1CKPV-A652kFlu(>zbQCiM47ratF;W=R|0VBQ{YLDkv!Yx;_(9Y4s||(`n;?d|KJRGsDH%hG zqed>UXuFs`(|2}-yecKvl5txr?gE4s`)-bRf#6^hC?BXYts`IK=;6>)EUui+#@s^E+gNdu>Y(yDKz2W;MW5uKM$U{ zzf;(F^q=knf@6*uDG?8AIC|8=4-O^yrc->LNNVC!C_fc)CO^mv`B8q8KjeXYXU|{k z$=knm&OLhl#?6ykw?F&*Yf@t=cW?zh3Ml3c`2r~J;6u47AN_xL9bATtlB<@8FY)9q z)v&>G4Kp_2aA@p!_m28rPJv^DKH&GUlk0HZczeM4ngG*wmpD{9=#pp`^ZGg(`NVF? I;Ini80@Q$p6aWAK