Commit 66ccdda36b7b

@@ -39,30 +39,30 @@
     use-xdg-base-directories = true;
   };
 
-  nixpkgs = {
-    overlays = [
-      # Our own flake exports (from overlays and pkgs dir)
-      outputs.overlays.additions
-      outputs.overlays.modifications
-      outputs.overlays.unstable-packages
-
-      # And from other flakes
-      inputs.emacs-overlay.overlay
-      inputs.chapeau-rouge.overlays.openshift
-      inputs.chick-group.overlays.default
-      inputs.agenix.overlays.default
-      inputs.niri.overlays.niri
-
-      # Migrate to "modifications"
-      (_: prev: {
-        inherit (inputs.buildkit-tekton.packages.${prev.system}) tkn-local;
-        inherit (inputs.dagger.packages.${prev.system}) dagger;
-      })
-    ];
-    config = {
-      allowUnfree = true;
-      # Workaround for https://github.com/nix-community/home-manager/issues/2942
-      allowUnfreePredicate = _: true;
-    };
-  };
+  # nixpkgs = {
+  #   overlays = [
+  #     # Our own flake exports (from overlays and pkgs dir)
+  #     outputs.overlays.additions
+  #     outputs.overlays.modifications
+  #     outputs.overlays.unstable-packages
+  #
+  #     # And from other flakes
+  #     inputs.emacs-overlay.overlay
+  #     inputs.chapeau-rouge.overlays.openshift
+  #     inputs.chick-group.overlays.default
+  #     inputs.agenix.overlays.default
+  #     inputs.niri.overlays.niri
+  #
+  #     # Migrate to "modifications"
+  #     (_: prev: {
+  #       inherit (inputs.buildkit-tekton.packages.${prev.system}) tkn-local;
+  #       inherit (inputs.dagger.packages.${prev.system}) dagger;
+  #     })
+  #   ];
+  #   config = {
+  #     allowUnfree = true;
+  #     # Workaround for https://github.com/nix-community/home-manager/issues/2942
+  #     allowUnfreePredicate = _: true;
+  #   };
+  # };
 }

@@ -83,7 +83,11 @@
         inputs.lanzaboote.nixosModules.lanzaboote
         homeInput.nixosModules.home-manager
         # inputs.niri.nixosModules.niri
-        { home-manager.extraSpecialArgs = specialArgs; }
+        {
+          home-manager.extraSpecialArgs = specialArgs;
+          home-manager.useGlobalPkgs = true;
+          home-manager.useUserPackages = true;
+        }
         ../systems
       ];
     };

@@ -3,6 +3,7 @@
   imports = [
     ../../home/common/dev/containers.nix
   ];
+  nixpkgs.config.allowUnfree = true;
 
   home.file.".gmailctl/config.jsonnet".source = ./config.jsonnet;
   home.file.".gmailctl/gmailctl.libsonnet".source = ./gmailctl.libsonnet;

@@ -43,6 +43,8 @@
     ];
     config = {
       allowUnfree = true;
+      # Workaround for https://github.com/nix-community/home-manager/issues/2942
+      allowUnfreePredicate = _: true;
     };
   };
 
@@ -94,7 +96,6 @@
       trusted-public-keys = [
         "r-ryantm.cachix.org-1:gkUbLkouDAyvBdpBX0JOdIiD2/DP1ldF3Z3Y6Gqcc4c="
         "shortbrain.cachix.org-1:dqXcXzM0yXs3eo9ChmMfmob93eemwNyhTx7wCR4IjeQ="
-        "mic92.cachix.org-1:gi8IhgiT3CYZnJsaW7fxznzTkMUOn1RY4GmXdT/nXYQ="
         "chapeau-rouge.cachix.org-1:r34IG766Ez4Eeanr7Zx+egzXLE2Zgvc+XRspYZPDAn8="
         "vdemeester.cachix.org-1:eZWNOrLR9A9szeMahn9ENaoT9DB3WgOos8va+d2CU44="
         "nixos-raspberrypi.cachix.org-1:4iMO9LXa8BqhU+Rpg6LQKiGa2lsNh/j2oiYLNOQ5sPI="