From 96d1bcdcaa48668e41e1576a5773571b49d8c003 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Wed, 23 Mar 2022 19:58:38 +0100
Subject: ...

---
 accounts/gkleen@sif/default.nix | 2 +-
 flake.nix                       | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index e1b0fe14..d4d81849 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -116,7 +116,7 @@ in {
       mpv.config = {
         demuxer-max-bytes = 1073741824;
         demuxer-max-back-bytes = 268435456;
-        gpu-api = "vulkan";
+        # gpu-api = "vulkan";
       };
 
       autorandr = {
diff --git a/flake.nix b/flake.nix
index f1a2e434..ef7b3674 100644
--- a/flake.nix
+++ b/flake.nix
@@ -146,9 +146,7 @@
         in forAllSystems (system: _systemPkgs: optionalAttrs (!(isNull installerConfig)) (mkInstallers system));
       installerNixosConfigurations = listToAttrs (concatLists (mapAttrsToList (system: mapAttrsToList (profile: { config, ... }: nameValuePair ("installer-${system}-${profile}") config)) installers));
 
-      packages =
-        let installerPackages = system: optionalAttrs (!(isNull installerConfig)) (mapAttrs' (profile: value: nameValuePair "installer-${profile}" value.output) installers.${system});
-        in forAllSystems (system: systemPkgs: self.overlays.default (self.legacyPackages.${system}) systemPkgs // installerPackages system);
+      packages = forAllSystems (system: systemPkgs: composeManyExtensions (attrValues self.overlays) self.legacyPackages.${system} systemPkgs);
 
       activateHomeManager = system: base: (deploy-rs.lib.${system}.activate.custom // { dryActivate = "DRY_RUN=1 $PROFILE/activate"; }) base.activationPackage "$PROFILE/activate";
     in
@@ -166,9 +164,7 @@
         homeModules = nixImport rec { dir = ./home-modules; };
         homeConfigurations = listToAttrs (concatLists (mapAttrsToList (hostname: nixosConfig: mapAttrsToList (username: configuration: nameValuePair "${username}@${hostname}" { inherit (configuration.home) activationPackage; }) nixosConfig.config.home-manager.users) self.nixosConfigurations));
 
-        overlays = let
-          overlays = mapAttrs (_name: path: mkOverlay path) overlayPaths;
-        in overlays // { default = final: prev: composeManyExtensions (attrValues overlays) final prev; };
+        overlays = mapAttrs (_name: path: mkOverlay path) overlayPaths;
         overlays-path = forAllSystems (system: _: self.legacyPackages.${system}.writeText "overlays.nix" ''
           map import (builtins.attrValues (builtins.fromJSON ${self.legacyPackages.${system}.lib.strings.escapeNixString (toJSON overlayPaths)}))
         '');
-- 
cgit v1.2.3