commit 88abf33335ff53bc08460465f57859d93fc85b82
parent f8edc2355b3add6b551c158e65c447170ffd1b9b
Author: mtmn <miro@haravara.org>
Date: Sat, 2 May 2026 20:24:05 +0200
chore: devshell prompt, void stuff
Diffstat:
6 files changed, 30 insertions(+), 16 deletions(-)
diff --git a/flake.nix b/flake.nix
@@ -142,13 +142,17 @@
nodes = deployNodes;
};
- devShells = lib.genAttrs ["x86_64-linux"] (system: {
+ devShells = lib.genAttrs ["x86_64-linux" "aarch64-darwin"] (system: {
default = nixpkgs.legacyPackages.${system}.mkShell {
- packages = [
- deploy-rs.packages.${system}.deploy-rs
- home-manager.packages.${system}.home-manager
- nixpkgs.legacyPackages.${system}.nh
- ];
+ packages =
+ [
+ home-manager.packages.${system}.home-manager
+ nixpkgs.legacyPackages.${system}.nh
+ nixpkgs.legacyPackages.${system}.nvd
+ ]
+ ++ lib.optionals (system == "x86_64-linux") [
+ deploy-rs.packages.${system}.deploy-rs
+ ];
};
});
};
diff --git a/hosts/void/default.nix b/hosts/void/default.nix
@@ -93,6 +93,7 @@
jotdown
podman
tenv
+ cosign
];
lsp = [
diff --git a/hosts/void/overlays/config/shell/rc/void b/hosts/void/overlays/config/shell/rc/void
Binary files differ.
diff --git a/justfile b/justfile
@@ -17,3 +17,12 @@ deploy host="nixaran":
local:
@backup nix
nix develop -c nh home switch .
+
+diff:
+ nix develop -c home-manager build --flake ".#$(whoami)@$(hostname)" --no-update-lock-file
+ nix develop -c nvd diff $HOME/.local/state/nix/profiles/home-manager ./result
+
+remote-diff host="nixaran":
+ nix store diff-closures \
+ $(ssh {{ host }} readlink -f /run/current-system) \
+ $(nix build --no-link --print-out-paths .#nixosConfigurations.{{ host }}.config.system.build.toplevel)
diff --git a/modules/mixins/dotfiles/config/shell/rc/aliased-short-names b/modules/mixins/dotfiles/config/shell/rc/aliased-short-names
@@ -87,9 +87,6 @@ alias apc='ansible-playbook --check --diff'
alias yt_dlp_audio_url='yt-dlp -f bestaudio -g'
alias yt_dlp_audio='yt-dlp --embed-thumbnail --write-thumbnail --extract-audio --audio-format mp3 --audio-quality 0'
-alias matchamix='matchakey --mixxx ~/.mixxx/mixxxdb.sqlite'
-alias datamix='datasette serve $HOME/.mixxx/mixxxdb.sqlite --setting sql_time_limit_ms 50000'
-
alias nb='nix build'
alias nd='nix develop'
alias hms='just --justfile ~/src/sr.ht/nix/justfile local'
@@ -101,8 +98,10 @@ alias nts2='mpva https://stream-relay-geo.ntslive.net/stream2 --no-resume-playba
alias op='offpunk'
alias mf='monofetch'
alias sr='speedread -w 400'
+alias nn='~/src/sr.ht/napkins/nn'
alias jlr='jless --mode line'
+alias scr='source ./hack/creds-from-pass'
alias chop='perl -pe chop'
alias chomp='perl -pe chomp'
@@ -110,9 +109,3 @@ alias chomp='perl -pe chomp'
alias cej='just check'
alias bdj='just build'
alias dpj='just deploy'
-
-alias scr='source ./hack/creds-from-pass'
-alias nn='~/src/sr.ht/napkins/nn'
-
-alias ag='antigravity .'
-alias buds='pbpctrl show battery'
diff --git a/modules/mixins/dotfiles/config/shell/rc/prompt-functions b/modules/mixins/dotfiles/config/shell/rc/prompt-functions
@@ -1,4 +1,5 @@
# vim: ft=sh
+_SNOWFLAKE=$'\U2744'
_C_RESET=$(tput sgr0)
_C_1=$(tput setaf 1)
_C_2=$(tput setaf 3)
@@ -93,6 +94,11 @@ _hostname_prompt() {
colour_part 3 "$_HOSTNAME"
}
+_devshell_prompt() {
+ [ "$IN_NIX_SHELL" ] || [ "$DEVSHELL_ROOT" ] || return
+ colour_part 6 " $_SNOWFLAKE"
+}
+
_user_prompt() {
if ! [ "${_USER+x}" ]; then
local user
@@ -126,7 +132,8 @@ _get_ps1() {
else
prompt_ender=%
fi
- printf '%s%s%s%s%s%s ' \
+ printf '%s%s%s%s%s%s%s ' \
+ "$(_devshell_prompt)" \
"$(_user_prompt)" \
"$(_hostname_prompt)" \
"$(_pwd_prompt)" \
