From cf6584ea71aa6e15c2fe8f7bfe91274d67cb26d9 Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Fri, 21 Jul 2023 12:15:46 +0800 Subject: [PATCH] feat: add devbox from nixpkgs-unstable --- flake.nix | 19 ++++++++++++++----- home/base/desktop/development.nix | 4 +++- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index 6d7f26f6..0e1958e4 100644 --- a/flake.nix +++ b/flake.nix @@ -181,10 +181,19 @@ }; # macOS's configuration, for work. - darwinConfigurations."harmonica" = darwin.lib.darwinSystem { - system = "x86_64-darwin"; - - specialArgs = inputs; + darwinConfigurations."harmonica" = let + system = "x86_64-darwin"; + specialArgs = { + # use unstable branch for some packages to get the latest updates + pkgs-unstable = import inputs.nixpkgs-unstable { + inherit system; # refer the `system` parameter form outer scope recursively + # To use chrome, we need to allow the installation of non-free software + config.allowUnfree = true; + }; + } // inputs; + in + darwin.lib.darwinSystem { + inherit system specialArgs; modules = [ ./hosts/harmonica @@ -193,7 +202,7 @@ home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - home-manager.extraSpecialArgs = inputs; + home-manager.extraSpecialArgs = specialArgs; home-manager.users.ryan = import ./home/darwin; } ]; diff --git a/home/base/desktop/development.nix b/home/base/desktop/development.nix index 35fa000b..b2aaac19 100644 --- a/home/base/desktop/development.nix +++ b/home/base/desktop/development.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, pkgs-unstable, ... }: { ############################################################# @@ -12,6 +12,8 @@ ############################################################# home.packages = with pkgs; [ + pkgs-unstable.devbox + # cloud native skopeo docker-compose