summaryrefslogtreecommitdiff
path: root/ar
diff options
context:
space:
mode:
Diffstat (limited to 'ar')
-rw-r--r--ar/.config/lf/lfrc6
-rw-r--r--ar/.config/shell/bm-dirs1
-rwxr-xr-xar/.local/bin/ecrypt2
-rwxr-xr-xar/.local/bin/mounter8
-rwxr-xr-xar/.local/bin/statusbar/sb-ecrypt2
5 files changed, 14 insertions, 5 deletions
diff --git a/ar/.config/lf/lfrc b/ar/.config/lf/lfrc
index 442c940..9425ee2 100644
--- a/ar/.config/lf/lfrc
+++ b/ar/.config/lf/lfrc
@@ -302,7 +302,7 @@ cmd mpvdir ${{
set -- $fx
setsid -f mpv --x11-name=video --really-quiet -- "$@" </dev/null >/dev/null 2>&1
else
- for file in $(printf '%s\n' *.mp4 *.mkv *.avi *.flv *.webm *.mov *.mpg *.3gp *.ts *.rmvb | sort); do
+ for file in $(printf '%s\n' *.mp4 *.mkv *.avi *.flv *.webm *.mov *.mpg *.3gp *.ts *.rmvb | sort -f); do
[ -e "$file" ] && set -- "$@" "$file"
done
[ -n "$1" ] && setsid -f mpv --x11-name=video --really-quiet -- "$@" </dev/null >/dev/null 2>&1
@@ -387,7 +387,7 @@ cmd select-mime &{{
files=$(find "$PWD" -mindepth 1 -maxdepth 1 \
$([ "$lf_hidden" = false ] && printf '%s\n' ! -name '.*') -print |
file -L --mime-type -f - | grep -v "$pattern" | cut -d: -f1 |
- sort |
+ sort -f |
sed 's/\\/\\\\/g;s/"/\\"/g;s/^/"/;s/$/"/' |
tr '\n' ' ')
;;
@@ -396,7 +396,7 @@ cmd select-mime &{{
files=$(find "$PWD" -mindepth 1 -maxdepth 1 \
$([ "$lf_hidden" = false ] && printf '%s\n' ! -name '.*') -print |
file -L --mime-type -f - | grep "$1" | cut -d: -f1 |
- sort |
+ sort -f |
sed 's/\\/\\\\/g;s/"/\\"/g;s/^/"/;s/$/"/' |
tr '\n' ' ')
;;
diff --git a/ar/.config/shell/bm-dirs b/ar/.config/shell/bm-dirs
index d296c9f..e375815 100644
--- a/ar/.config/shell/bm-dirs
+++ b/ar/.config/shell/bm-dirs
@@ -58,6 +58,7 @@ gpb ${XDG_PUBLICSHARE_DIR:-${HOME}/Public}
gpp ${XDG_PICTURES_DIR:-${HOME}/Pictures}
gpv $HOME/Private
grr ${XDG_PICTURES_DIR:-${HOME}/Pictures}/resources
+gsc $HOME/Secret
gsh $HOME/.ssh
gss ${XDG_PICTURES_DIR:-${HOME}/Pictures}/screenshots
gtc $HOME/Torrents/complete
diff --git a/ar/.local/bin/ecrypt b/ar/.local/bin/ecrypt
index 4240c71..d16d746 100755
--- a/ar/.local/bin/ecrypt
+++ b/ar/.local/bin/ecrypt
@@ -25,7 +25,7 @@ attempt_mount() {
}
targets="$HOME/.secret"
-mounts="$HOME/Private"
+mounts="$HOME/Secret"
pw="default"
[ -d "$targets" ] || mkdir -p "$targets"
[ -d "$mounts" ] || mkdir -p "$mounts"
diff --git a/ar/.local/bin/mounter b/ar/.local/bin/mounter
index c8eabbf..e62f61b 100755
--- a/ar/.local/bin/mounter
+++ b/ar/.local/bin/mounter
@@ -83,6 +83,13 @@ done | filter)"
# Get all normal, non-encrypted or decrypted partitions that are not mounted.
normalparts="$(echo "$lsblkoutput" | grep -v crypto_LUKS | grep -v 'LVM2_member' | grep -v 'part 1M' | grep 'part\|rom\|crypt' | sed "s/^/💾 /" | filter)"
+# Get unpartitioned raw disks (disks with no partition children that are not mounted).
+rawdisks="$(echo "$lsblkoutput" | awk '
+ $3=="disk" {disks[$2]=$0}
+ $3=="part" {dev=$2; gsub(/p?[0-9]+$/, "", dev); haspart[dev]=1}
+ END {for (d in disks) if (!(d in haspart)) print disks[d]}
+' | sed "s/^/💾 /" | filter)"
+
# Get all available IP addresses with open Samba shares in the wlan0 subnet, excluding eth0 IP
smbips="$(sudo arp-scan --interface=eth0 --interface=wlan0 --localnet | grep -vEi '(EFM Networks|DUP:)' | awk '/^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+/{print $1}')"
@@ -140,6 +147,7 @@ alldrives="$(echo "$phones
$iphones
$unopenedluks
$normalparts
+$rawdisks
$smbs" | sed "/^$/d;s/ *$//")"
# Quit the script if a sequential command fails.
diff --git a/ar/.local/bin/statusbar/sb-ecrypt b/ar/.local/bin/statusbar/sb-ecrypt
index f07b994..9ba6e26 100755
--- a/ar/.local/bin/statusbar/sb-ecrypt
+++ b/ar/.local/bin/statusbar/sb-ecrypt
@@ -7,4 +7,4 @@ case $BLOCK_BUTTON in
6) setsid -f "$TERMINAL" -e "$EDITOR" "$0" ;;
esac
-mount | grep -q "$HOME/Private" && echo "🔑" || echo "🔒"
+mount | grep -q "$HOME/Secret" && echo "🔑" || echo "🔒"