nix

commit cebada455bb015498577538aea0e00a9c4c99a70
parent 504258aed1aa1e4838e9847491cf81ec788425a9
Author: mtmn <miro@haravara.org>
Date:   Fri,  5 Jun 2026 01:13:44 +0200

chore: reset branch name in prompt, ignore backlog

Diffstat:
M
flake.lock
 | 
18
+++++++++---------
M
modules/mixins/dotfiles/config/halloy/config.toml
 | 
0

M
modules/mixins/dotfiles/config/shell/rc/git
 | 
8
++++++--
M
modules/mixins/dotfiles/config/zsh/rc/magdalena
 | 
4
++--

4 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -162,11 +162,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1780370888,
-        "narHash": "sha256-PRJj9RKTEf/sITycujP1c/BrvLJKMYXzcpwTsXNulXQ=",
+        "lastModified": 1780593650,
+        "narHash": "sha256-CHo7k65YTL3HY+WQVedDTupji+LMgNlKCdrtRHZFAK4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "a7a415883195ffbd4dabec8f098f201e6eaaadf8",
+        "rev": "447fd9ff62501dae7206dfe180ee89f8de27b7d5",
         "type": "github"
       },
       "original": {
@@ -249,11 +249,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1780336545,
-        "narHash": "sha256-vhVhuXzFrIOfcssC/9hDHx7MHzDKjF3keHuREOQqQiQ=",
+        "lastModified": 1780365719,
+        "narHash": "sha256-QfWfccTN+70ZQ4m2qlU9PiKfz2Yppq94058iJyARNwc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4df1b885d76a54e1aa1a318f8d16fd6005b6401f",
+        "rev": "ffa10e26ae11d676b2db836259889f1f571cb14f",
         "type": "github"
       },
       "original": {
@@ -340,11 +340,11 @@
         "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1779564727,
-        "narHash": "sha256-HODUSiHMT46JGP35kSHhW4Pj2JV0SDSuV4lLnIFiwQE=",
+        "lastModified": 1780623330,
+        "narHash": "sha256-y8onClcSJ0K4xrv79uEvos2wolmhl96S9575n/FG+LI=",
         "owner": "~mtmn",
         "repo": "shirts",
-        "rev": "57cfdd3402bb471cb772fba4aa637d573a1e70f3",
+        "rev": "45cdf80b3f4a94ac46a2d99dca528ec296df684a",
         "type": "sourcehut"
       },
       "original": {
diff --git a/modules/mixins/dotfiles/config/halloy/config.toml b/modules/mixins/dotfiles/config/halloy/config.toml
Binary files differ.
diff --git a/modules/mixins/dotfiles/config/shell/rc/git b/modules/mixins/dotfiles/config/shell/rc/git
@@ -12,7 +12,6 @@ alias gn='git number --column'
 alias ga='git number add'
 alias gb='gbf'
 alias gc='git commit -v'
-alias gco='git checkout'
 alias gcp='git cherry-pick --strategy=recursive --strategy-option=diff-algorithm=histogram'
 alias gd='git diff --no-prefix'
 alias gl='git gol'
@@ -72,6 +71,11 @@ gf() {
 	fi
 }
 
+gco() {
+	git checkout "$1"
+	unset _VCS_LAST_PWD
+}
+
 gcopr() {
 	git fetch origin pull/"${1?need pr num}"/head:pr"$1" && gco pr"$1"
 }
@@ -106,5 +110,5 @@ gbf() {
 				--preview 'git log --oneline --color=always {1} 2>/dev/null | head -20' \
 				--preview-window=right:50%
 	)
-	[ -n "$branch" ] && git switch "${branch#origin/}"
+	[ -n "$branch" ] && gco "${branch#origin/}"
 }
diff --git a/modules/mixins/dotfiles/config/zsh/rc/magdalena b/modules/mixins/dotfiles/config/zsh/rc/magdalena
@@ -5,12 +5,12 @@ magdalena_goto_file() {
 }
 
 magdalena_goto_dir() {
-	dir=$(magdalena goto-dir) && cd "$dir" && zle reset-prompt 2>/dev/null || true
+	dir=$(magdalena goto-dir) && cd "$dir" && zle reset-prompt 2>/dev/null && unset _VCS_LAST_PWD || true
 }
 
 magdalena_favorites() {
 	local result=$(magdalena favorites) && cd "$result"
-	zle reset-prompt 2>/dev/null || true
+	zle reset-prompt 2>/dev/null && unset _VCS_LAST_PWD || true
 }
 
 zle -N magdalena_goto_file