From 37e9536fb5160264caa1641d3c60b136b9ec1dbb Mon Sep 17 00:00:00 2001 From: Nolan Darilek Date: Tue, 18 Mar 2025 11:31:28 -0500 Subject: [PATCH 1/5] Restart tailscale after NetworkManager-wait-online to work around rebuild hang. --- roles/tailscale.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/roles/tailscale.nix b/roles/tailscale.nix index ccd9e7a..f41449e 100644 --- a/roles/tailscale.nix +++ b/roles/tailscale.nix @@ -1,5 +1,12 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: { services.tailscale.enable = true; -} \ No newline at end of file + # See https://github.com/NixOS/nixpkgs/issues/180175#issuecomment-2541381489 + systemd.services.tailscaled.after = [ "systemd-networkd-wait-online.service" ]; +} From 1f144d05f40ba7f4340d74ffe006b696ae99f7fb Mon Sep 17 00:00:00 2001 From: Nolan Darilek Date: Tue, 18 Mar 2025 11:32:27 -0500 Subject: [PATCH 2/5] Accept Android licenses. --- flake.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/flake.nix b/flake.nix index 5d5bc3f..2f33bf9 100644 --- a/flake.nix +++ b/flake.nix @@ -28,6 +28,7 @@ unstable = import nixpkgsUnstable { inherit system; config.allowUnfree = true; + config.android_sdk.accept_license = true; }; }; in From 877302106b9765ba1aeae510bb259111e1c5b1e6 Mon Sep 17 00:00:00 2001 From: Nolan Darilek Date: Tue, 18 Mar 2025 11:33:37 -0500 Subject: [PATCH 3/5] Install appstream so flatpak-builder works. --- users/nolan/desktop.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/users/nolan/desktop.nix b/users/nolan/desktop.nix index 8c50015..64b6c6f 100644 --- a/users/nolan/desktop.nix +++ b/users/nolan/desktop.nix @@ -23,6 +23,7 @@ distrobox boxbuddy flatpak-builder + appstream ]; }; From 78f4c469803230943e9c8e244c1da89e30815c8c Mon Sep 17 00:00:00 2001 From: Nolan Darilek Date: Tue, 18 Mar 2025 11:35:23 -0500 Subject: [PATCH 4/5] Use unstable version. --- users/nolan/desktop-minimal.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/users/nolan/desktop-minimal.nix b/users/nolan/desktop-minimal.nix index e92698b..f192631 100644 --- a/users/nolan/desktop-minimal.nix +++ b/users/nolan/desktop-minimal.nix @@ -18,7 +18,7 @@ nativeMessagingHosts = with pkgs; [ unstable.firefoxpwa gnome-browser-connector - fx-cast-bridge + unstable.fx-cast-bridge ]; }; }; From b01fdf4fe72a7e3602bd055d2474d9b21d7ff847 Mon Sep 17 00:00:00 2001 From: Nolan Darilek Date: Tue, 18 Mar 2025 11:35:30 -0500 Subject: [PATCH 5/5] Bump flake. --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index d593f96..ca093f5 100644 --- a/flake.lock +++ b/flake.lock @@ -153,11 +153,11 @@ ] }, "locked": { - "lastModified": 1739757849, - "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=", + "lastModified": 1742234739, + "narHash": "sha256-zFL6zsf/5OztR1NSNQF33dvS1fL/BzVUjabZq4qrtY4=", "owner": "nix-community", "repo": "home-manager", - "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe", + "rev": "f6af7280a3390e65c2ad8fd059cdc303426cbd59", "type": "github" }, "original": { @@ -169,11 +169,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1741325094, - "narHash": "sha256-RUAdT8dZ6k/486vnu3tiNRrNW6+Q8uSD2Mq7gTX4jlo=", + "lastModified": 1742217307, + "narHash": "sha256-3fwpN7KN226ghLlpO9TR0/WpgQOmOj1e8bieUxpIYSk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "b48cc4dab0f9711af296fc367b6108cf7b8ccb16", + "rev": "4f4d97d7b7be387286cc9c988760a7ebaa5be1f1", "type": "github" }, "original": { @@ -216,11 +216,11 @@ }, "nixpkgsUnstable": { "locked": { - "lastModified": 1741379970, - "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", + "lastModified": 1742069588, + "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f", + "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1741332913, - "narHash": "sha256-ri1e8ZliWS3Jnp9yqpKApHaOo7KBN33W8ECAKA4teAQ=", + "lastModified": 1742268799, + "narHash": "sha256-IhnK4LhkBlf14/F8THvUy3xi/TxSQkp9hikfDZRD4Ic=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "20755fa05115c84be00b04690630cb38f0a203ad", + "rev": "da044451c6a70518db5b730fe277b70f494188f1", "type": "github" }, "original": {