From bd78fa0a1e61c5a93398bb3eb108831bf5ae1483 Mon Sep 17 00:00:00 2001 From: Gene Liverman Date: Thu, 21 Mar 2024 18:51:17 -0400 Subject: [PATCH] Install flox on a NixOS system too This also adds the recommended extra nix settings to darwin --- flake.nix | 2 +- modules/hosts/nixos/rainbow-planet/default.nix | 3 ++- modules/system/common/all-darwin.nix | 6 ++++++ modules/system/common/all-nixos.nix | 6 ++++++ 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 652bbd2..ac86e3e 100644 --- a/flake.nix +++ b/flake.nix @@ -89,7 +89,7 @@ # creates a nixos system config nixosHostConfig = system: hostname: username: nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs username hostname; + specialArgs = { inherit inputs username hostname flox-flake; pkgs = import nixpkgs { inherit system; config = { diff --git a/modules/hosts/nixos/rainbow-planet/default.nix b/modules/hosts/nixos/rainbow-planet/default.nix index 340404a..44aae99 100644 --- a/modules/hosts/nixos/rainbow-planet/default.nix +++ b/modules/hosts/nixos/rainbow-planet/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, username, ... }: { +{ config, flox-flake, pkgs, username, ... }: { imports = [ ./hardware-configuration.nix ../../../system/common/linux/flatpaks.nix @@ -18,6 +18,7 @@ # host specific apps boinc brightnessctl + flox-flake.packages.${pkgs.system}.default gnome.gnome-tweaks gnome.nautilus gnomeExtensions.dash-to-panel diff --git a/modules/system/common/all-darwin.nix b/modules/system/common/all-darwin.nix index 2c186d7..ef48e18 100644 --- a/modules/system/common/all-darwin.nix +++ b/modules/system/common/all-darwin.nix @@ -92,6 +92,12 @@ "nix-command" "repl-flake" ]; + extra-trusted-public-keys = [ + "flox-cache-public-1:7F4OyH7ZCnFhcze3fJdfyXYLQw/aV7GEed86nQ7IsOs=" + ]; + extra-trusted-substituters = [ + "https://cache.flox.dev" + ]; trusted-users = [ "@admin" "${username}" ]; }; extraOptions = '' diff --git a/modules/system/common/all-nixos.nix b/modules/system/common/all-nixos.nix index 0495234..c1df1e3 100644 --- a/modules/system/common/all-nixos.nix +++ b/modules/system/common/all-nixos.nix @@ -41,6 +41,12 @@ "flakes" "nix-command" ]; + extra-trusted-public-keys = [ + "flox-cache-public-1:7F4OyH7ZCnFhcze3fJdfyXYLQw/aV7GEed86nQ7IsOs=" + ]; + extra-trusted-substituters = [ + "https://cache.flox.dev" + ]; trusted-users = [ "${username}" ]; };