Merge branch 'main' of https://github.com/yuanw/nix-home

.github/workflows/ci.yml

@@ -8,7 +8,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Install Nix
-      uses: DeterminateSystems/nix-installer-action@v4
+      uses: DeterminateSystems/nix-installer-action@v6
     - uses: cachix/cachix-action@v12
       with:
         name: yuanwang-wf

flake.nix

@@ -3,6 +3,9 @@
 
   inputs = {
     nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.05";
+    nixpkgs-master.url = "github:nixos/nixpkgs/master";
+    # https://github.com/NixOS/nixpkgs/pull/257760
+    ollama-nixpkgs.url = "github:elohmeier/nixpkgs/ollama";
     nixpkgs.url = "nixpkgs/nixos-unstable";
     nix-darwin = {
       url = "github:LnL7/nix-darwin/master";
@@ -59,18 +62,11 @@
         inputs.treefmt-nix.flakeModule
         inputs.haskell-flake.flakeModule
       ];
-      perSystem = { config, system, pkgs, ... }: {
+      perSystem = { system, ... }: {
         _module.args.pkgs = import inputs.nixpkgs {
           inherit system;
-          overlays = [
-            (_final: _prev: {
-              # https://gitlab.freedesktop.org/mesa/mesa/-/issues/8634
-              mesa = if _prev.stdenv.isDarwin then inputs.nixpkgs-stable.legacyPackages.${_prev.system}.mesa else
-              inputs.nixpkgs.legacyPackages.${_prev.system}.mesa;
-            })
-          ];
           config = {
-            allowUnsupportedSystem = true;
+            allowUnfree = true;
           };
         };
         haskellProjects.default = {

garnix.yaml

@@ -3,6 +3,9 @@ builds:
  - 'packages.aarch64-darwin.asche'
  - 'packages.x86_64-linux.yuanw'
  - 'packages.x86_64-linux.ci'
+ - 'packages.aarch64-darwin.ci'
+ - 'packages.aarch64-darwin.yuanw'
+ - 'packages.aarch64-darwin.wk01174'
  - 'packages.x86_64-linux.wk01174'
  include:
  - '*.x86_64-linux.*'