diff --git a/nix/hosts/lavender/mqtt.nix b/nix/hosts/lavender/mqtt.nix index 9ce7782..0990d47 100644 --- a/nix/hosts/lavender/mqtt.nix +++ b/nix/hosts/lavender/mqtt.nix @@ -24,7 +24,7 @@ let listener 1883 127.0.0.1 listener 1883 ::1 - plugin ${pkgs.mosquitto-with-timestamps.lib}/lib/mosquitto_message_timestamp.so + plugin ${cfg.package.lib}/lib/mosquitto_message_timestamp.so ''; in { @@ -42,7 +42,7 @@ in }; services.mosquitto = { enable = true; - package = pkgs.mosquitto-with-timestamps; + package = mkForce pkgs.mosquitto-with-timestamps; persistence = true; }; } diff --git a/nix/modules/hardware/rpi.nix b/nix/modules/hardware/rpi.nix index 7cbb588..505399e 100644 --- a/nix/modules/hardware/rpi.nix +++ b/nix/modules/hardware/rpi.nix @@ -1,4 +1,5 @@ { + pkgs, lib, config, ... @@ -12,9 +13,14 @@ let cfg = config.hardware.rpi; in { - options.hardware.rpi.enable = mkEnableOption "raspberry pi setup"; + options.hardware.rpi.enable = mkEnableOption "raspberry pi (4) setup"; config = mkIf cfg.enable { + # Technically this is deprecated, but I don't want to build linux on my pi + # Hopefully by the time it's removed they'll have figured out something that doesn't + # involve doing that + boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linuxKernel.kernels.linux_rpi4; + nixpkgs.hostPlatform = "aarch64-linux"; hardware.enableRedistributableFirmware = true;