From 1efe13cb948870224e70a740d280f7252d9219b2 Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Fri, 21 Jul 2023 20:16:17 +0200 Subject: [PATCH 01/10] office: Update displayed symbols --- office/.config/neomutt/colors | 8 ++++---- scripts/.local/bin/powermenu | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/office/.config/neomutt/colors b/office/.config/neomutt/colors index 8461d30..03216b7 100644 --- a/office/.config/neomutt/colors +++ b/office/.config/neomutt/colors @@ -75,7 +75,7 @@ color progress black cyan set date_format = "%a %d %h %H:%M" set index_format=" %zc %zs %zt | %-35.35L %?X?📎& ? %?M10?~(%1M) ?%-30.100s %> %?Y?%Y ? %(!%a %d %h %H:%M) " set pager_format="%n %T %s%*  %{!%d %b · %H:%M} %?X? %X?%P" -set status_format = " %D %?u? %u ?%?R? %R ?%?d? %d ?%?t? %t ?%?F? %F ?%?p? %p? \n \n" +set status_format = " %D %?u? %u ?%?R? %R ?%?d? %d ?%?t? %t ?%?F? %F ?%?p? %p? \n \n" set compose_format="-- NeoMutt: Compose [Approx. msg size: %l Atts: %a]%>-" # set vfolder_format = "%N %?n?%3n& ? %8m  · %f" set attach_format = "%u%D  %T%-75.75d %?T?%& ? %5s · %m/%M" @@ -104,7 +104,7 @@ color status color8 default '(|)' # statusline "bubbl color status color69 black '(\` )' # bubble account variation color status white color69 '([a-zA-Z0-9\.]+)( )' # account text color status green color8 '' # Unread messages count -color status blue color8 '' # Read messages count icon +color status blue color8 '' # Read messages count icon color status yellow color8 '' # Flagged icon color status red color8 '' # Pending delete icon @@ -212,7 +212,7 @@ color body color8 default '(^(To|From|Sent|Subject):.*)' set to_chars=" " # unchanged mailbox, changed, read only, attach mode -set status_chars = " " +set status_chars = " 󱫄" ifdef crypt_chars set crypt_chars = " " set flag_chars = " " @@ -221,7 +221,7 @@ set hidden_tags = "unread,draft,flagged,passed,replied,attachment,signed,encrypt tag-transforms "replied" "↻ " \ "encrytpted" "" \ "signed" "" \ - "attachment" "" \ + "attachment" "󰁦" \ # The formats must start with 'G' and the entire sequence is case sensitive. tag-formats "replied" "GR" \ diff --git a/scripts/.local/bin/powermenu b/scripts/.local/bin/powermenu index 6509c62..89362e0 100755 --- a/scripts/.local/bin/powermenu +++ b/scripts/.local/bin/powermenu @@ -23,12 +23,12 @@ if [ "${POWERMENU_SHOW_TEXT:-0}" -eq 0 ] && [ "${POWERMENU_SHOW_ICONS:-1}" -eq 0 echo "You disabled both text and icons for rofi-powermenu, nothing can be shown." exit 1 elif [ "${POWERMENU_SHOW_ICONS:-1}" -eq 1 ]; then - power_off_btn="" - reboot_btn="" - lock_btn="" - suspend_btn="鈴" - hibernate_btn="鈴" - logout_btn="" + power_off_btn="⏻" + reboot_btn="" + lock_btn="" + suspend_btn="󰒲" + hibernate_btn="⏾" + logout_btn="󰍃" fi if [ "${POWERMENU_SHOW_TEXT:-1}" -eq 1 ]; then power_off_btn="${power_off_btn} Shut Down" From 6e5ad3586246822d30617b7ea5a9b292043e737d Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Fri, 21 Jul 2023 20:17:05 +0200 Subject: [PATCH 02/10] jrnl: Update version --- writing/.config/jrnl/jrnl.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/writing/.config/jrnl/jrnl.yaml b/writing/.config/jrnl/jrnl.yaml index 36762e6..28e71d2 100644 --- a/writing/.config/jrnl/jrnl.yaml +++ b/writing/.config/jrnl/jrnl.yaml @@ -16,4 +16,4 @@ linewrap: 79 tagsymbols: '#@' template: false timeformat: '%F %r' -version: v4.0 +version: v4.0.1 From c8eb9fdb4ccae63ac36a55c58c59db8ee5cdfc2f Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Fri, 21 Jul 2023 20:17:22 +0200 Subject: [PATCH 03/10] sh: Fix quoting --- desktop/.config/river/init | 4 ++-- sh/.config/sh/alias.d/enable-fasd-hook.sh | 2 +- sh/.config/sh/env | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/desktop/.config/river/init b/desktop/.config/river/init index b8afca1..dd51b8e 100755 --- a/desktop/.config/river/init +++ b/desktop/.config/river/init @@ -160,8 +160,8 @@ riverctl map normal $mod+Shift Comma send-to-output previous # set up 10 tags (with '0' opening the 10th one) for i in $(seq 0 9); do - tags=$((1 << (i - 1))) - if [ "$i" -eq 0 ]; then tags=$((1 << 9)); fi + tags="$((1 << (i - 1)))" + if [ "$i" -eq 0 ]; then tags="$((1 << 9))"; fi # Mod+[1-9] to focus tag [0-8] riverctl map normal $mod "$i" set-focused-tags $tags diff --git a/sh/.config/sh/alias.d/enable-fasd-hook.sh b/sh/.config/sh/alias.d/enable-fasd-hook.sh index ca239f0..28b7e70 100644 --- a/sh/.config/sh/alias.d/enable-fasd-hook.sh +++ b/sh/.config/sh/alias.d/enable-fasd-hook.sh @@ -1,6 +1,6 @@ #!/bin/sh # more usage instructions at https://github.com/clvv/fasd -# eval "$(fasd --init posix-hook posix_alias bash-hook zsh-hook zsh-ccomp zsh-ccomp-install zsh-wcomp zsh-wcomp-install)" +# exist fasd && eval "$(fasd --init posix-hook posix_alias bash-hook zsh-hook zsh-ccomp zsh-ccomp-install zsh-wcomp zsh-wcomp-install)" exist fasd && eval "$(fasd --init auto)" # any diff --git a/sh/.config/sh/env b/sh/.config/sh/env index febbaec..5ba2ef8 100644 --- a/sh/.config/sh/env +++ b/sh/.config/sh/env @@ -47,7 +47,7 @@ export LC_ALL="en_US.UTF-8" export LANG="en_US.UTF-8" # if we forgot to set it treat bash as default -export SHELL=${SHELL:-/bin/bash} +export SHELL="${SHELL:-/bin/bash}" export TERM=xterm-256color From a97646c88a8c66dc0df8f9d91bba73b820142654 Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Fri, 21 Jul 2023 20:17:49 +0200 Subject: [PATCH 04/10] nvim: Update plugins --- nvim/.config/nvim/lazy-lock.json | 48 ++++++++++++++++---------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index 7b92d62..dccc67c 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -1,7 +1,7 @@ { - "Arduino.nvim": { "branch": "main", "commit": "63f71687c0f4bcebafbb7e480f0d47b6fe46bd82" }, + "Arduino.nvim": { "branch": "main", "commit": "1e986040861e77dd7107abfecc473c60ccd97d3f" }, "BetterLua.vim": { "branch": "master", "commit": "d2d6c115575d09258a794a6f20ac60233eee59d5" }, - "LuaSnip": { "branch": "master", "commit": "500981ff6cefc7343e3959ef0f939bd0bfd49ba9" }, + "LuaSnip": { "branch": "master", "commit": "0b4950a237ce441a6a3a947d501622453f6860ea" }, "Navigator.nvim": { "branch": "master", "commit": "91d86506ac2a039504d5205d32a1d4bc7aa57072" }, "bats.vim": { "branch": "master", "commit": "6a5d2ef22b0ede503d867770afd02ebb1f97b709" }, "cmp-beancount": { "branch": "main", "commit": "da154ea94d598e6649d6ad01efa0a8611eff460d" }, @@ -10,7 +10,7 @@ "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, "cmp-digraphs": { "branch": "master", "commit": "5efc1f0078d7c5f3ea1c8e3aad04da3fd6e081a9" }, "cmp-latex-symbols": { "branch": "main", "commit": "165fb66afdbd016eaa1570e41672c4c557b57124" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-pandoc-references": { "branch": "master", "commit": "2c808dff631a783ddd2c554c4c6033907589baf6" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, @@ -21,45 +21,45 @@ "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, "completion-vcard": { "branch": "master", "commit": "2220fd517a985ececed1adcf0e5be8f2815564c7" }, "dial.nvim": { "branch": "master", "commit": "54b503f906bc9e5ab85288414840a1b86d40769f" }, - "dressing.nvim": { "branch": "master", "commit": "5fb5cce0cbfcedeadbcee43e5674e8c9a9f28d4a" }, + "dressing.nvim": { "branch": "master", "commit": "e6eff7a5a950a853c3903d906dbcea03f778db5f" }, "easyread.nvim": { "branch": "main", "commit": "0b07e315a4cd7d700c4a794bdddbec79fdc2628b" }, "fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" }, - "friendly-snippets": { "branch": "main", "commit": "5749f093759c29e3694053d048ceb940fe12c3d3" }, + "friendly-snippets": { "branch": "main", "commit": "ea84a710262cb2c286d439070bad37d36fd3db25" }, "fwatch.nvim": { "branch": "main", "commit": "a691f7349dc66285cd75a1a698dd28bca45f2bf8" }, "gitsigns.nvim": { "branch": "main", "commit": "bb808fc7376ed7bac0fbe8f47b83d4bf01738167" }, "jupyter-kernel.nvim": { "branch": "main", "commit": "5b409598033884a3d819e2a3bcd1fe340bc8d783" }, - "lazy.nvim": { "branch": "main", "commit": "b7043f2983d7aead78ca902f3f2053907081859a" }, + "lazy.nvim": { "branch": "main", "commit": "b7303a68309296fb4809c51ce0bf66722e5dc4f7" }, "lightspeed.nvim": { "branch": "main", "commit": "299eefa6a9e2d881f1194587c573dad619fdb96f" }, - "lsp-setup.nvim": { "branch": "main", "commit": "2d5138d82c12874135dfd268b6b50ccfce4eb5df" }, + "lsp-setup.nvim": { "branch": "main", "commit": "64542fb0da06414cdfaa0c5236b743679bb7ba7f" }, "lsp_signature.nvim": { "branch": "master", "commit": "4665921ff8e30601c7c1328625b3abc1427a6143" }, "lualine.nvim": { "branch": "master", "commit": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9" }, - "magma-nvim-goose": { "branch": "main", "commit": "5aafbbd5309e9089d39528f7d982377363c002a2" }, + "magma-nvim-goose": { "branch": "main", "commit": "9a626aab63361d027541d023707f82e28d7f872c" }, "markdown-preview.nvim": { "branch": "master", "commit": "9becceee5740b7db6914da87358a183ad11b2049" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "5230617372e656d4a2e1e236e03bf7e7b4b97273" }, - "mason-null-ls.nvim": { "branch": "main", "commit": "cfbd83909cbc56e2f07cb3f8a03157e069c5c91c" }, - "mason.nvim": { "branch": "main", "commit": "664c987c3b14d2262a4e580f993a3e5045baded0" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "e86a4c84ff35240639643ffed56ee1c4d55f538e" }, + "mason-null-ls.nvim": { "branch": "main", "commit": "ae0c5fa57468ac65617f1bf821ba0c3a1e251f0c" }, + "mason.nvim": { "branch": "main", "commit": "3f6b544c75c01549f7a2a9e395e0f1cea42b25dd" }, "mini.nvim": { "branch": "main", "commit": "296ebbbd3e5ba5e43f5125efe18ad76fe3b632cc" }, - "null-ls.nvim": { "branch": "main", "commit": "bbaf5a96913aa92281f154b08732be2f57021c45" }, + "null-ls.nvim": { "branch": "main", "commit": "db09b6c691def0038c456551e4e2772186449f35" }, "nvim-base16": { "branch": "master", "commit": "4f3aa29f49b38edb6db1c52cea57e64ce3de2373" }, - "nvim-cmp": { "branch": "main", "commit": "8a1694ff330ed58ed29716686fcef79c28090354" }, + "nvim-cmp": { "branch": "main", "commit": "c4e491a87eeacf0408902c32f031d802c7eafce8" }, "nvim-colorizer.lua": { "branch": "master", "commit": "dde3084106a70b9a79d48f426f6d6fec6fd203f7" }, - "nvim-lspconfig": { "branch": "master", "commit": "11a1be0e5f180b57079db56de10a20b4323111ae" }, + "nvim-lspconfig": { "branch": "master", "commit": "dd11ba7b3c8f82d51b6d4dd7d68fce2d78bf78a0" }, "nvim-notify": { "branch": "master", "commit": "ea9c8ce7a37f2238f934e087c255758659948e0f" }, "nvim-surround": { "branch": "main", "commit": "211eaad7c6d01ef4ac02cba9052b3082ec232101" }, - "nvim-toggleterm.lua": { "branch": "main", "commit": "95204ece0f2a54c89c4395295432f9aeedca7b5f" }, - "nvim-tree.lua": { "branch": "master", "commit": "c3c6544ee00333b0f1d6a13735d0dd302dba4f70" }, + "nvim-toggleterm.lua": { "branch": "main", "commit": "b90a1381e9b5b8596f49070ee86c71db267ac868" }, + "nvim-tree.lua": { "branch": "master", "commit": "3b62c6bf2c3f2973036aed609d02fd0ca9c3af35" }, "nvim-treesitter": { "branch": "master", "commit": "cc360a9beb1b30d172438f640e2c3450358c4086" }, - "nvim-treesitter-context": { "branch": "master", "commit": "6eccc445394df5ab9b1c1e2c445c033949a6a784" }, + "nvim-treesitter-context": { "branch": "master", "commit": "6f8f788738b968f24a108ee599c5be0031f94f06" }, "nvim-treesitter-textsubjects": { "branch": "master", "commit": "b913508f503527ff540f7fe2dcf1bf1d1f259887" }, "nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" }, - "nvim-ts-context-commentstring": { "branch": "main", "commit": "0bf8fbc2ca8f8cdb6efbd0a9e32740d7a991e4c3" }, - "nvim-ts-rainbow2": { "branch": "master", "commit": "c00d61ab7517530c49457ba49186776e6611a3e1" }, - "nvim-web-devicons": { "branch": "master", "commit": "14b3a5ba63b82b60cde98d0a40319d80f25e8301" }, - "otter.nvim": { "branch": "main", "commit": "242d180e7f23cc2af6b5d5193bc50909408caef7" }, + "nvim-ts-context-commentstring": { "branch": "main", "commit": "7f625207f225eea97ef7a6abe7611e556c396d2f" }, + "nvim-ts-rainbow2": { "branch": "master", "commit": "b3120cd5ae9ca524af9cb602f41e12e301fa985f" }, + "nvim-web-devicons": { "branch": "master", "commit": "efbfed0567ef4bfac3ce630524a0f6c8451c5534" }, + "otter.nvim": { "branch": "main", "commit": "0a32dbdd75730361a0a2d9746c48d9bdfcdf2cad" }, "playground": { "branch": "master", "commit": "2b81a018a49f8e476341dfcb228b7b808baba68b" }, "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" }, "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, - "quarto-nvim": { "branch": "main", "commit": "d814efc7729f679ae1964248662d18dfad4c9806" }, + "quarto-nvim": { "branch": "main", "commit": "35f86035e7b3846dbf168267ffe0021c3d312259" }, "smartcolumn.nvim": { "branch": "main", "commit": "0c572e3eae48874f25b74394a486f38cadb5c958" }, "symbols-outline.nvim": { "branch": "master", "commit": "512791925d57a61c545bc303356e8a8f7869763c" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9bc8237565ded606e6c366a71c64c0af25cd7a50" }, @@ -74,9 +74,9 @@ "vim-oscyank": { "branch": "main", "commit": "ffe827a27dae98aa826e2295336c650c9a434da0" }, "vim-pandoc-syntax": { "branch": "master", "commit": "4268535e1d33117a680a91160d845cd3833dfe28" }, "vim-spellsync": { "branch": "master", "commit": "3d6dd50de9c4d953cc16638112a6ae196df41463" }, - "which-key.nvim": { "branch": "main", "commit": "e271c28118998c93a14d189af3395812a1aa646c" }, + "which-key.nvim": { "branch": "main", "commit": "bf09a25bdc9a83bcc69d2cf078e680368676513b" }, "wrapping.nvim": { "branch": "master", "commit": "5e87f1424c86c50d3bc205830aa56ed1cad45467" }, "zen-mode.nvim": { "branch": "main", "commit": "6e6c963d70a8e47854fa656987666bfb863f9c4e" }, "zettelkasten.nvim": { "branch": "main", "commit": "0e77624689b470410f5355b613d45219c9350264" }, - "zk-nvim": { "branch": "main", "commit": "5ddb53688035d115f941f0c8255f6e6618e608ac" } + "zk-nvim": { "branch": "main", "commit": "797618aa07f58ceba6f79fb6e777e8e45c51e1ce" } } \ No newline at end of file From 9669b061a3684920330def25876e068a18bb7c8f Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Sun, 23 Jul 2023 19:25:43 +0200 Subject: [PATCH 05/10] sh: Add alias for vim notes Added alias that directly opens my vim notes index. Will only work with my own zettelkasten plugin, however. --- sh/.config/sh/alias | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sh/.config/sh/alias b/sh/.config/sh/alias index d26c91e..42dda26 100644 --- a/sh/.config/sh/alias +++ b/sh/.config/sh/alias @@ -19,6 +19,8 @@ else alias v="vi" alias vim="vi" fi +# open notes with my vim zettelkasten plugin +alias vn='v +"lua require \"zettelkasten\".index_open()"' # exit shell mimicks vim alias :q="exit" From 5712a5bf648735a07eaf2c392045ebb8d9c578c4 Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Sun, 23 Jul 2023 19:28:15 +0200 Subject: [PATCH 06/10] vifm: Improve image preview with fallback If a locally compiled version of viu exists it will use this for full image preview display (full-color image). If it does not exist it will instead fall back to the system viu and use block-wise display for the preview. Location that local viu is expected is `~/.local/bin/viu`. The reason behind this is a bug (or at least unwanted functionality) in viu which makes it not work correctly from within vifm. You will have to fix this issue and compile a local version of viu which vifm assumes to be in the local binary directory and uses to display the pretty images. --- terminal/.config/vifm/vifmrc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/terminal/.config/vifm/vifmrc b/terminal/.config/vifm/vifmrc index 6900451..020f129 100644 --- a/terminal/.config/vifm/vifmrc +++ b/terminal/.config/vifm/vifmrc @@ -444,7 +444,11 @@ filextype *.bmp,*.jpg,*.jpeg,*.png,*.gif,*.xpm \ {View in gpicview} \ gpicview %c, fileviewer *.bmp,*.jpg,*.jpeg,*.png,*.gif,*.xpm - \ viu -b -w %pw -h %ph -s %c + " to circumvent the bug: https://github.com/atanunq/viuer/issues/44 + " thus, change the viuer library and build it with the new lib locally + " put it into the local bin directory and you can see full pics. + " Otherwise falls back to block-sized display + \ exist ~/.local/bin/viu && env -u COLORTERM ~/.local/bin/viu -w %pw -s %c %pd || env -u COLORTERM viu -b -w %pw -s %c %pd " OpenRaster filextype *.ora From 9811d801b82285069f5dcedbd1f3d49db32e3868 Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Sun, 23 Jul 2023 19:29:12 +0200 Subject: [PATCH 07/10] wezterm: Add ability to close current pane Using x you can close the currently highlighted pane. Will not ask confirmation so be careful. --- terminal/.config/wezterm/maps.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terminal/.config/wezterm/maps.lua b/terminal/.config/wezterm/maps.lua index ff220c1..4f749ed 100644 --- a/terminal/.config/wezterm/maps.lua +++ b/terminal/.config/wezterm/maps.lua @@ -3,7 +3,6 @@ local act = wezterm.action local keys = { { key = "O", mods = "CTRL", action = act.ShowDebugOverlay }, - { key = "[", mods = "CTRL", action = act.ScrollToPrompt(-1) }, { key = "]", mods = "CTRL", action = act.ScrollToPrompt(1) }, { -- vertical pane @@ -36,6 +35,7 @@ local keys = { mods = "CTRL", action = act.EmitEvent("ActivatePaneDirection-right"), }, + { key = "x", mods = "LEADER", action = act.CloseCurrentPane({ confirm = false }) }, { key = "z", mods = "LEADER", action = act.TogglePaneZoomState }, { key = " ", mods = "LEADER", action = act.RotatePanes("Clockwise") }, { key = "q", mods = "LEADER", action = act.PaneSelect({ mode = "Activate" }) }, From 4410a3fa49e336368732f3e3079dfcdb1378b37b Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Tue, 25 Jul 2023 12:01:43 +0200 Subject: [PATCH 08/10] nvim: Switch to aerial.nvim for outlines Move from simrats symbols outline which worked very well but had specific issues for displaying markdown outlines as soon as any lsp would attach itself to the same buffer. Aerial seems to not suffer from those issues so this is the one we will go with for now. --- nvim/.config/nvim/lazy-lock.json | 2 +- nvim/.config/nvim/lua/core/mappings.lua | 2 +- nvim/.config/nvim/lua/plugins/ide.lua | 14 +++++++++++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index dccc67c..ee933ff 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -3,6 +3,7 @@ "BetterLua.vim": { "branch": "master", "commit": "d2d6c115575d09258a794a6f20ac60233eee59d5" }, "LuaSnip": { "branch": "master", "commit": "0b4950a237ce441a6a3a947d501622453f6860ea" }, "Navigator.nvim": { "branch": "master", "commit": "91d86506ac2a039504d5205d32a1d4bc7aa57072" }, + "aerial.nvim": { "branch": "master", "commit": "fb1f08c9f90e8b0c04b2f2c5d95d06288a14c5b2" }, "bats.vim": { "branch": "master", "commit": "6a5d2ef22b0ede503d867770afd02ebb1f97b709" }, "cmp-beancount": { "branch": "main", "commit": "da154ea94d598e6649d6ad01efa0a8611eff460d" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, @@ -61,7 +62,6 @@ "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, "quarto-nvim": { "branch": "main", "commit": "35f86035e7b3846dbf168267ffe0021c3d312259" }, "smartcolumn.nvim": { "branch": "main", "commit": "0c572e3eae48874f25b74394a486f38cadb5c958" }, - "symbols-outline.nvim": { "branch": "master", "commit": "512791925d57a61c545bc303356e8a8f7869763c" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9bc8237565ded606e6c366a71c64c0af25cd7a50" }, "telescope.nvim": { "branch": "master", "commit": "776b509f80dd49d8205b9b0d94485568236d1192" }, "twilight.nvim": { "branch": "main", "commit": "8bb7fa7b918baab1ca81b977102ddb54afa63512" }, diff --git a/nvim/.config/nvim/lua/core/mappings.lua b/nvim/.config/nvim/lua/core/mappings.lua index 10ba70b..672188e 100644 --- a/nvim/.config/nvim/lua/core/mappings.lua +++ b/nvim/.config/nvim/lua/core/mappings.lua @@ -204,7 +204,7 @@ map("n", "sm", ":lua MiniMap.toggle()", { silent = true, desc = "tog map("n", "ss", ":lua MiniStarter.open()", { desc = "show startpage" }) -- PLUGIN: symbols-outline.nvim -map("n", "so", "SymbolsOutline", { silent = true, desc = "toggle symbol outline" }) +map("n", "so", "AerialToggle", { silent = true, desc = "toggle symbol outline" }) -- PLUGIN: nvim-tree map("n", "se", "NvimTreeToggle", { silent = true, desc = "toggle filetree" }) diff --git a/nvim/.config/nvim/lua/plugins/ide.lua b/nvim/.config/nvim/lua/plugins/ide.lua index 9111075..32c9a69 100644 --- a/nvim/.config/nvim/lua/plugins/ide.lua +++ b/nvim/.config/nvim/lua/plugins/ide.lua @@ -1,6 +1,18 @@ return { -- vista-like outline view for code - { "simrat39/symbols-outline.nvim", config = true, cmd = "SymbolsOutline" }, + { + "stevearc/aerial.nvim", + config = true, + -- Optional dependencies + dependencies = { + "nvim-treesitter/nvim-treesitter", + "nvim-tree/nvim-web-devicons", + }, + event = "VeryLazy", + opts = { + backends = { "treesitter", "lsp", "markdown", "man" }, + }, + }, -- show a signature whenever editing a function or similar { "ray-x/lsp_signature.nvim", config = true, event = "VeryLazy" }, { From 55518886f8add991fcf71a3583644f3277d1ebb3 Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Tue, 25 Jul 2023 12:02:53 +0200 Subject: [PATCH 09/10] nvim: Add prose headline highlighting Added simple highlighting plugin for prose headlines (and code snippets). Will highlight the whole line a little from the background and provide more space around it so it stands out. Currently works (afaik) for markdown, rmd, norg filetypes. --- nvim/.config/nvim/lazy-lock.json | 1 + nvim/.config/nvim/lua/plugins/prose.lua | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index ee933ff..227ff51 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -28,6 +28,7 @@ "friendly-snippets": { "branch": "main", "commit": "ea84a710262cb2c286d439070bad37d36fd3db25" }, "fwatch.nvim": { "branch": "main", "commit": "a691f7349dc66285cd75a1a698dd28bca45f2bf8" }, "gitsigns.nvim": { "branch": "main", "commit": "bb808fc7376ed7bac0fbe8f47b83d4bf01738167" }, + "headlines.nvim": { "branch": "master", "commit": "ddef41b2664f0ce25fe76520d708e2dc9dfebd70" }, "jupyter-kernel.nvim": { "branch": "main", "commit": "5b409598033884a3d819e2a3bcd1fe340bc8d783" }, "lazy.nvim": { "branch": "main", "commit": "b7303a68309296fb4809c51ce0bf66722e5dc4f7" }, "lightspeed.nvim": { "branch": "main", "commit": "299eefa6a9e2d881f1194587c573dad619fdb96f" }, diff --git a/nvim/.config/nvim/lua/plugins/prose.lua b/nvim/.config/nvim/lua/plugins/prose.lua index 758c8e2..4e44578 100644 --- a/nvim/.config/nvim/lua/plugins/prose.lua +++ b/nvim/.config/nvim/lua/plugins/prose.lua @@ -22,6 +22,13 @@ return { }) end, }, + -- displays prettier headlines mimicking the ones in emacs orgmode + { + "lukas-reineke/headlines.nvim", + dependencies = "nvim-treesitter/nvim-treesitter", + config = true, + ft = writing_ft, + }, -- generate an auto-updating html preview for md files { "iamcco/markdown-preview.nvim", From 17dbb6a5aba29b75667a8a12b74b84fbb1e6d9c3 Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Tue, 25 Jul 2023 12:03:44 +0200 Subject: [PATCH 10/10] nvim: Disable prettier for markdown files --- nvim/.config/nvim/lua/plugins/config/lsp.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/nvim/.config/nvim/lua/plugins/config/lsp.lua b/nvim/.config/nvim/lua/plugins/config/lsp.lua index 65e6c4b..d7d0129 100644 --- a/nvim/.config/nvim/lua/plugins/config/lsp.lua +++ b/nvim/.config/nvim/lua/plugins/config/lsp.lua @@ -154,6 +154,7 @@ require("mason-null-ls").setup({ prettier = function(_, _) null_ls.register(null_ls.builtins.formatting.prettier.with({ extra_filetypes = { "astro" }, + disabled_filetypes = { "markdown" }, timeout = 7000, })) end,