From 444676caaca4043ece7e8528dcaa0c72f2ea9bda Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Mon, 2 Oct 2023 20:06:56 +0200 Subject: [PATCH 1/3] nvim: Add markmap to build mindmaps Added markmap plugin to make mindmaps from markdown. Uses headings for leaves, and works pretty automatically. Testing its functionality longer-term for now. --- nvim/.config/nvim/lua/plugins/prose.lua | 41 +++++++++++++++++-------- 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/nvim/.config/nvim/lua/plugins/prose.lua b/nvim/.config/nvim/lua/plugins/prose.lua index 9654baa..3c28be9 100644 --- a/nvim/.config/nvim/lua/plugins/prose.lua +++ b/nvim/.config/nvim/lua/plugins/prose.lua @@ -1,6 +1,6 @@ local writing_ft = { "quarto", "pandoc", "markdown", "text", "tex" } -return { +local prose_plugs = { -- UI improvements -- provide distraction free writing { "folke/zen-mode.nvim", config = true, event = "VeryLazy" }, @@ -12,10 +12,10 @@ return { require("wrapping").setup({ create_keymappings = false, notify_on_switch = false, - softener = { markdown = true, text = true, asciidoc = true } + softener = { markdown = true, text = true, asciidoc = true }, }) end, - lazy = false + lazy = false, }, -- displays prettier headlines mimicking the ones in emacs orgmode { @@ -60,14 +60,29 @@ return { -- syntax highlighting for markdown criticmarkup (comments, additions, ...) { "vim-pandoc/vim-criticmarkup", ft = writing_ft }, - -- inline display of latex formulas - -- TODO always demands latex treesitter to be installed even if it is - -- TODO always turns softwrapped lines off on exiting insert mode - --{ - --"jbyuki/nabla.nvim", - --ft = writing_ft, - --config = function() - --require("nabla").enable_virt({ autogen = true, silent = true }) - --end, - --}, + + -- create mindmaps from your markdown + { + "Zeioth/markmap.nvim", + cmd = { "MarkmapOpen", "MarkmapSave", "MarkmapWatch", "MarkmapWatchStop" }, + config = true, + }, + + -- cite as you write from papis databases + -- ADDITIONAL DEPENDENCIES: papis and yq in shell env + -- { + -- "jghauser/papis.nvim", + -- cond = vim.fn.executable("papis") == 1 and vim.fn.executable("yq") == 1, + -- ft = writing_ft, + -- dependencies = { + -- "kkharji/sqlite.lua", + -- "nvim-lua/plenary.nvim", + -- "MunifTanjim/nui.nvim", + -- "nvim-treesitter/nvim-treesitter", + -- }, + -- lazy = false, + -- config = true, + -- } } + +return prose_plugs From 9040585feabc5e3009507319ae4a491faf53a5c9 Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Mon, 2 Oct 2023 20:08:02 +0200 Subject: [PATCH 2/3] papis: Add new libraries --- writing/.config/papis/config | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/writing/.config/papis/config b/writing/.config/papis/config index 1797c7e..01e93ca 100644 --- a/writing/.config/papis/config +++ b/writing/.config/papis/config @@ -46,6 +46,15 @@ dir = ~/documents/library/cs [ee] dir = ~/documents/library/ee +[litrev-rahman] +dir = ~/documents/library/litrev-rahman + +[ilo] +dir = ~/documents/library/ilo-wow + +[plugins.extract] +tags = {"red": "important", "green": "extra", "blue": "toread"} + [plugins.bbt-formatter] full-year = True title-words = 2 From 893c1773580afdce99962e7f335b78429a5bf4db Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Mon, 2 Oct 2023 20:16:04 +0200 Subject: [PATCH 3/3] git: Replace dsf with git-delta Diff-so-fancy is pretty good but delta just looks soo buttery smooth. --- bootstrap/packages_stable.tsv | 2 +- bootstrap/packages_testing.tsv | 1 - git/.config/git/config | 12 ++++++++++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/bootstrap/packages_stable.tsv b/bootstrap/packages_stable.tsv index a93823b..3748bba 100644 --- a/bootstrap/packages_stable.tsv +++ b/bootstrap/packages_stable.tsv @@ -52,7 +52,6 @@ dconf-editor GSettings editor for GNOME R dell-command-configure Configure various BIOS features on Dell laptops A devour Window Manager agnostic swallowing feature for terminal emulators A dhcpcd RFC2131 compliant DHCP client daemon R -diff-so-fancy Good-looking diffs with diff-highlight and more R distrobox Use any linux distribution inside your terminal. A dnsmasq Lightweight, easy to configure DNS forwarder and DHCP server R docker Pack, ship and run any application as a lightweight container R @@ -80,6 +79,7 @@ fzf-tab-bin-git Replace zsh's default completion selection menu with fzf (git ve gallery-dl Command-line program to download image-galleries and collections from several image hosting sites A gamemode A daemon/lib combo that allows games to request a set of optimisations be temporarily applied to the host OS R gimp GNU Image Manipulation Program R +git-delta Syntax-highlighting pager for git and diff output R git-lfs Git extension for versioning large files R gitlint Git commit message linter A gitui Blazing fast terminal-ui for git written in Rust R diff --git a/bootstrap/packages_testing.tsv b/bootstrap/packages_testing.tsv index c391f1a..e53c5da 100644 --- a/bootstrap/packages_testing.tsv +++ b/bootstrap/packages_testing.tsv @@ -5,7 +5,6 @@ blueberry Bluetooth configuration tool R dotter-rs-bin A dotfile manager and templater written in Rust A eza A modern replacement for ls (community fork of exa) R feishin-appimage A modern self-hosted music player. A -git-delta Syntax-highlighting pager for git and diff output R khal CLI calendar application built around CalDAV R m4b-tool-bin A command line utility to merge, split and chapterize audiobook files such as mp3, ogg, flac, m4a or m4b A nodejs-markmap-cli Create markmaps (mindmaps from markdown) from CLI A diff --git a/git/.config/git/config b/git/.config/git/config index 03f2abe..e8d9579 100644 --- a/git/.config/git/config +++ b/git/.config/git/config @@ -4,6 +4,16 @@ signingkey = 73BA40D5AFAF49C9 [init] defaultBranch = main +[core] + pager = delta +[interactive] + diffFilter = delta --color-only +[merge] + conflictstyle = diff3 +[delta] + navigate = true + line-numbers = true + syntax-theme = base16 [sendemail] smtpserver = "/usr/bin/msmtp" annotate = yes @@ -21,8 +31,6 @@ rebase = true # always rebase on pulling, obviates merge commits [diff] colorMoved = zebra # also color stuff that has simply been moved, in a classy zebra-color -[pager] - diff = dsf | less --tabs=4 -RFXS --pattern '(^(Date|added|deleted|modified): |^diff --git )' [color.diff] meta = "9" frag = "magenta bold"