swayidle: Tweak notifications

tree/.config/nushell/env.nu

@@ -107,6 +107,9 @@ $env.MOZ_ENABLE_WAYLAND = "1"
 $env.VOLTA_HOME = $"($env.HOME)/.volta"
 $env.CARGO_TARGET_DIR = $"($env.HOME)/.cargo/target"
 
+# For the mullvadvpn-app setup-rust git hook
+$env.MULLVAD_SETUP_PLATFORM = "linux"
+
 mkdir ~/.cache/starship
 starship init nu | save -f ~/.cache/starship/init.nu
 zoxide init nushell | save -f ~/.cache/zoxide.nu

tree/.config/swayidle/config.tpl

@@ -1,11 +1,11 @@
 before-sleep 'loginctl lock-session'
 
 {% if hostname == "sputnik" %}
-timeout 1770 'notify-send "Locking in 30s"'
+timeout 1770 'notify-send --app-name=swayidle "Locking in 30s"'
 timeout 1800 'loginctl lock-session'
 {% else %}
-timeout 530 'notify-send "Locking in 30s"'
+timeout  530 'notify-send --app-name=swayidle "Locking in 30s"'
-timeout 600 'loginctl lock-session'
+timeout  600 'loginctl lock-session'
 {% end %}
 
 {% if hostname == "buran" %}

tree/.local/bin/mullpod

@@ -9,9 +9,9 @@ set custom_tag "$base_tag-extra"
 
 # check if image exists
 if not podman image inspect $custom_tag >/dev/null
-	echo "Building custom image"
+    echo "Building custom image"
-	set tmp_dockerfile (mktemp)
+    set tmp_dockerfile (mktemp)
-	echo "
+    echo "
 FROM $base_tag
 
 RUN apt-get update -y && apt-get upgrade -y && apt-get install -y \
@@ -37,17 +37,16 @@ RUN chmod +x /entrypoint.sh
 
 ENTRYPOINT [\"/entrypoint.sh\"]
 
-" > $tmp_dockerfile
+" >$tmp_dockerfile
 
-
+    podman build -f $tmp_dockerfile -t $custom_tag || exit 1
-	podman build -f $tmp_dockerfile -t $custom_tag || exit 1
+    rm $tmp_dockerfile
-	rm $tmp_dockerfile
 end
 
 podman run --rm -it \
-	--hostname mullpod \
+    --hostname mullpod \
-	-v .:/build \
+    -v .:/build \
-	-v cargo-target:/cargo-target:Z \
+    -v cargo-target:/cargo-target:Z \
-	-v cargo-registry:/root/.cargo/registry:Z \
+    -v cargo-registry:/root/.cargo/registry:Z \
-	-v gradle-cache:/root/.gradle:Z \
+    -v gradle-cache:/root/.gradle:Z \
-	$custom_tag mold -run fish
+    $custom_tag fish

tree/.local/nu/git.nu

@@ -18,3 +18,26 @@ def gitfixremote [
 		print $"Unknown host: ($parsed.host)"
 	}
 }
+
+def "git sha" [
+	--no-copy(-c), # don't copy to clipboard
+	--full(-f),    # output the complete sha
+]: nothing -> record {
+	mut sha = (git show -q | lines |  parse "commit {sha}" | first);
+
+	if ($sha | is-empty) {
+		return;
+	}
+
+	$sha = $sha.sha
+
+	if not $full {
+		$sha = ($sha | str substring 0..7)
+	}
+
+	if not $no_copy {
+		$sha | pbc
+	}
+
+	$sha
+}