From 7b2db77584493f8a77f311527c6956365a3be072 Mon Sep 17 00:00:00 2001 From: PlexSheep Date: Thu, 7 Sep 2023 20:26:16 +0200 Subject: [PATCH 1/7] fix wsl merge regression --- lua/plex/plugins/extras/org/neorg.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lua/plex/plugins/extras/org/neorg.lua b/lua/plex/plugins/extras/org/neorg.lua index 95fe521..fc90a54 100644 --- a/lua/plex/plugins/extras/org/neorg.lua +++ b/lua/plex/plugins/extras/org/neorg.lua @@ -14,8 +14,8 @@ return { workspaces = { -- FIXME: This shouldn't be in the Versioncontrol. Make this -- into a local extension of the plugin. - main = "~/winhome/Nextcloud/Neorg", - notes = "~/winhome/Nextcloud/Notes", + main = "~/Nextcloud/Neorg", + notes = "~/Nextcloud/Notes", }, }, }, From 5c749d07396d170e94f75e646fa2f9496e4cccc0 Mon Sep 17 00:00:00 2001 From: PlexSheep Date: Thu, 7 Sep 2023 22:11:04 +0200 Subject: [PATCH 2/7] add eunuch for sudo stuff --- lua/plex/plugins/extras/editor/vim-eunuch.lua | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 lua/plex/plugins/extras/editor/vim-eunuch.lua diff --git a/lua/plex/plugins/extras/editor/vim-eunuch.lua b/lua/plex/plugins/extras/editor/vim-eunuch.lua new file mode 100644 index 0000000..c767058 --- /dev/null +++ b/lua/plex/plugins/extras/editor/vim-eunuch.lua @@ -0,0 +1,12 @@ +return { + { + -- enables UNIX specific stuff in vim, + -- specifically: + -- :SudoWrite + -- :SudoRead + -- :Chmod + -- and also some more, but those are easy done with shell + "tpope/vim-eunuch", + lazy=false, + } +} From f0483666fa9dfd81821a610650a742e775d9d534 Mon Sep 17 00:00:00 2001 From: PlexSheep Date: Thu, 7 Sep 2023 22:28:08 +0200 Subject: [PATCH 3/7] suda usage --- lua/plex/config/options.lua | 2 ++ lua/plex/plugins/editor.lua | 2 +- lua/plex/plugins/extras/editor/vim-eunuch.lua | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lua/plex/config/options.lua b/lua/plex/config/options.lua index b1364d8..11aef7e 100644 --- a/lua/plex/config/options.lua +++ b/lua/plex/config/options.lua @@ -213,6 +213,8 @@ vim.g.loaded_node_provider = 0 vim.g.no_gitrebase_maps = 1 -- See share/nvim/runtime/ftplugin/gitrebase.vim vim.g.no_man_maps = 1 -- See share/nvim/runtime/ftplugin/man.vim +vim.g.suda_smart_edit = 1 -- smart suda open and write + -- Filetype detection -- === diff --git a/lua/plex/plugins/editor.lua b/lua/plex/plugins/editor.lua index b8ead1b..c1a0f6e 100644 --- a/lua/plex/plugins/editor.lua +++ b/lua/plex/plugins/editor.lua @@ -8,7 +8,7 @@ return { ----------------------------------------------------------------------------- { 'nmac427/guess-indent.nvim', lazy = false, priority = 50, config = true }, { 'tweekmonster/helpful.vim', cmd = 'HelpfulVersion' }, - { 'lambdalisue/suda.vim', event = 'BufRead' }, + { 'lambdalisue/suda.vim', lazy = false, event = 'BufRead' }, ----------------------------------------------------------------------------- { diff --git a/lua/plex/plugins/extras/editor/vim-eunuch.lua b/lua/plex/plugins/extras/editor/vim-eunuch.lua index c767058..2dfd252 100644 --- a/lua/plex/plugins/extras/editor/vim-eunuch.lua +++ b/lua/plex/plugins/extras/editor/vim-eunuch.lua @@ -7,6 +7,7 @@ return { -- :Chmod -- and also some more, but those are easy done with shell "tpope/vim-eunuch", + enabled = false, lazy=false, } } From 78ea8f445bd9fe128f0e9a4cbc84e8fbb7f6a4c9 Mon Sep 17 00:00:00 2001 From: "Christoph J. Scherr" Date: Fri, 8 Sep 2023 11:35:08 +0200 Subject: [PATCH 4/7] fancy fancy logo in dash --- lua/plex/plugins/extras/treesitter/treesj.lua | 2 ++ lua/plex/plugins/extras/ui/dashboard.lua | 34 ++++++++++++++++--- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/lua/plex/plugins/extras/treesitter/treesj.lua b/lua/plex/plugins/extras/treesitter/treesj.lua index 0cc6162..fd8ba6f 100644 --- a/lua/plex/plugins/extras/treesitter/treesj.lua +++ b/lua/plex/plugins/extras/treesitter/treesj.lua @@ -1,6 +1,8 @@ return { { 'Wansmer/treesj', + enabled = true, + lazy = false, cmd = { 'TSJJoin', 'TSJSplit' }, keys = { { 'sj', 'TSJJoin' }, diff --git a/lua/plex/plugins/extras/ui/dashboard.lua b/lua/plex/plugins/extras/ui/dashboard.lua index 1900ac8..4e61881 100644 --- a/lua/plex/plugins/extras/ui/dashboard.lua +++ b/lua/plex/plugins/extras/ui/dashboard.lua @@ -1,3 +1,20 @@ +local function get_header() + -- see https://github.com/MaximilianLloyd/ascii.nvim + return { + -- The following is a customized version! + [[ ]], + [[  ]], + [[ █ ███████ █████ ██ ]], + [[ ███ █████ █████  ]], + [[ █████ ███ ███████████████████ ███ ███████████ ]], + [[ ██ ██ █ ███ █████████████ █████ ██████████████ ]], + [[ ████ ████ ██████████ █████████ █████ █████ ████ █████ ]], + [[ ██████ ██ ███ ███ █████████ █████ █████ ████ █████ ]], + [[ ████████  ██████████████████ ████ █████ █████ ████ ██████ ]], + [[ ]], + } +end + return { { 'glepnir/dashboard-nvim', @@ -7,11 +24,9 @@ return { theme = 'hyper', config = { - header = { - foo = "bar", - }, + header = get_header(), week_header = { - enable = true, + enable = false, }, shortcut = { { @@ -50,6 +65,17 @@ return { key = 's', }, }, + + project = { + enable = true, + limit = 8, + icon = '', + label = ' Projects', + action = 'Telescope find_files cwd=' + }, + packages = { enable = true}, + mru = { limit = 10, icon = '', label = ' Last Edited'}, + -- footer = { 'footer bar foo' }, }, }) From 944396534658e847c961c2c5606ff4b97313d0a0 Mon Sep 17 00:00:00 2001 From: PlexSheep Date: Sat, 9 Sep 2023 15:40:15 +0200 Subject: [PATCH 5/7] spell --- spell/en.utf-8.add | 7 +++++++ spell/en.utf-8.add.spl | Bin 371 -> 422 bytes 2 files changed, 7 insertions(+) diff --git a/spell/en.utf-8.add b/spell/en.utf-8.add index 0550369..e09861e 100644 --- a/spell/en.utf-8.add +++ b/spell/en.utf-8.add @@ -21,3 +21,10 @@ Testvectors possibilites/! Hexdumper hexdumped +Hexeditor +hexeditor +Hexdumping +stdin +md +regex101 +#nglish diff --git a/spell/en.utf-8.add.spl b/spell/en.utf-8.add.spl index 16efe2674bccd237177b4d2d7eb57e6b1ef6dc1d..2455257492a4667287a6e128f7b65741c5cca829 100644 GIT binary patch literal 422 zcmXX?%TB{E5Zqby3gtKGi6Zq6$^oGg2_f#mv7CULhaK8-<0JTA7;me{-rd>R*>T<; zcX{+N-v5c<>biDKXg}hLDxg7!naW9p^zOW`s+k$%X{LY*xvLF(TxcSF85s~w zB&(lwIF`Ig6f;jNM?(R+AT9Ij@Xix?3W2Yxu@gnR_U_EiPJDVi z#L;?x|0g29H;rjs_vSDCIE4gJ69JK14}%UCp;Upl83RT{=nsoafgE!tx7t`D-8y6N zUSL&xqQwW<(1)P z2i=eu`JM5~@Qh5L-8&kvY Date: Sun, 10 Sep 2023 01:44:49 +0200 Subject: [PATCH 6/7] fix dashboard icon --- lua/plex/plugins/extras/ui/dashboard.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lua/plex/plugins/extras/ui/dashboard.lua b/lua/plex/plugins/extras/ui/dashboard.lua index 4e61881..49601fa 100644 --- a/lua/plex/plugins/extras/ui/dashboard.lua +++ b/lua/plex/plugins/extras/ui/dashboard.lua @@ -3,8 +3,8 @@ local function get_header() return { -- The following is a customized version! [[ ]], - [[  ]], - [[ █ ███████ █████ ██ ]], + [[ ██ ]], + [[ █ ███████ █████ ██ ]], [[ ███ █████ █████  ]], [[ █████ ███ ███████████████████ ███ ███████████ ]], [[ ██ ██ █ ███ █████████████ █████ ██████████████ ]], From 8dcc61113411679de6e82f4b3414be977e24d528 Mon Sep 17 00:00:00 2001 From: PlexSheep Date: Sun, 10 Sep 2023 19:37:33 +0200 Subject: [PATCH 7/7] goto diagnostic --- lua/plex/config/keymaps.lua | 8 +++++++ lua/plex/plugins/extras/org/neorg.lua | 1 + spell/en.utf-8.add | 32 ++++++++++++++++++++++++++ spell/en.utf-8.add.spl | Bin 415 -> 860 bytes 4 files changed, 41 insertions(+) diff --git a/lua/plex/config/keymaps.lua b/lua/plex/config/keymaps.lua index c218c88..2330d6b 100644 --- a/lua/plex/config/keymaps.lua +++ b/lua/plex/config/keymaps.lua @@ -56,6 +56,14 @@ end map('n', '', 'lnext', { desc = 'Next Loclist Item' }) map('n', '', 'lprev', { desc = 'Previous Loclist Item' }) +-- go to next diagnostics entry +map('n', '', function () + vim.diagnostic.goto_next() +end, { desc = 'go to next diagnostic'}) +map('n', '', function () + vim.diagnostic.goto_prev() +end, { desc = 'go to last diagnostic'}) + -- Whitespace jump (see plugin/whitespace.vim) map('n', ']s', function() require('plex.lib.edit').whitespace_jump(1) diff --git a/lua/plex/plugins/extras/org/neorg.lua b/lua/plex/plugins/extras/org/neorg.lua index fc90a54..68905c3 100644 --- a/lua/plex/plugins/extras/org/neorg.lua +++ b/lua/plex/plugins/extras/org/neorg.lua @@ -9,6 +9,7 @@ return { load = { ["core.defaults"] = {}, -- Loads default behaviour ["core.concealer"] = {}, -- Adds pretty icons to your documents + ["core.export"] = {}, ["core.dirman"] = { -- Manages Neorg workspaces config = { workspaces = { diff --git a/spell/en.utf-8.add b/spell/en.utf-8.add index e01e765..203eea6 100644 --- a/spell/en.utf-8.add +++ b/spell/en.utf-8.add @@ -30,3 +30,35 @@ stdin md regex101 #nglish +Manspider +Manspiders +subrace +subraces +swiftstride +beasthide +Eldeen +Khorvaire +drider +spiderful +spiderfew +Spiderfolk +Shrelluka +find/! +find +Magnam +arachna +matrem +namegen +Zessas +Webbington +Razu +Rhellu +cantrip +d12 +d4 +th +unnoteworthy +Qroczhreer +Blokhof +Hauck +spiderous diff --git a/spell/en.utf-8.add.spl b/spell/en.utf-8.add.spl index 1f9eb6261edb15fb62cf4dd145d5044d0c97cf8f..12d1f6d335b970ab3f872720781ec74c35ba09a3 100644 GIT binary patch literal 860 zcmX|9F>>2L3_O5JZCCyQi*%7~eju@n6tX9oOzNCSh@^QUsUs=bR+BbwN$V<~$Zyid z3()r5+#Rt177Osce_jo}gmC`fIbNOlbzaD(tm?ZaY}Qdy z0jtK{5;Mz;jEJbIAaX7h>ZpO;sg-RKpAU!~DI!Asy`8~W1*l?ivDE8QX7il(NbgaI zf4=hG391()8h;@`TPoP`DUdC8q;mG91$*IPf&$eoIGfp%MSLSWYv`T}p$UmSOU+uk zP)7u*-X#jvklay32?nZ`HXT6LK^LNaDPnpvZ|z2?_HWoM5phpr;tNU2b_9<%{w)}K zL~1(`Q`DLRxU9K!%MQRXn|m^K$nCI#We z*a2GuFxOL#6MQ*6Lc4YGB=7_*)zMqt%M7gQ1FBYtR;?44I|SX+l0GPqE@9c|jw(rI z((mxD>hXw-PH88N{MWp-z3CF^0R1pWY7P8(2}=je1|(lpcf{0k5}OJfHEqzufQ{sj zkwpbm2JBHhheMwpebT?#;#)gD;MU<(nv^~OS=&Tf49SQtI$-*=HPbui-Y>3JH(vqn d>DHd2qbp55$&BtBPPHJ6c62>=e^MgRxn~F7o%;X) literal 415 zcmXX?%TB{E5ZqbyO!$JTH^ddG$KJ|;LyLqEN2K6bNx^kqCWRY+!)L;*6GisgvpWyx z<>4@PK7_kJ5foRYtLo`}hOV-Kz3`1IaM=J~a?NO-Kp@jIqUEq=yC{7V z?YVM}oxRp_POL6Z(ffB0k=xb&aC{;>;W7Us!QO%uTVfYHbGMsg?QuWL6*Y+>|K@T_ ArT_o{