From 1c7b2b348a3ef0ed0c17c9484c10c639101124b7 Mon Sep 17 00:00:00 2001 From: faukah Date: Wed, 30 Jul 2025 20:53:34 +0200 Subject: [PATCH 1/3] npins: update sources --- npins/sources.json | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/npins/sources.json b/npins/sources.json index 78c3e5d..bad3715 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -9,9 +9,9 @@ }, "branch": "master", "submodules": false, - "revision": "393f20bc8805730b8183460235f26ae3fc171509", - "url": "https://github.com/nix-community/comma/archive/393f20bc8805730b8183460235f26ae3fc171509.tar.gz", - "hash": "sha256-OLerZuEhGTeSg7uiiEL+AV9iusBZLhwCx4pdYGTGRNU=" + "revision": "995b210e86c9d89cdabbdee622681389ce6c95ac", + "url": "https://github.com/nix-community/comma/archive/995b210e86c9d89cdabbdee622681389ce6c95ac.tar.gz", + "hash": "sha256-dNek1a8Yt3icWc8ZpVe1NGuG+eSoTDOmAAJbkYmMocU=" }, "flake-compat": { "type": "Git", @@ -62,9 +62,9 @@ }, "branch": "master", "submodules": false, - "revision": "4775927ef576f6493b79b1d205e42493d6878d47", - "url": "https://github.com/nix-community/lanzaboote/archive/4775927ef576f6493b79b1d205e42493d6878d47.tar.gz", - "hash": "sha256-wGfVht5kOLc9t3GZxEr4IIq5QgHV6nB3w9qqhcVKloo=" + "revision": "785a5701b22259b85735301b1aad19c2bee15498", + "url": "https://github.com/nix-community/lanzaboote/archive/785a5701b22259b85735301b1aad19c2bee15498.tar.gz", + "hash": "sha256-pZQyCkqIFwGA77np+vqVQZgg2P0qPAI6x6kC3w6+PjE=" }, "lix": { "type": "Git", @@ -76,9 +76,9 @@ }, "branch": "main", "submodules": false, - "revision": "ef94901156c0c688ffffaa2c5caf1498119f01d4", - "url": "https://git.lix.systems/lix-project/lix/archive/ef94901156c0c688ffffaa2c5caf1498119f01d4.tar.gz", - "hash": "sha256-fCaJ29ZqevsIT1yqbpgdKeYr5GHF6sDhHlcXo2m+VuI=" + "revision": "321807a40e1fdd44d950ff01746c95cb6e2eced3", + "url": "https://git.lix.systems/lix-project/lix/archive/321807a40e1fdd44d950ff01746c95cb6e2eced3.tar.gz", + "hash": "sha256-2sDX5Nv/DGIzZH+3pIlAUpZfVlMGz7Hl/mqHUaic+p8=" }, "lix-module": { "type": "Git", @@ -103,9 +103,9 @@ }, "branch": "master", "submodules": false, - "revision": "d9a869acec8dd35efa658234c158e6fc82e7064a", - "url": "https://github.com/nix-community/nh/archive/d9a869acec8dd35efa658234c158e6fc82e7064a.tar.gz", - "hash": "sha256-OIYIlXCYOHLvapwxKwX5nixMT1pf9hTx+/oWN9PHWPk=" + "revision": "ec34a659652d98c225e2a97d100830365d7551c3", + "url": "https://github.com/nix-community/nh/archive/ec34a659652d98c225e2a97d100830365d7551c3.tar.gz", + "hash": "sha256-+MuFPjyJl3JbNVs3Xq9dATJEbEOvwF4LMUNMmmzO7mU=" }, "nil": { "type": "Git", @@ -116,9 +116,9 @@ }, "branch": "main", "submodules": false, - "revision": "524ae2d67dd84d99a10f409ed6cd8e4e7b3cae3f", - "url": "https://github.com/oxalica/nil/archive/524ae2d67dd84d99a10f409ed6cd8e4e7b3cae3f.tar.gz", - "hash": "sha256-Uy2qzd+fMoBcp4NPSO7DavEC1pGMegmAqoEMvmXbIQU=" + "revision": "cd7a6f6d5dc58484e62a8e85677e06e47cf2bd4d", + "url": "https://github.com/oxalica/nil/archive/cd7a6f6d5dc58484e62a8e85677e06e47cf2bd4d.tar.gz", + "hash": "sha256-fK4INnIJQNAA8cyjcDRZSPleA+N/STI6I0oBDMZ2r+E=" }, "niri": { "type": "GitRelease", @@ -155,8 +155,8 @@ "nixpkgs": { "type": "Channel", "name": "nixpkgs-unstable", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre834687.6027c30c8e98/nixexprs.tar.xz", - "hash": "sha256-Ba/cFHWBoCISrKBcqU8kH/8LJXYUj2kfFz7l7a7RwMU=" + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre836767.e44b8dc0882d/nixexprs.tar.xz", + "hash": "sha256-euf3HhNllLzdAjWqfM+sgM8WE8H8sl7O61LpjOxsQN8=" }, "npins": { "type": "Git", From 73018dad3258043f6a92d08d508c826bab431cbe Mon Sep 17 00:00:00 2001 From: faukah Date: Fri, 1 Aug 2025 12:28:35 +0200 Subject: [PATCH 2/3] nushell: update config Signed-off-by: faukah Change-Id: I6a6a69644bbbc510b04f6eea9b642b58fa2f2aa5 --- modules/home/nushell/config.nu | 37 +++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/modules/home/nushell/config.nu b/modules/home/nushell/config.nu index 7ffcf43..5bc1380 100644 --- a/modules/home/nushell/config.nu +++ b/modules/home/nushell/config.nu @@ -186,21 +186,19 @@ $env.config.hooks = { } ] - env_change: { - PWD: [ - {|| - if not ($env.PWD | path join .envrc | path exists) { - return - } - if (which direnv | is-empty) { - return - } - - direnv export json | from json | default {} | load-env - $env.PATH = $env.PATH | split row (char env_sep) + pre_prompt: [ + {|| + if not ($env.PWD | path join .envrc | path exists) { + return } - ] - } + if (which direnv | is-empty) { + return + } + + direnv export json | from json | default {} | load-env + $env.PATH = $env.PATH | split row (char env_sep) + } + ] } let menus = [ @@ -289,6 +287,17 @@ def switch [] { nh os switch --file ($env.NH_FLAKE | path join default.nix) (open /etc/hostname | str trim) } + +def --env y [...args] { + let tmp = (mktemp -t "yazi-cwd.XXXXXX") + yazi ...$args --cwd-file $tmp + let cwd = (open $tmp) + if $cwd != "" and $cwd != $env.PWD { + cd $cwd + } + rm -fp $tmp +} + # fix sudo by prepending /run/wrappers/bin to the PATH. $env.PATH = ($env.PATH | split row (char esep) | prepend '/run/wrappers/bin') $env.PATH = ($env.PATH | split row (char esep) | prepend '/etc/profiles/per-user/cr/bin') From 58f0189a6bd01878b1fdd4566d61f1992b84d0a1 Mon Sep 17 00:00:00 2001 From: faukah Date: Fri, 1 Aug 2025 12:28:52 +0200 Subject: [PATCH 3/3] temperance: clean up programs Signed-off-by: faukah Change-Id: I6a6a6964d0d546be1fb6aaf4867b10f774e41b4d --- hosts/temperance/programs.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/hosts/temperance/programs.nix b/hosts/temperance/programs.nix index f24c3ba..139359f 100644 --- a/hosts/temperance/programs.nix +++ b/hosts/temperance/programs.nix @@ -47,14 +47,11 @@ pdfarranger picard pulsemixer - python3 pwvucontrol qbittorrent - r2modman radare2 ripgrep rmpc - ruby_3_2 signal-desktop starship telegram-desktop @@ -62,11 +59,9 @@ topiary tor-browser trash-cli - tutanota-desktop typst vesktop vivid - wayneko wireguard-tools xdg-utils xournalpp