From 3dd6e7b25449b8de2822db0cc94c9d322c9df30d Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Sat, 8 Mar 2025 19:32:50 +0100 Subject: [PATCH 1/8] qute: Update deprecated taskadd mapping Uses (not-so-) new 'cmd-set-text' syntax instead of the deprecated version. Retains all other functionality. --- qutebrowser/config/maps.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qutebrowser/config/maps.py b/qutebrowser/config/maps.py index ccc757a..b629f30 100644 --- a/qutebrowser/config/maps.py +++ b/qutebrowser/config/maps.py @@ -94,7 +94,7 @@ config.bind( "config-cycle content.user_stylesheets " + 'stylesheets/stylesheet.css ""', ) -config.bind(leader + "a", "set-cmd-text -s :taskadd") +config.bind(leader + "a", "cmd-set-text -s :taskadd") # Enable and disable javascript config.bind(leader + "js", "config-cycle content.javascript.enabled true false") From c30ad4ba4b96cb2e07d0e7c5f75c7c8975f3485b Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Sat, 8 Mar 2025 19:32:50 +0100 Subject: [PATCH 2/8] task: Fix path separator in taskrc Remove redundant path separator at end of data path. --- office/.config/task/taskrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/office/.config/task/taskrc b/office/.config/task/taskrc index cbd5951..8539bd5 100644 --- a/office/.config/task/taskrc +++ b/office/.config/task/taskrc @@ -10,7 +10,7 @@ # Use the command 'task show' to see all defaults and overrides # Files -data.location=$XDG_DATA_HOME/task/ +data.location=$XDG_DATA_HOME/task # disable case sensitivity search.case.sensitive=no From bcf94703ec92023d2be589fdf7bda4a4ef13458d Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Wed, 30 Apr 2025 13:44:55 +0200 Subject: [PATCH 3/8] nvim: Update plugins --- nvim/.config/nvim/lazy-lock.json | 39 ++++++++++++++++---------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index d22daa0..263c56a 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -8,21 +8,21 @@ "cmp-calc": { "branch": "main", "commit": "5947b412da67306c5b68698a02a846760059be2e" }, "cmp-pandoc.nvim": { "branch": "main", "commit": "30faa4456a7643c4cb02d8fa18438fd484ed7602" }, "cmp-spell": { "branch": "master", "commit": "694a4e50809d6d645c1ea29015dad0c293f019d6" }, - "codecompanion.nvim": { "branch": "main", "commit": "88111765a8d7d1f9b359f74bb6ec44e4c0f5f0b2" }, + "codecompanion.nvim": { "branch": "main", "commit": "73bac3b52d9b7f52e89ac6698dd7df8962f0454c" }, "conform.nvim": { "branch": "master", "commit": "a6f5bdb78caa305496357d17e962bbc4c0b392e2" }, - "copilot.vim": { "branch": "release", "commit": "a9228e015528c9307890c48083c925eb98a64a79" }, + "copilot.vim": { "branch": "release", "commit": "7167958954532a0a1b83f2db2f591b43aebff44c" }, "dial.nvim": { "branch": "master", "commit": "2c7e2750372918f072a20f3cf754d845e143d7c9" }, "dressing.nvim": { "branch": "master", "commit": "3a45525bb182730fe462325c99395529308f431e" }, "fidget.nvim": { "branch": "main", "commit": "b61e8af9b8b68ee0ec7da5fb7a8c203aae854f2e" }, "flash.nvim": { "branch": "main", "commit": "ec0bf2842189f65f60fd40bf3557cac1029cc932" }, - "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, + "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, "fwatch.nvim": { "branch": "main", "commit": "a691f7349dc66285cd75a1a698dd28bca45f2bf8" }, - "fzf-lua": { "branch": "main", "commit": "6488ada2f376e47789391dc353b6d91a3f9de6f6" }, + "fzf-lua": { "branch": "main", "commit": "47b85a25c0c0b2c20b4e75199ed01bb71e7814f5" }, "git-conflict.nvim": { "branch": "main", "commit": "4bbfdd92d547d2862a75b4e80afaf30e73f7bbb4" }, "gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" }, "glance.nvim": { "branch": "master", "commit": "cb19b86349cbe634eec0ea768b9a27fdd6d24f34" }, - "grug-far.nvim": { "branch": "main", "commit": "9411a99390014231753bbb7a2afe6886fda99257" }, - "helpview.nvim": { "branch": "main", "commit": "49e8d4782ae73274a35d606fde2844b6e958a0c7" }, + "grug-far.nvim": { "branch": "main", "commit": "6ff8a205a29db3a9b08e5debe09452b4d6fd6591" }, + "helpview.nvim": { "branch": "main", "commit": "493060153bc99927a64b203ea2ee49bb2884c190" }, "hunk.nvim": { "branch": "master", "commit": "b475ba0011e4b8ef7d7ddecd9764ee1a5f41366d" }, "image.nvim": { "branch": "master", "commit": "a4638ec549c6aa56264cb0371255192ff37a8a90" }, "img-clip.nvim": { "branch": "main", "commit": "0bb8b5ced45c2672c70184c87d014194b0705815" }, @@ -30,7 +30,7 @@ "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lazydev.nvim": { "branch": "main", "commit": "f59bd14a852ca43db38e3662395354cb2a9b13e0" }, "ltex_extra.nvim": { "branch": "dev", "commit": "09dc879b1873001f855bca5ad1f024ca15b9bbaf" }, - "lualine.nvim": { "branch": "master", "commit": "482ae358c67aec2a4939d68a1a4fe4c8064ccd16" }, + "lualine.nvim": { "branch": "master", "commit": "15884cee63a8c205334ab13ab1c891cd4d27101a" }, "luvit-meta": { "branch": "main", "commit": "1df30b60b1b4aecfebc785aa98943db6c6989716" }, "magick": { "branch": "master", "commit": "aa96e77b6d08983707941727a574752445de0d70" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, @@ -42,33 +42,34 @@ "mdeval.nvim": { "branch": "master", "commit": "0e1b248db174a9659a9ab16eb8c90ff3aec55264" }, "mini.nvim": { "branch": "main", "commit": "0420076298c4457f200c2de468f65d080597a347" }, "molten-nvim": { "branch": "main", "commit": "a286aa914d9a154bc359131aab788b5a077a5a99" }, - "neo-tree.nvim": { "branch": "main", "commit": "9b5d67119c46e3262ffe1508fe6d8540b79ad75d" }, + "neo-tree.nvim": { "branch": "main", "commit": "1ef260eb4f54515fe121a2267b477efb054d108a" }, "neogen": { "branch": "main", "commit": "b2e78708876f4da507839726816010a68e33fec8" }, "neotest": { "branch": "master", "commit": "d66cf4e05a116957f0d3a7755a24291c7d1e1f72" }, "neotest-python": { "branch": "master", "commit": "a2861ab3c9a0bf75a56b11835c2bfc8270f5be7e" }, + "neowarrior.nvim": { "branch": "develop", "commit": "47c79a521be5b661d4761cbf9ac65a61dbbb359f" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-FeMaco.lua": { "branch": "main", "commit": "96bbf843595dbe865838b3f2484b73557f34700c" }, "nvim-colorizer.lua": { "branch": "master", "commit": "517df88cf2afb36652830df2c655df2da416a0ae" }, "nvim-coverage": { "branch": "main", "commit": "a939e425e363319d952a6c35fb3f38b34041ded2" }, - "nvim-lint": { "branch": "master", "commit": "81e8ba7655cc4395b1092ef4e1b6e83f54cd54ad" }, - "nvim-lspconfig": { "branch": "master", "commit": "6b63bdf2399b9bedf93297d98419550523a9ad68" }, + "nvim-lint": { "branch": "master", "commit": "9dfb77ef6c5092a19502883c02dc5a02ec648729" }, + "nvim-lspconfig": { "branch": "master", "commit": "fa2662510d30b06168b6e2e6915518decde6bbac" }, "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, - "nvim-surround": { "branch": "main", "commit": "caf6f633d4d77a29b6e265b560c5a035d171a913" }, + "nvim-surround": { "branch": "main", "commit": "0e62500b98f4513feaaf7425c135472457ea5b7d" }, "nvim-toggleterm.lua": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" }, - "nvim-treesitter": { "branch": "master", "commit": "523a9e148919f58eb5a013f76787e57696e00c93" }, - "nvim-treesitter-context": { "branch": "master", "commit": "a25c56c96c3bcc4be6245f8941108330100de330" }, - "nvim-treesitter-endwise": { "branch": "master", "commit": "63a8f855c6b6019ef9f7f63b5c59b8a00c215d0d" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "9937e5e356e5b227ec56d83d0a9d0a0f6bc9cad4" }, + "nvim-treesitter": { "branch": "master", "commit": "94ea4f436d2b59c80f02e293466c374584f03b8c" }, + "nvim-treesitter-context": { "branch": "master", "commit": "6daca3ad780f045550b820f262002f35175a6c04" }, + "nvim-treesitter-endwise": { "branch": "master", "commit": "8b6436303dda9ce6ed4b3733fd15703eb3589c36" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "ed373482db797bbf71bdff37a15c7555a84dce47" }, "nvim-treesitter-textsubjects": { "branch": "master", "commit": "abcbb0e537c9c24800b03b9ca33bee5806604629" }, "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, - "otter.nvim": { "branch": "main", "commit": "b00b642eb990a1a48cbe75aa73d6cb8be9cc4812" }, + "otter.nvim": { "branch": "main", "commit": "a7766be1592bfa9e88e67512646e343d0b4b2ff5" }, "peek.nvim": { "branch": "master", "commit": "5820d937d5414baea5f586dc2a3d912a74636e5b" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, - "quarto-nvim": { "branch": "main", "commit": "3c25bf3e9afff07c4396d98f0b2c39bc994037ad" }, + "quarto-nvim": { "branch": "main", "commit": "5325af3731ac9840b308791f08ad660958d76163" }, "rainbow-delimiters.nvim": { "branch": "master", "commit": "1ab18259472d9fe5756750fec722c31bab1712da" }, - "render-markdown": { "branch": "main", "commit": "bfbb46af43c95115a06419ef290e16e2fa2a1941" }, + "render-markdown": { "branch": "main", "commit": "a2c2493c21cf61e5554ee8bc83da75bd695921da" }, "smartcolumn.nvim": { "branch": "main", "commit": "d01b99355c7fab13233f48d0f28dc097e68a03f7" }, "stickybuf.nvim": { "branch": "master", "commit": "2160fcd536d81f5fa43f7167dba6634e814e3154" }, "texpresso.vim": { "branch": "main", "commit": "907838c08bbf99ad6bed3c908f1d0551a92ab4e0" }, @@ -76,7 +77,7 @@ "tree-sitter-nu": { "branch": "main", "commit": "d5c71a10b4d1b02e38967b05f8de70e847448dd1" }, "trouble.nvim": { "branch": "main", "commit": "748ca2789044607f19786b1d837044544c55e80a" }, "twilight.nvim": { "branch": "main", "commit": "8bb7fa7b918baab1ca81b977102ddb54afa63512" }, - "typst-preview.nvim": { "branch": "master", "commit": "ddcc71126f910ec83037622bc8d506f91a290ade" }, + "typst-preview.nvim": { "branch": "master", "commit": "2503b188cd2a17ce44fdd21a944a93335e935215" }, "undotree": { "branch": "main", "commit": "eab459ab87dd249617b5f7187bb69e614a083047" }, "vifm.vim": { "branch": "master", "commit": "617e3dc7c9af1f03cc664124aff2fe98fafcf1b2" }, "vim-criticmarkup": { "branch": "master", "commit": "d15dc134eb177a170c79f6377f81eb02a9d20b02" }, From bd1fe2eb1f14a80d9d9c5ecac2db1843438d0e9d Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Sat, 8 Mar 2025 19:32:50 +0100 Subject: [PATCH 4/8] jrnl: Update version number --- writing/jrnl/config/jrnl/jrnl.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/writing/jrnl/config/jrnl/jrnl.yaml b/writing/jrnl/config/jrnl/jrnl.yaml index 20dc11c..90d19c9 100644 --- a/writing/jrnl/config/jrnl/jrnl.yaml +++ b/writing/jrnl/config/jrnl/jrnl.yaml @@ -16,4 +16,4 @@ linewrap: 79 tagsymbols: + template: false timeformat: '%F %r' -version: v4.2 +version: v4.1 From 2c72d2ee1f3f2124b548b04682cb87ea3d41c900 Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Mon, 5 May 2025 11:47:47 +0200 Subject: [PATCH 5/8] river: Set Adwaita xcursor theme if available Currently we do not set any cursor theme in our river compositor. This commit changes it to be set if the Adwaita/cursor icon directory is available. This does _not_ mean all applications will use Adwaita cursors unfortunately. In Wayland applications themselves decide what to do, so some applications do not respect the setting, e.g. GTK applications. See the following links for more info: https://reddit.com/r/voidlinux/comments/wnfwy5/some_apps_not_inheriting_mouse_cursor_theme/ https://codeberg.org/river/wiki https://codeberg.org/river/river/issues?state=all&type=all&labels=&milestone=0&project=0&assignee=0&poster=0&q=xcursor --- desktop/.config/river/init | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/desktop/.config/river/init b/desktop/.config/river/init index 1f142af..50233e6 100755 --- a/desktop/.config/river/init +++ b/desktop/.config/river/init @@ -50,6 +50,10 @@ riverctl spawn "dbus-update-activation-environment SEATD_SOCK DISPLAY WAYLAND_DI riverctl focus-follows-cursor normal riverctl set-cursor-warp on-output-change riverctl hide-cursor when-typing enabled + +if [ -d "/usr/share/icons/Adwaita/cursors" ]; then + riverctl xcursor-theme Adwaita +fi riverctl attach-mode bottom # Set background and border color From 9db181c35e95907bf119b7c4641bdc02956a6869 Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Thu, 8 May 2025 08:43:50 +0200 Subject: [PATCH 6/8] task: Change 'tod' alias to 'td' for task today --- office/.config/sh/alias.d/taskwarrior.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/office/.config/sh/alias.d/taskwarrior.sh b/office/.config/sh/alias.d/taskwarrior.sh index 526c452..ad7c6ff 100644 --- a/office/.config/sh/alias.d/taskwarrior.sh +++ b/office/.config/sh/alias.d/taskwarrior.sh @@ -21,8 +21,8 @@ alias tal="task log" alias tan="task annotate" alias tn="task next +READY" +alias td="task +TODAY or +OVERDUE" alias tun="task next urgency \> 4" -alias tod="task +TODAY or +OVERDUE" if exist timew; then alias tra="task active && timew" From 67ac2da785d16673b6b1cf7692044732e3d605dd Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Fri, 9 May 2025 08:54:22 +0200 Subject: [PATCH 7/8] vifm: Remove chafa preview iterm hard-coding We are using chafa to preview the image and video files but would always default to the iterm implementation. This has been removed: The foot terminal does not support iTerm and hard-coding makes us too tightly coupled to wezterm. But even wezterm functions well with chafa without the forced iterm usage - we simply use sixels instead. Remove video preview frame hard-coded file caching and instead pipe directly into chafa preview. --- terminal/.config/vifm/vifmrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/terminal/.config/vifm/vifmrc b/terminal/.config/vifm/vifmrc index a667bdb..dad0dc3 100644 --- a/terminal/.config/vifm/vifmrc +++ b/terminal/.config/vifm/vifmrc @@ -442,7 +442,7 @@ fileviewer *.avi,*.mp4,*.wmv,*.dat,*.3gp,*.ogv,*.mkv,*.mpg,*.mpeg,*.vob, \*.fl[icv],*.m2v,*.mov,*.webm,*.ts,*.mts,*.m4v,*.r[am],*.qt,*.divx, \*.as[fx] " needs to be %pu uncached or it flickers itself into oblivion :( - \ exist chafa && ffmpeg -y -hide_banner -loglevel panic -i %c -ss 00:00:01.000 -vframes 1 /tmp/tempfile.jpg && chafa -f iterm --size %pwx%ph /tmp/tempfile.jpg %pd %pu %N || echo chafa not found, + \ exist chafa && ffmpeg -v quiet -y -hide_banner -loglevel panic -ss 00:00:01.000 -i %c -frames:v 1 -c:v png -f image2pipe - | chafa --size %pwx%ph %pd %pu %N || echo chafa not found, \ ffprobe -pretty %c 2>&1 " Web @@ -484,7 +484,7 @@ filextype *.bmp,*.jpg,*.jpeg,*.png,*.gif,*.xpm \ gpicview %c, fileviewer *.bmp,*.jpg,*.jpeg,*.png,*.gif,*.xpm " needs to be %pu uncached or it flickers itself into oblivion :( - \ exist chafa && chafa -f iterm --size %pwx%ph %c:p %pd %pu %N || echo chafa not found + \ exist chafa && chafa --size %pwx%ph %c:p %pd %pu %N || echo chafa not found set previewoptions+=graphicsdelay:0 " OpenRaster From 84ab839612e962eb4937499364f88cc343bcf472 Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Fri, 9 May 2025 08:54:22 +0200 Subject: [PATCH 8/8] vifm: Add pdf and webp preview Added pdf previews using pdftoppm to convert into chafa-readable format, directly piped to the previewer. --- terminal/.config/vifm/vifmrc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/terminal/.config/vifm/vifmrc b/terminal/.config/vifm/vifmrc index dad0dc3..aefa0ec 100644 --- a/terminal/.config/vifm/vifmrc +++ b/terminal/.config/vifm/vifmrc @@ -401,7 +401,8 @@ filextype ,*.pdf \ { edit text content } \ pdftotext -nopgbrk %c - | nvim fileviewer ,*.pdf - \ pdftotext -nopgbrk %c - + \ exist chafa && exist pdftoppm && pdftoppm -q -f 1 -singlefile -jpeg %c | chafa --size %pwx%ph %pd %pu %N, + \ exist pdftotext && pdftotext -nopgbrk %c - || echo No compatible viewer found. " PostScript filextype *.ps,*.eps,*.ps.gz @@ -439,7 +440,7 @@ filextype *.avi,*.mp4,*.wmv,*.dat,*.3gp,*.ogv,*.mkv,*.mpg,*.mpeg,*.vob, \ {View using Dragon} \ dragon %f:p, fileviewer *.avi,*.mp4,*.wmv,*.dat,*.3gp,*.ogv,*.mkv,*.mpg,*.mpeg,*.vob, - \*.fl[icv],*.m2v,*.mov,*.webm,*.ts,*.mts,*.m4v,*.r[am],*.qt,*.divx, + \*.fl[icv],*.m2v,*.mov,*.webm,*.webp,*.ts,*.mts,*.m4v,*.r[am],*.qt,*.divx, \*.as[fx] " needs to be %pu uncached or it flickers itself into oblivion :( \ exist chafa && ffmpeg -v quiet -y -hide_banner -loglevel panic -ss 00:00:01.000 -i %c -frames:v 1 -c:v png -f image2pipe - | chafa --size %pwx%ph %pd %pu %N || echo chafa not found,