Merge branch 'main' of https://git.snaile.de/luca/dotfiles

common/.config/lf/lfrc

@@ -200,11 +200,15 @@ cmd extract ${{
     done
 }}
 
-cmd new_lf_term &{{
-    mapcmd='map q $sh -c "$SHELL; kill $id"'
-    $TERMINAL -e lfX -command "$mapcmd"
+cmd pdf_merge ${{
+    gs -dBATCH -dNOPAUSE -q -sDEVICE=pdfwrite -sOutputFile="${1:-merged.pdf}" $fx
 }}
 
+# cmd new_lf_term &{{
+#     mapcmd='map q $sh -c "$SHELL; kill $id"'
+#     $TERMINAL -e lfX -command "$mapcmd"
+# }}
+#
 cmd confirm_delete %{{
     echo Delete? [y/N] && read -r v
     echo
@@ -299,7 +303,7 @@ map T trash
 map u :clear; unselect
 map <c-v> pushedit
 map v invert
-map W new_lf_term
+# map W new_lf_term
 map x $$f
 map X !$f
 map <c-y> scroll-down

common/.config/lf/preview

@@ -37,9 +37,9 @@ cached_text() {
 
 cached_image() {
     if [ -f "$CACHE" ]; then
-        $CHAFA "$CACHE" && exit 1
+        $CHAFA "$CACHE"
     else
-        run "$@" | tee -p "$CACHE" | $CHAFA && exit 1
+        run "$@" | tee -p "$CACHE" | $CHAFA
     fi
 }
 
@@ -78,7 +78,7 @@ mimetest() {
             ;;
         */epub+zip) cached_image gnome-epub-thumbnailer -s 1024 "$f" "$CACHE" ;;
         image/svg+xml) cached_image inkscape --convert-dpi-method=none -o "${CACHE}.png" --export-overwrite -D --export-png-color-mode=RGBA_16 "$f" ;;
-        image/*) $CHAFA "$f" && exit 1 ;;
+        image/*) $CHAFA "$f" ;;
         */pdf) cached_image pdftoppm -jpeg -f 1 -singlefile "$f" ;;
         video/*) cached_image ffmpegthumbnailer -s 0 -i "$f" -o "/dev/stdout" ;;
         */vnd.oasis.opendocument.text) cached_text odt2txt "$f" ;;

common/.config/nvim/init.lua

@@ -29,7 +29,6 @@ require("lazy").setup({
         { import = "lazyvim.plugins.extras.editor.overseer" },
         -- { import = "lazyvim.plugins.extras.editor.refactoring" },
         { import = "lazyvim.plugins.extras.formatting.prettier" },
-        { import = "lazyvim.plugins.extras.formatting.black" },
         { import = "lazyvim.plugins.extras.lang.ansible" },
         { import = "lazyvim.plugins.extras.lang.docker" },
         { import = "lazyvim.plugins.extras.lang.git" },

common/.config/nvim/lua/config/options.lua

@@ -13,3 +13,4 @@ o.conceallevel = 0
 g.lazyvim_php_lsp = "intelephense"
 g.lazyvim_python_lsp = "basedpyright"
 g.ai_cm = true
+g.autoformat = false

common/.config/zsh/config/aliases.zsh

@@ -18,7 +18,8 @@ alias \
     ffmpeg="ffmpeg -hide_banner" \
     nvidia-settings="nvidia-settings --config=\$XDG_CONFIG_HOME/nvidia/settings" \
     less="less -r" \
-    today="date +'%X %x'"
+    today="date +'%X %x'" \
+    ytm="yt-dlp --extract-audio --audio-format mp3 --audio-quality 0"
 
 # Shortening
 alias \

common/.local/libexec/dwm/dmenuunicode

@@ -3,7 +3,7 @@
 # The famous "get a menu of emojis to copy" script.
 
 # Get user selection via dmenu from emoji file.
-chosen=$(cut -d ';' -f1 ~/.local/share/chars/* | dmenu -i -l 30 | sed "s/ .*//")
+chosen=$(cut -d' ' -f1 ~/.local/share/emoji | dmenu -i -l 30 | sed "s/ .*//")
 
 # Exit if none chosen.
 [ -z "$chosen" ] && exit