From f449492b3dc6d0a13466439eb328089f8f3118ae Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 1 Mar 2026 23:40:36 +0100 Subject: [PATCH] =?UTF-8?q?dfhjlk=C3=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flake.lock | 48 +++++++++---------- justfile | 7 +-- .../desktop/bashrc.d/zeditor-remote.sh | 13 +++++ 3 files changed, 41 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index d95d3cb..3ba7d17 100644 --- a/flake.lock +++ b/flake.lock @@ -133,11 +133,11 @@ ] }, "locked": { - "lastModified": 1765170903, - "narHash": "sha256-O8VTGey1xxiRW+Fpb+Ps9zU7ShmxUA1a7cMTcENCVNg=", + "lastModified": 1772380125, + "narHash": "sha256-8C+y46xA9bxcchj9GeDPJaRUDApaA3sy2fhJr1bTbUw=", "owner": "nix-community", "repo": "home-manager", - "rev": "20561be440a11ec57a89715480717baf19fe6343", + "rev": "a07a44a839eb036e950bf397d9b782916f8dcab3", "type": "github" }, "original": { @@ -438,11 +438,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1764440730, - "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=", + "lastModified": 1771969195, + "narHash": "sha256-qwcDBtrRvJbrrnv1lf/pREQi8t2hWZxVAyeMo7/E9sw=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3", + "rev": "41c6b421bdc301b2624486e11905c9af7b8ec68e", "type": "github" }, "original": { @@ -603,11 +603,11 @@ }, "nixpkgs-2505": { "locked": { - "lastModified": 1764939437, - "narHash": "sha256-Tg7LvvCBIZu3zlWj8wZBRwA3lQn97DAKqQxoCg8hUbY=", - "rev": "00d2457e2f608b4be6fe8b470b0a36816324b0ae", + "lastModified": 1767313136, + "narHash": "sha256-3zSML8xJhOT2kRBCNUpniZSCeCBCPA3KGsRYh+KdtbU=", + "rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d", "type": "tarball", - "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.813449.00d2457e2f60/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.813814.ac62194c3917/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -616,11 +616,11 @@ }, "nixpkgs-2511": { "locked": { - "lastModified": 1764983851, - "narHash": "sha256-pyyfJp6Q80D0YhEuuP/qzasUZjoK3C3PrCp8BPWcDZE=", - "rev": "d9bc5c7dceb30d8d6fafa10aeb6aa8a48c218454", + "lastModified": 1772047000, + "narHash": "sha256-8rDP2AfBFi0DI9idtlWeK73XWJScPvwgokuYkSnVY/Y=", + "rev": "1267bb4920d0fc06ea916734c11b0bf004bbe17e", "type": "tarball", - "url": "https://releases.nixos.org/nixos/25.11/nixos-25.11.1056.d9bc5c7dceb3/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixos/25.11/nixos-25.11.6561.1267bb4920d0/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -677,11 +677,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1764950072, - "narHash": "sha256-lft4/rbh1nFSjHqQatxPEq3n68+iH7QmT5Tqr784e0Q=", - "rev": "f61125a668a320878494449750330ca58b78c557", + "lastModified": 1772198003, + "narHash": "sha256-UCaQQ8zmHUocQIgCl+53Jj6NuwqrVKtmv7obE9r6wnw=", + "rev": "dd9b079222d43e1943b6ebd802f04fd959dc8e61", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre907002.f61125a668a3/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre955442.dd9b079222d4/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -1075,11 +1075,11 @@ ] }, "locked": { - "lastModified": 1765231718, - "narHash": "sha256-qdBzo6puTgG4G2RHG0PkADg22ZnQo1JmSVFRxrD4QM4=", + "lastModified": 1772401007, + "narHash": "sha256-YHykQg0h9hrlZGpMcywnaFzQ1Kn/5YNCCOSaaAl6z7Q=", "owner": "Mic92", "repo": "sops-nix", - "rev": "7fd1416aba1865eddcdec5bb11339b7222c2363e", + "rev": "d8be5ea4cd3bc363492ab5bc6e874ccdc5465fe4", "type": "github" }, "original": { @@ -1095,11 +1095,11 @@ ] }, "locked": { - "lastModified": 1765231718, - "narHash": "sha256-qdBzo6puTgG4G2RHG0PkADg22ZnQo1JmSVFRxrD4QM4=", + "lastModified": 1772401007, + "narHash": "sha256-YHykQg0h9hrlZGpMcywnaFzQ1Kn/5YNCCOSaaAl6z7Q=", "owner": "Mic92", "repo": "sops-nix", - "rev": "7fd1416aba1865eddcdec5bb11339b7222c2363e", + "rev": "d8be5ea4cd3bc363492ab5bc6e874ccdc5465fe4", "type": "github" }, "original": { diff --git a/justfile b/justfile index 7566a00..ed8a173 100644 --- a/justfile +++ b/justfile @@ -32,11 +32,12 @@ report hostname=`just _a_host`: reports: nix eval .#nixosReports --json --show-trace | yq . --yaml-output --width=999999 | bat --language yaml --style plain --paging never -update: +# --option access-tokens "" +update *_: git reset flake.lock git restore flake.lock git pull --rebase --autostash - nix flake update --commit-lock-file + nix flake update --commit-lock-file "$@" @mkdir -p .direnv/ @printf "%s\n" "$(date +%Y-%m-%d)" > .direnv/pull-date @@ -44,7 +45,7 @@ update: git reset flake.lock git restore flake.lock nix eval --file flake.nix --apply 'x: builtins.attrNames x.inputs' --json \ - | (printf "%s\n" --commit-lock-file; jq '.[]' -r | tr '0123456789' '9876543210' | sort | tr '0123456789' '9876543210' | grep -v "^self$") \ + | (printf "%s\n" --commit-lock-file '--option access-tokens ""'; jq '.[]' -r | tr '0123456789' '9876543210' | sort | tr '0123456789' '9876543210' | grep -v "^self$") \ | gum choose --no-limit \ | xargs nix flake update git add flake.lock diff --git a/users/pbsds/home/profiles/desktop/bashrc.d/zeditor-remote.sh b/users/pbsds/home/profiles/desktop/bashrc.d/zeditor-remote.sh index ae9e00c..1071edf 100644 --- a/users/pbsds/home/profiles/desktop/bashrc.d/zeditor-remote.sh +++ b/users/pbsds/home/profiles/desktop/bashrc.d/zeditor-remote.sh @@ -1,3 +1,9 @@ +zeditor-here() ( + for fqdn in $(printf "%q\n" $(hostname -f) $(hostname -A) | sort -u); do + printf "zeditor ssh://%q:%q\n" "${fqdn}" "$(realpath "${1:-.}")" + done +) + zeditor-remote() { local statedir="${XDG_STATE_HOME:-"$HOME/.local/state/"}/zeditor-remote-sh" @@ -182,3 +188,10 @@ zeditor-remote() { fi unset -f lru_push } + +atom-here() { + zeditor-here "$@" +} +atom-remote() { + zeditor-remote "$@" +}