From b23f89384913ef0595294c43ea720a09ed49d199 Mon Sep 17 00:00:00 2001 From: "Christoph J. Scherr" Date: Wed, 31 Jan 2024 10:56:12 +0100 Subject: [PATCH 1/9] enable the tutor again --- lua/plugins/configs/lazy_nvim.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/lua/plugins/configs/lazy_nvim.lua b/lua/plugins/configs/lazy_nvim.lua index cd170bd..03cdf47 100644 --- a/lua/plugins/configs/lazy_nvim.lua +++ b/lua/plugins/configs/lazy_nvim.lua @@ -33,7 +33,6 @@ return { "vimballPlugin", "zip", "zipPlugin", - "tutor", "rplugin", "syntax", "synmenu", From 45da5bef31b2589a4e67c10704f48c035a7bee9a Mon Sep 17 00:00:00 2001 From: "Christoph J. Scherr" Date: Wed, 31 Jan 2024 11:55:22 +0100 Subject: [PATCH 2/9] tweak noice a little --- lua/custom/plugins.lua | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/lua/custom/plugins.lua b/lua/custom/plugins.lua index 564dd2f..4d67ac8 100644 --- a/lua/custom/plugins.lua +++ b/lua/custom/plugins.lua @@ -312,7 +312,6 @@ local plugins = { -- lazy.nvim { "folke/noice.nvim", - enabled = not vim.g.started_by_firenvim, event = "VeryLazy", -- config.lsp.signature.enabled = false dependencies = { @@ -344,6 +343,16 @@ local plugins = { inc_rename = false, -- enables an input dialog for inc-rename.nvim lsp_doc_border = false, -- add a border to hover docs and signature help }, + messages = { + enabled = true, + view_error = "messages", -- so it does not spam boxes with errors + }, + popupmenu = { + enabled = true, + }, + notify = { + enabled = true, + }, } end, }, From e8511173ef91e9215f914bd81b1e97142cc564b3 Mon Sep 17 00:00:00 2001 From: "Christoph J. Scherr" Date: Wed, 31 Jan 2024 14:27:57 +0100 Subject: [PATCH 3/9] worse escape and better leap --- lua/custom/plugins.lua | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lua/custom/plugins.lua b/lua/custom/plugins.lua index 4d67ac8..d67827a 100644 --- a/lua/custom/plugins.lua +++ b/lua/custom/plugins.lua @@ -31,6 +31,8 @@ local plugins = { -- Install a plugin { "max397574/better-escape.nvim", + enabled = false, + -- exit insert mode with 'jk' event = "InsertEnter", config = function() require("better_escape").setup() @@ -50,6 +52,10 @@ local plugins = { lazy = false, config = function() require("core.utils").load_mappings "leap" + local leap = require "leap" + leap.opts.highlight_unlabeled_phase_one_targets = true + leap.opts.safe_labels = "sfnutwehjkl/SFNLHMUGTZ?" + leap.opts.labels = "sfnjklhodweimbuyvrgtaqpcxz?" end, }, { @@ -59,7 +65,7 @@ local plugins = { require("flit").setup { keys = { f = "f", F = "F", t = "t", T = "T" }, -- A string like "nv", "nvo", "o", etc. - labeled_modes = "v", + labeled_modes = "nvo", multiline = true, -- Like `leap`s similar argument (call-specific overrides). -- E.g.: opts = { equivalence_classes = {} } From 7be125afdc9fed0e5a5973972e63f58b0b0f6de9 Mon Sep 17 00:00:00 2001 From: "Christoph J. Scherr" Date: Wed, 31 Jan 2024 14:34:12 +0100 Subject: [PATCH 4/9] okay lets give jk a try --- lua/custom/plugins.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lua/custom/plugins.lua b/lua/custom/plugins.lua index d67827a..d5b125f 100644 --- a/lua/custom/plugins.lua +++ b/lua/custom/plugins.lua @@ -30,9 +30,9 @@ local plugins = { -- Install a plugin { - "max397574/better-escape.nvim", - enabled = false, -- exit insert mode with 'jk' + "max397574/better-escape.nvim", + enabled = true, event = "InsertEnter", config = function() require("better_escape").setup() From 167d3babb0c524bb914153e6e137038dfa2ac9fa Mon Sep 17 00:00:00 2001 From: "Christoph J. Scherr" Date: Wed, 31 Jan 2024 14:52:42 +0100 Subject: [PATCH 5/9] i broke flit with a leap option --- lua/custom/init.lua | 1 + lua/custom/plugins.lua | 6 +----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/lua/custom/init.lua b/lua/custom/init.lua index 9aeb16a..2fa90f5 100644 --- a/lua/custom/init.lua +++ b/lua/custom/init.lua @@ -2,6 +2,7 @@ local opt = vim.opt local g = vim.g g.maplocalleader = ";" +opt.mouse = "" -- hardcore vim mode, disable the mouse opt.signcolumn = "yes" opt.spelllang = "en,de" opt.clipboard = "" -- don't just use the system clipboard diff --git a/lua/custom/plugins.lua b/lua/custom/plugins.lua index d5b125f..596a7cb 100644 --- a/lua/custom/plugins.lua +++ b/lua/custom/plugins.lua @@ -52,10 +52,6 @@ local plugins = { lazy = false, config = function() require("core.utils").load_mappings "leap" - local leap = require "leap" - leap.opts.highlight_unlabeled_phase_one_targets = true - leap.opts.safe_labels = "sfnutwehjkl/SFNLHMUGTZ?" - leap.opts.labels = "sfnjklhodweimbuyvrgtaqpcxz?" end, }, { @@ -65,7 +61,7 @@ local plugins = { require("flit").setup { keys = { f = "f", F = "F", t = "t", T = "T" }, -- A string like "nv", "nvo", "o", etc. - labeled_modes = "nvo", + labeled_modes = "v", multiline = true, -- Like `leap`s similar argument (call-specific overrides). -- E.g.: opts = { equivalence_classes = {} } From d9a4cc992d3621866797fe39c4fc8cc18078cf9e Mon Sep 17 00:00:00 2001 From: "Christoph J. Scherr" Date: Wed, 31 Jan 2024 15:44:47 +0100 Subject: [PATCH 6/9] spell is better now --- lua/custom/init.lua | 8 +++++++- spell/en.utf-8.add | 1 + spell/en.utf-8.add.spl | Bin 3454 -> 3477 bytes 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lua/custom/init.lua b/lua/custom/init.lua index 2fa90f5..dfb2252 100644 --- a/lua/custom/init.lua +++ b/lua/custom/init.lua @@ -4,7 +4,6 @@ g.maplocalleader = ";" opt.mouse = "" -- hardcore vim mode, disable the mouse opt.signcolumn = "yes" -opt.spelllang = "en,de" opt.clipboard = "" -- don't just use the system clipboard opt.wrap = false opt.breakindent = false @@ -106,6 +105,13 @@ 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 +-- Spelling correction +-- === + +opt.spell = false -- manually enable spell with `set spell` or `ts` +opt.spelllang = "en,de_de," +opt.spellsuggest = "double,50,timeout:5000" + -- autocommands -- === local function augroup(name) diff --git a/spell/en.utf-8.add b/spell/en.utf-8.add index 9b05773..5951639 100644 --- a/spell/en.utf-8.add +++ b/spell/en.utf-8.add @@ -271,3 +271,4 @@ PRs yaml netpong gehostet +IoT diff --git a/spell/en.utf-8.add.spl b/spell/en.utf-8.add.spl index 6a6db88b4681947314b3245f0429c562d68afb5c..e5192e07adbe36efeac2916ab342cb1e896336e4 100644 GIT binary patch delta 631 zcmX9*O=uHQ5Pq{SZ`&kI^_W)F5*2?yl%$CZ+EWuHh&_mSY~9Unnzfs}xY;BqN)bc^ zZyi(+uSGmaDV{{{f=9uNhvK#1p?L97|Gt;7@OJp-o0)IE`8)gU(DcpvwO%)fqT)Xx zCfBy7i?XczR@6=?CQV&@B*a33xJL&!5!U zb8kH5209r?;48P=X0F@~sBd^Hk<`f$5q0B{X8D2 zQEw9nODyB(@g9KG2Y#1^Tt1zdr^mdUIYNv4ATwKVPGW}yWkdYq@s)nGY$M@(5JJN* zexJEe)-e__Q#GcUKw*CzT3%>*<}4j(!R&A5;HY%?M7EOideYTn!(@|N*#d3y u(`=ot^4F|CC#yBX6_;wXNEIr=8{>|cDUIG6e0}OU-QwM;CE8#oclke%k&cr9 delta 592 zcmX9*O=}ZT6n%HzOq$PHs0&l^gCGckM3W}1)UIsQF4SE?H*u1@rc)*};bkVNMNn}g zh={r9#w-*R!Aju;j0T9Ps}Fq1FI-Nnq>6zQO%isNA0{49aX7VpVkwkL$J7B??8GqCq;1;3 zNRS!x_!KKCLm>?zuIaV=`t1a$veE2DbR>tXIAMt|IW1X)=JID eU9Qm;s!|E7G0PG8GJDxqR3GMU(sRC*yZRr@KZ$4n From 5a351dfcff327c0050e82a9ad0be8678d479c0ef Mon Sep 17 00:00:00 2001 From: "Christoph J. Scherr" Date: Wed, 31 Jan 2024 15:44:54 +0100 Subject: [PATCH 7/9] scroll with zj zk --- lua/custom/mappings.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lua/custom/mappings.lua b/lua/custom/mappings.lua index e6047d0..58f37fb 100644 --- a/lua/custom/mappings.lua +++ b/lua/custom/mappings.lua @@ -359,6 +359,10 @@ M.movements = { -- spell ["]s"] = { "]s", "go to next spelling mark" }, ["[s"] = { "[s", "go to last spelling mark" }, + + -- just scroll a line + ["zk"] = { "", "scroll up a line" }, + ["zj"] = { "", "scroll down a line" }, }, v = { --big move From 9c83975d31b4b770604c6c1013ed3e09d7a41ce2 Mon Sep 17 00:00:00 2001 From: "Christoph J. Scherr" Date: Wed, 31 Jan 2024 16:20:29 +0100 Subject: [PATCH 8/9] spell --- spell/en.utf-8.add | 3 +++ spell/en.utf-8.add.spl | Bin 3477 -> 3528 bytes 2 files changed, 3 insertions(+) diff --git a/spell/en.utf-8.add b/spell/en.utf-8.add index 5951639..70ff233 100644 --- a/spell/en.utf-8.add +++ b/spell/en.utf-8.add @@ -272,3 +272,6 @@ yaml netpong gehostet IoT +einen +NTSecureGateway +SoC diff --git a/spell/en.utf-8.add.spl b/spell/en.utf-8.add.spl index e5192e07adbe36efeac2916ab342cb1e896336e4..a421d971f7f7f3c7064cae62ec9939ef7e3316c5 100644 GIT binary patch delta 770 zcmZ8eO-NKx6u#%)dC&Q2%oai8WR?|0AckftQ$a|LBDx6@iHLbW>dWW6;m(_}38SBV zi#&x3X&Fid60{A1HbqF#rgcf12m_Z9)_0vx!B&$nJ39j{jWFzo#+ zL~`*}>zquaTrc27*=Z9AdRFEY`HnQ-Q2Xft*VGYmcv+3nHgBpS*p9@VecQ1VB*a84 zgDRS&!!Hu2vW=U;$9t4gqTNxsoLa0>oD!`l+~GgU7{*g5ciM~y*|8> zsafMk)+NgG7puGHrDK)+D6T6r;pV(HxIcZWnK~y_QM>?;DjGP*Y;d1_Qb~7)uiNdp zLK%25`LwW$D<&FBxFiyJzGvU1!cxohKrvFjuF*W2#d-}yUAj%PWX8xHAFUyt#$Q3M z3WBl82!7h)(Bq|~*V^A9=?ntaDnCzN zgQ9loBDM2K>R?AQG%bH>%F_*OO8q{}Y7ikRHQ!Gi7}=Vk8L9(NV;2pDjatBZ6N7T| z635IL5+6fy)HH+&&|qW|Z#B4kP07aiYibgQ9ZL7uZ5|1Gnak-zbeSKf+q()UP}tNf z!i?Qjf6dx}IDgs?u*q-!kRIsQ8k-qn5eS)N-SUG-18ieKI)QY|smquSdOu=7qO-vL znX}nyRh6Qq+A82%nJ!x6mCPtj@%PN99ywfu*b#_&bOnD1F9wtW5a<58Wv;=W_e>m@ kzF}HNl?z3%8PuuZ8R13FoKfV4`9ikaf}r_v*4d-~0HU?9=>Px# delta 691 zcmYjOO=uHA6rMMe-Tb+&p1K-pwXG;csi@Uh6p<=gN()-32M;y7nKWy*nXuU;2$pyd z4|?-a?5PK#h=NE3LC~8A#fx_jp(mjt^yr~heXokh!p>vfoA2*^$Svl&X2vJ$H64b> zehHDPtaeqTO8G@xkbU@AzUwg>0;oa-K!B@3LqwHq<88GcW^q|fzy^L*r|CbKSlG1@ zO94Vm#WJY#+$_FK3^~mJ3g8h62xZ}V;!?K>z|dWhuxV-y&sqCm6K`03u!?uA9$3L8 z>ms<=v5pKs^{j$6aZ@qg&3Wcm>lzx{_@Od!iz=u^P~*-=9JLP}03SkPXb?l4&XB5@ zxC~F^t4jDF5-u*;ZOEgWEWrhACv&+?_7~C@(OIMEI=zV*eG6YDJ-CZ*s+jIBc)l)` zg9_eH<@!6^7cYD$(;HH_6-l3^9EUudpbP5}zE54Js0PyKM>8P_q6lTlC~XLLC%X`5 z*@3b`u75OCF}g)wVMNpKNx+(=!R53&)R}`hXfgn07g3_T8=`m~lixqd4|42@H@KGW zh0FLeeGLrGWQJ|02*SRH4>EgU44-B8^yd$fznBnObVl1Q<+rlUYL4oF olsi6=ihm25rdR(jNSvuYbfzR|yyEm?>>N%`GV|^+TyX||1CC~+tpET3 From dc88c401c4a3b8214bdaa7187b3bc2665ed1b746 Mon Sep 17 00:00:00 2001 From: "Christoph J. Scherr" Date: Thu, 1 Feb 2024 13:17:51 +0100 Subject: [PATCH 9/9] theme minifix --- lua/custom/chadrc.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lua/custom/chadrc.lua b/lua/custom/chadrc.lua index 074bd3e..7e7dc46 100644 --- a/lua/custom/chadrc.lua +++ b/lua/custom/chadrc.lua @@ -5,8 +5,8 @@ local M = {} local highlights = require "custom.highlights" M.ui = { - theme = "kanagawa", - theme_toggle = { "kanagawa", "chadracula" }, + theme = "oceanic-next", + theme_toggle = { "kanagawa", "oceanic-next" }, hl_override = highlights.override, hl_add = highlights.add,