From f3fb0998f59ba2a303ea9238cf0bd726331ca860 Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Tue, 18 Feb 2025 18:30:52 +0100 Subject: [PATCH 1/4] vifm: Replace glow with bat markdown preview For some reason (glow 2.0.0 release?) markdown preview with glow does _not_ work anymore within my vifm. It regresses to showing errors all over the place instead. --- terminal/.config/vifm/vifmrc | 46 ++++-------------------------------- 1 file changed, 4 insertions(+), 42 deletions(-) diff --git a/terminal/.config/vifm/vifmrc b/terminal/.config/vifm/vifmrc index 35d133f..80e172f 100644 --- a/terminal/.config/vifm/vifmrc +++ b/terminal/.config/vifm/vifmrc @@ -617,9 +617,10 @@ fileviewer */ \ tree -L 2, " markdown text -fileviewer *.md - \ [ "$TERM_DARK" = "true" ] && glow --style=dark %c || glow --style=light %c, - \ bat --color=always --style=plain +fileviewer *.md,*.markdown,*.mkd,*.mdx,*.rmd,*.Rmd,*.quarto,*.mdwiki + \ bat --color=always --style=plain --language md | less -FRX + " glow has ceased to work w/ version 2.0.0 + " \ [ "$TERM_DARK" = "true" ] && glow -p --style=dark %c || glow -p --style=light %c, " use custom viewer script for rest fileviewer * vifm-default-viewer %c @@ -627,45 +628,6 @@ fileviewer * vifm-default-viewer %c " use our own custom opener filetype * open -" Syntax highlighting in preview -" -" Explicitly set highlight type for some extensions -" -" 256-color terminal -" fileviewer *.[ch],*.[ch]pp highlight -O xterm256 -s dante --syntax c %c -" fileviewer Makefile,Makefile.* highlight -O xterm256 -s dante --syntax make %c -" -" 16-color terminal -" fileviewer *.c,*.h highlight -O ansi -s dante %c -" -" Or leave it for automatic detection -" -" fileviewer *[^/] pygmentize -O style=monokai -f console256 -g - -" Displaying pictures in terminal -" -" fileviewer *.jpg,*.png shellpic %c - -" Open all other files with default system programs (you can also remove all -" :file[x]type commands above to ensure they don't interfere with system-wide -" settings). By default all unknown files are opened with 'vi[x]cmd' -" uncommenting one of lines below will result in ignoring 'vi[x]cmd' option -" for unknown file types. -" For *nix: -" filetype * xdg-open -" For OS X: -" filetype * open -" For Windows: -" filetype * start, explorer - -" }}} - -" Various customization examples - -" Add additional place to look for executables -" -" let $PATH = $HOME.'/bin/fuse:'.$PATH - " Block particular shortcut " " nnoremap From 65bb7aa034fc727ad3803b7f91814353f455c16e Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Tue, 18 Feb 2025 21:24:01 +0100 Subject: [PATCH 2/4] nvim: Add djot filetype detection --- nvim/.config/nvim/ftdetect/djot.lua | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 nvim/.config/nvim/ftdetect/djot.lua diff --git a/nvim/.config/nvim/ftdetect/djot.lua b/nvim/.config/nvim/ftdetect/djot.lua new file mode 100644 index 0000000..d8837d1 --- /dev/null +++ b/nvim/.config/nvim/ftdetect/djot.lua @@ -0,0 +1,7 @@ +-- Set filetypes for 'djot' - an update markdown alternative +-- https://github.com/jgm/djot +vim.filetype.add({ + extension = { + dj = "djot", + }, +}) From 395bf80abe50b05e8f1dc6dcb4c81f48c358be92 Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Tue, 18 Feb 2025 21:24:01 +0100 Subject: [PATCH 3/4] zk: Fix note dir location and add cd alias The note dir is in fact our `$WIKIROOT` so we set it to that by default. Also took the chance and added a small 'cd' command into the note dir, using `ncd` --- .dotter/global.toml | 1 + writing/zk/config/sh/alias.d/zk.sh | 2 ++ writing/zk/config/sh/env.d/zk.sh | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.dotter/global.toml b/.dotter/global.toml index 5ebdea0..8018d82 100644 --- a/.dotter/global.toml +++ b/.dotter/global.toml @@ -78,6 +78,7 @@ social = "~" "writing/sioyek/config" = "~/.config" "writing/zathura/config" = "~/.config" "writing/zk/config" = "~/.config" +"writing/zk/config/sh/alias.d/zk.sh" = { target = "~/.config/sh/alias.d/zk.sh", type = "symbolic" } "writing/pandoc/local" = "~/.local" writing = "~" diff --git a/writing/zk/config/sh/alias.d/zk.sh b/writing/zk/config/sh/alias.d/zk.sh index b7efa2f..998e0c3 100644 --- a/writing/zk/config/sh/alias.d/zk.sh +++ b/writing/zk/config/sh/alias.d/zk.sh @@ -15,3 +15,5 @@ n() { if command -v nvim >/dev/null 2>&1; then alias ni='nvim +"lua require \"zk.commands\".get(\"ZkCd\")()" +"edit $WIKIROOT/index.md"' fi + +alias ncd='pushd $WIKIROOT' diff --git a/writing/zk/config/sh/env.d/zk.sh b/writing/zk/config/sh/env.d/zk.sh index 598d9dc..eb9ca6f 100644 --- a/writing/zk/config/sh/env.d/zk.sh +++ b/writing/zk/config/sh/env.d/zk.sh @@ -1,4 +1,4 @@ #!/usr/bin/env sh # -export ZK_NOTEBOOK_DIR="${WIKIROOT:-~/documents/notes/}/pinky" +export ZK_NOTEBOOK_DIR="${WIKIROOT:-~/documents/notes/}" From 18ce017b8a59e5d91011a4903681f52dd58117ef Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Tue, 18 Feb 2025 21:24:01 +0100 Subject: [PATCH 4/4] nvim: Add djot filetype to prose plugins Since it is (basically) markdown, we add it to markdown-like filetypes. --- nvim/.config/nvim/lua/plugins/prose.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nvim/.config/nvim/lua/plugins/prose.lua b/nvim/.config/nvim/lua/plugins/prose.lua index 35eebff..a38a2d6 100644 --- a/nvim/.config/nvim/lua/plugins/prose.lua +++ b/nvim/.config/nvim/lua/plugins/prose.lua @@ -1,8 +1,10 @@ local md_like = { "markdown", + "djot", "pandoc", "quarto", "vimwiki", + "codecompanion", } local org_like = { "norg", @@ -68,7 +70,6 @@ local prose_plugs = { "MeanderingProgrammer/render-markdown.nvim", main = "render-markdown", opts = { - file_types = { unpack(md_like) }, render_modes = { "n", "c", "i" }, code = { sign = false,