diff --git a/flake.lock b/flake.lock index 1422ac1..3039628 100644 --- a/flake.lock +++ b/flake.lock @@ -121,11 +121,11 @@ ] }, "locked": { - "lastModified": 1775087534, - "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", + "lastModified": 1768135262, + "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", + "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", "type": "github" }, "original": { @@ -289,11 +289,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1775358474, - "narHash": "sha256-gBzsrurmW2RoE+1/HUL8gugw0uMuHc/v8fjJCwHSyq8=", + "lastModified": 1768704530, + "narHash": "sha256-BASsdRYo8t/himZisgWW524t86pxuC0H3/Dv8sqR8sM=", "owner": "nix-community", "repo": "nix-direnv", - "rev": "ec5502156659be28c741d9419a1bafcb789d5eca", + "rev": "29bb68202897f6e8653d28f64c5525c2c502f19c", "type": "github" }, "original": { @@ -320,11 +320,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1775423009, - "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=", + "lastModified": 1775036866, + "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9", + "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e", "type": "github" }, "original": { @@ -352,11 +352,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1775595990, - "narHash": "sha256-OEf7YqhF9IjJFYZJyuhAypgU+VsRB5lD4DuiMws5Ltc=", + "lastModified": 1775305101, + "narHash": "sha256-/74n1oQPtKG52Yw41cbToxspxHbYz6O3vi+XEw16Qe8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4e92bbcdb030f3b4782be4751dc08e6b6cb6ccf2", + "rev": "36a601196c4ebf49e035270e10b2d103fe39076b", "type": "github" }, "original": { @@ -472,11 +472,11 @@ ] }, "locked": { - "lastModified": 1775682595, - "narHash": "sha256-0E9PohY/VuESLq0LR4doaH7hTag513sDDW5n5qmHd1Q=", + "lastModified": 1775365543, + "narHash": "sha256-f50qrK0WwZ9z5EdaMGWOTtALgSF7yb7XwuE7LjCuDmw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "d2e8438d5886e92bc5e7c40c035ab6cae0c41f76", + "rev": "a4ee2de76efb759fe8d4868c33dec9937897916f", "type": "github" }, "original": { @@ -529,11 +529,11 @@ ] }, "locked": { - "lastModified": 1775125835, - "narHash": "sha256-2qYcPgzFhnQWchHo0SlqLHrXpux5i6ay6UHA+v2iH4U=", + "lastModified": 1768158989, + "narHash": "sha256-67vyT1+xClLldnumAzCTBvU0jLZ1YBcf4vANRWP3+Ak=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "75925962939880974e3ab417879daffcba36c4a3", + "rev": "e96d59dff5c0d7fddb9d113ba108f03c3ef99eca", "type": "github" }, "original": { diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 40382d3..c23ea80 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 diff --git a/home/modules/ssh.nix b/home/modules/ssh.nix index eb758fb..bdefa24 100644 --- a/home/modules/ssh.nix +++ b/home/modules/ssh.nix @@ -63,11 +63,8 @@ in ".ssh/controlmasters" = { mode = "700"; }; - ".ssh/mosh-tunnel" = { - mode = "700"; - }; }; - home.packages = with pkgs.fc-scripts; [ ssh-multi-proxy mosh-tunnel mosh-dualstack-proxy ]; + home.packages = [ pkgs.fc-scripts.ssh-multi-proxy ]; programs.ssh = { enableDefaultConfig = false; # deprecated package = lib.mkDefault pkgs.openssh; diff --git a/packages/default.nix b/packages/default.nix index bcca5e4..1405ec3 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -33,7 +33,4 @@ final: prev: { customRC = builtins.readFile ../home/vimrc; }; }; - - # XXX work around darwin test failures - direnv = prev.direnv.overrideAttrs (_: { doCheck = false; }); }