From 91bfede3cbe67de3f62523e73031ebf2696e6812 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 9 Apr 2026 14:43:28 +0200 Subject: [PATCH 1/4] direnv: work around darwin build failure --- packages/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/default.nix b/packages/default.nix index 1405ec3..bcca5e4 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -33,4 +33,7 @@ final: prev: { customRC = builtins.readFile ../home/vimrc; }; }; + + # XXX work around darwin test failures + direnv = prev.direnv.overrideAttrs (_: { doCheck = false; }); } From 289eebc1d06fe43c724bc70d93a57c2c6aa5f5ed Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 9 Apr 2026 14:43:47 +0200 Subject: [PATCH 2/4] mpv: remove from darwin hosts due to build failure --- home/modules/packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/modules/packages.nix b/home/modules/packages.nix index c23ea80..40382d3 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -35,10 +35,10 @@ let multimediaApps = with pkgs; [ - mpv ] ++ lib.optionals pkgs.stdenv.isDarwin [ vlc-bin ] ++ lib.optionals pkgs.stdenv.isLinux [ + mpv vlc amarok clementine From 42e61fd75df1b1bf2c47b8bf4d67d22ab2078447 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 9 Apr 2026 14:44:05 +0200 Subject: [PATCH 3/4] home/ssh: add mosh-tunnel --- home/modules/ssh.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/home/modules/ssh.nix b/home/modules/ssh.nix index bdefa24..eb758fb 100644 --- a/home/modules/ssh.nix +++ b/home/modules/ssh.nix @@ -63,8 +63,11 @@ in ".ssh/controlmasters" = { mode = "700"; }; + ".ssh/mosh-tunnel" = { + mode = "700"; + }; }; - home.packages = [ pkgs.fc-scripts.ssh-multi-proxy ]; + home.packages = with pkgs.fc-scripts; [ ssh-multi-proxy mosh-tunnel mosh-dualstack-proxy ]; programs.ssh = { enableDefaultConfig = false; # deprecated package = lib.mkDefault pkgs.openssh; From 1371229109075dfb61e56917cbdf775404a8ffb5 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 9 Apr 2026 14:46:02 +0200 Subject: [PATCH 4/4] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/6201e203d09599479a3b3450ed24fa81537ebc4e?narHash=sha256-ZojAnPuCdy657PbTq5V0Y%2BAHKhZAIwSIT2cb8UgAz/U%3D' (2026-04-01) → 'github:NixOS/nixpkgs/68d8aa3d661f0e6bd5862291b5bb263b2a6595c9?narHash=sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw%3D' (2026-04-05) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/36a601196c4ebf49e035270e10b2d103fe39076b?narHash=sha256-/74n1oQPtKG52Yw41cbToxspxHbYz6O3vi%2BXEw16Qe8%3D' (2026-04-04) → 'github:NixOS/nixpkgs/4e92bbcdb030f3b4782be4751dc08e6b6cb6ccf2?narHash=sha256-OEf7YqhF9IjJFYZJyuhAypgU%2BVsRB5lD4DuiMws5Ltc%3D' (2026-04-07) • Updated input 'sops-nix': 'github:Mic92/sops-nix/a4ee2de76efb759fe8d4868c33dec9937897916f?narHash=sha256-f50qrK0WwZ9z5EdaMGWOTtALgSF7yb7XwuE7LjCuDmw%3D' (2026-04-05) → 'github:Mic92/sops-nix/d2e8438d5886e92bc5e7c40c035ab6cae0c41f76?narHash=sha256-0E9PohY/VuESLq0LR4doaH7hTag513sDDW5n5qmHd1Q%3D' (2026-04-08) --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 3039628..1422ac1 100644 --- a/flake.lock +++ b/flake.lock @@ -121,11 +121,11 @@ ] }, "locked": { - "lastModified": 1768135262, - "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", + "lastModified": 1775087534, + "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", + "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", "type": "github" }, "original": { @@ -289,11 +289,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1768704530, - "narHash": "sha256-BASsdRYo8t/himZisgWW524t86pxuC0H3/Dv8sqR8sM=", + "lastModified": 1775358474, + "narHash": "sha256-gBzsrurmW2RoE+1/HUL8gugw0uMuHc/v8fjJCwHSyq8=", "owner": "nix-community", "repo": "nix-direnv", - "rev": "29bb68202897f6e8653d28f64c5525c2c502f19c", + "rev": "ec5502156659be28c741d9419a1bafcb789d5eca", "type": "github" }, "original": { @@ -320,11 +320,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1775036866, - "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=", + "lastModified": 1775423009, + "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e", + "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9", "type": "github" }, "original": { @@ -352,11 +352,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1775305101, - "narHash": "sha256-/74n1oQPtKG52Yw41cbToxspxHbYz6O3vi+XEw16Qe8=", + "lastModified": 1775595990, + "narHash": "sha256-OEf7YqhF9IjJFYZJyuhAypgU+VsRB5lD4DuiMws5Ltc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "36a601196c4ebf49e035270e10b2d103fe39076b", + "rev": "4e92bbcdb030f3b4782be4751dc08e6b6cb6ccf2", "type": "github" }, "original": { @@ -472,11 +472,11 @@ ] }, "locked": { - "lastModified": 1775365543, - "narHash": "sha256-f50qrK0WwZ9z5EdaMGWOTtALgSF7yb7XwuE7LjCuDmw=", + "lastModified": 1775682595, + "narHash": "sha256-0E9PohY/VuESLq0LR4doaH7hTag513sDDW5n5qmHd1Q=", "owner": "Mic92", "repo": "sops-nix", - "rev": "a4ee2de76efb759fe8d4868c33dec9937897916f", + "rev": "d2e8438d5886e92bc5e7c40c035ab6cae0c41f76", "type": "github" }, "original": { @@ -529,11 +529,11 @@ ] }, "locked": { - "lastModified": 1768158989, - "narHash": "sha256-67vyT1+xClLldnumAzCTBvU0jLZ1YBcf4vANRWP3+Ak=", + "lastModified": 1775125835, + "narHash": "sha256-2qYcPgzFhnQWchHo0SlqLHrXpux5i6ay6UHA+v2iH4U=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "e96d59dff5c0d7fddb9d113ba108f03c3ef99eca", + "rev": "75925962939880974e3ab417879daffcba36c4a3", "type": "github" }, "original": {