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

.config/lf/lfrc

@@ -15,35 +15,15 @@ set promptfmt "\033[34;1m%u\033[36m@\033[34m%h \033[35m[\033[0;1m%d\033[35m]\033
 cmd open $set -f; rifle -c $XDG_CONFIG_HOME/lf/rifle.conf -p 0 $fx; clear
 
 cmd open-with ${{
-    clear
-    set -f
-    rifle -c $XDG_CONFIG_HOME/lf/rifle.conf -l $fx
-    read -p "Open with: " method
+    method=$(rifle -c $XDG_CONFIG_HOME/lf/rifle.conf -l $fx | fzf | cut -d':' -f1)
     rifle -c $XDG_CONFIG_HOME/lf/rifle.conf -p $method $fx
-    clear
 }}
 
-cmd mkdir $mkdir -p "$(echo $* | tr ' ' '\ ')"
+cmd mkdir &mkdir -p "$(echo $* | tr ' ' '\ ')"
 
-cmd extract ${{
-    clear; tput cup $(($(tput lines)/3)); tput bold
-    set -f
-    printf "%s\n\t" "$fx"
-    printf "extract?[y/N]"
-    read ans
-    clear
-    [ $ans = "y" ] && aunpack $fx
-}}
+cmd extract $aunpack $fx
 
-cmd delete ${{
-    clear; tput cup $(($(tput lines)/3)); tput bold
-    set -f
-    printf "%s\n\t" "$fx"
-    printf "delete?[y/N]"
-    read ans
-    clear
-    [ $ans = "y" ] && rm -rf -- $fx
-}}
+cmd delete &rm -rf -- $fx
 
 cmd trash %{{
     for f in $fx; do
@@ -52,21 +32,19 @@ cmd trash %{{
     done
 }}
 
-cmd rsyncto ${{
-    clear; tput cup $(($(tput lines)/3)); tput bold
-    set -f
-    clear; echo -n "rsync -azvhP <selected files> "
-    read dest
+cmd lazygit ${{
     clear
-    for x in $fx; do
-        eval rsync -azvhP \"$x\" \"$dest\"
-    done &&
-        notify-send "File(s) rsynced." "File(s) copies to $dest."
+    if [ ! -e "$PWD/.git" ]; then
+        echo "Not in a git repository. Create a new git repository? (y/n): "
+        [ $(echo "y\nn" | fzf) = "y" ] && git init && lazygit -p $PWD
+    else
+        lazygit -p $PWD
+    fi
 }}
 
 # y (select for copy) and P to paste soft-link
 # d (select for cut) and P to paste hard-link
-cmd link %{{
+cmd link &{{
     set -- $(cat ~/.local/share/lf/files)
     mode="$1"
     shift
@@ -116,7 +94,7 @@ cmd paste &{{
     lf -remote "send clear"
 }}
 
-cmd dupe %{{
+cmd dupe &{{
     for file in $fx; do
         find "$PWD" "$file" -maxdepth 0 | grep -oP '(?<=.\.~)\d+(?=~$)' | sort -n | tail -1 | (
             ext=$(($(cat /dev/stdin)+1))
@@ -182,7 +160,7 @@ map <c-e> extract
 map R rsyncto
 map P link
 # map S share
-map <c-g> $lazygit
+map <c-g> lazygit
 map <c-v> push :!$EDITOR<space>
 map <c-n> push :mkdir<space>
 map <c-t> push :&touch<space>
@@ -192,6 +170,7 @@ map <enter> shell
 map x $$f
 map X !$f
 map o open-with
+map O $less $f
 map a :rename; cmd-home # rename from beginning
 map r :rename; cmd-end # rename from end
 map i :rename # before extension
@@ -203,7 +182,8 @@ map n &echo $f | xclip -r -selection c
 map <esc> quit
 map g/ cd "/" 
 map W &setsid $TERMINAL -e lf
-map e edit
+map e $$EDITOR $f
+map E $sudo -e $f
 
 # Load bookmark shortcuts
 source "~/.config/lf/shortcutrc"

.config/zsh/configs/aliases

@@ -44,7 +44,7 @@ if command -v apt 1>/dev/null 2>&1; then
         arein="apt reinstall" \
         aur="apt autoremove" \
         aup="apt upgrade" \
-        ase="apt search" \
+        ase="\\apt search" \
         ash="apt show"
 fi
 

.config/zsh/configs/functions

@@ -1,2 +0,0 @@
-# vim: set ft=sh
-

.gitmodules

@@ -19,3 +19,6 @@
 [submodule ".local/src/st"]
 	path = .local/src/st
 	url = https://git.snaile.de/luca/st
+[submodule ".local/src/dwmblocks-async"]
+	path = .local/src/dwmblocks-async
+	url = https://git.snaile.de/luca/dwmblocks-async

.local/bin/dotsync

@@ -42,10 +42,6 @@ else
     stow -R -t "$HOME" dots || printf "%b" "${RED}Failed to run stow!$NC\n"
 fi
 
-printf "%b" "$BOLD${BLUE}Generating firefox profiles...$NC\n"
-"$DOTS_DIR/.mozilla/firefox/generate.sh"
-printf "\n"
-
 printf "%b" "${BOLD}Recompile/Install src files? ${GREEN}Y/N?$NC\n"
 read -r ans
 [ "$ans" = "y" ] && for f in "$DOTS_DIR"/.local/src/*; do

.local/bin/statusbar/sb-date

@@ -0,0 +1,2 @@
+#!/bin/sh
+date +'%X %x'

.local/bin/statusbar/sb-disk

@@ -5,8 +5,9 @@ big="\033[12m"
 IFS='
 '
 
+types=${1:-ext2,ext3,ext4,xfs,btrfs,vfat}
 first=true
-for mnt in $(findmnt --real -Py -t ext2,ext3,ext4,xfs,btrfs,vfat); do
+for mnt in $(findmnt -Py -t $types); do
     [ "$first" = "false" ] && printf " | "
     eval $mnt
     [ -d "$TARGET" ] || break

.local/bin/statusbar/sb-packages

@@ -17,5 +17,5 @@ if command -v apt 1>/dev/null 2>&1; then
         out="$out$i/"
     done
 
-    [ -n "$updates_available" ] && printf "%b" "$big$icon$reset $(echo "$out" | sed 's/\/$//')"
+    [ -n "$updates_available" ] && printf "%b" "$big$icon$reset $(echo "$out" | sed 's/\/$//')" || exit 0
 fi

.local/bin/trash-restore

@@ -7,7 +7,6 @@ getfsroot() {
 list() {
 	# 1st arg is trash files directory
 	# 2nd arg is directory to match trash files for
-    echo "$1 $2" > /dev/stderr
 	[ ! "$(command ls -A "$1")" ] && exit 1
 	for file in "$1"/*; do
 		[ "$(head -1 "$file")" = "[Trash Info]" ] &&

.local/src/dwmblocks-async

@@ -0,0 +1 @@
+Subproject commit f8c27ebf0e59cdf2536f5ba8b0019eded565a445