diff --git a/flake.lock b/flake.lock index 7de4957..008407a 100644 --- a/flake.lock +++ b/flake.lock @@ -372,16 +372,19 @@ "nixpkgs": [ "nixpkgs" ], + "nixpkgs-unstable": [ + "nixpkgs-unstable" + ], "treefmt-nix": [ "treefmt-nix" ] }, "locked": { - "lastModified": 1782927205, - "narHash": "sha256-mEVguvW2a9UzLAusuVvZFt6tvOVHor/kOeQziRcLE0c=", + "lastModified": 1782751302, + "narHash": "sha256-tLcfE+pLZWnAoa/VWdFCnSKVLbVOuaRozlUnkssx7ac=", "ref": "refs/heads/main", - "rev": "ebb85e6291f1ac38dc893bac9b62c1018db9cb8b", - "revCount": 2254, + "rev": "621ee66133831158329981b498b50b4342ed4339", + "revCount": 2237, "type": "git", "url": "https://forge.darkest.space/hyperhive/hyperhive.git" }, @@ -673,11 +676,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1782821651, - "narHash": "sha256-D5jO0ME1lA9bDHnd5kVawBwItG/N4oZr3FlXmMzLec8=", + "lastModified": 1780930886, + "narHash": "sha256-rppURzHviaQN131F+nLiLdGfcb0uCd9gGP0E5+iw9MI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e52c192be9d7b2c4bd4aed326c8731b35f8bb75c", + "rev": "8c3cede7ddc26bd659d2d383b5610efbd2c7a16e", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2dca59f..239738e 100644 --- a/flake.nix +++ b/flake.nix @@ -17,6 +17,7 @@ url = "git+https://forge.darkest.space/hyperhive/hyperhive.git"; inputs = { nixpkgs.follows = "nixpkgs"; + nixpkgs-unstable.follows = "nixpkgs-unstable"; treefmt-nix.follows = "treefmt-nix"; }; }; @@ -159,7 +160,7 @@ overlays = { unstable = final: prev: { unstable = import nixpkgs-unstable { - inherit (prev.stdenv.hostPlatform) system; + localSystem = prev.stdenv.hostPlatform; inherit (prev) config; }; }; diff --git a/nixosConfigurations/muede-lpt2/default.nix b/nixosConfigurations/muede-lpt2/default.nix index 3fbabf3..c62e807 100644 --- a/nixosConfigurations/muede-lpt2/default.nix +++ b/nixosConfigurations/muede-lpt2/default.nix @@ -37,12 +37,9 @@ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO1CRn4yYTL4XUdCebE8Z4ZeuMujBjorTdWifg911EOv pc2 home roaming" ]; - # brightnessctl's udev rules grant the `video` group write access to backlight brightness (muede is in `video`) - environment.systemPackages = [ - pkgs.android-tools - pkgs.brightnessctl - ]; - services.udev.packages = [ pkgs.brightnessctl ]; + # `programs.adb` removed in nixpkgs 26.05 (systemd 258 handles uaccess); add pkgs.android-tools to systemPackages if adb is needed + # `programs.light` removed in nixpkgs 26.05; replace with brightnessctl or hardware.acpilight when re-enabling + environment.systemPackages = [ pkgs.android-tools ]; networking.firewall.allowedTCPPorts = [ 8776