From 75c9efa1083a3d69e09f7ebc72aed1292176f682 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Sat, 12 Mar 2022 21:00:35 +0100
Subject: deprecated flake outputs

---
 flake.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/flake.nix b/flake.nix
index 625c16a8..b2337d99 100644
--- a/flake.nix
+++ b/flake.nix
@@ -135,7 +135,7 @@
 
       packages =
         let installerPackages = system: optionalAttrs (!(isNull installerConfig)) (mapAttrs' (profile: value: nameValuePair "installer-${profile}" value.output) installers.${system});
-        in forAllSystems (system: systemPkgs: self.overlay (self.legacyPackages.${system}) systemPkgs // installerPackages system);
+        in forAllSystems (system: systemPkgs: self.overlays.default (self.legacyPackages.${system}) systemPkgs // installerPackages system);
     in
       {
         nixosModules =
@@ -151,8 +151,9 @@
         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));
 
-        overlay = final: prev: composeManyExtensions (attrValues self.overlays) final prev;
-        overlays = mapAttrs (_name: path: import path) overlayPaths;
+        overlays = let
+          overlays = mapAttrs (_name: path: import path) overlayPaths;
+        in overlays // { default = final: prev: composeManyExtensions (attrValues overlays) final prev; };
         overlays-path = forAllSystems (system: _: self.legacyPackages.${system}.writeText "overlays.nix" ''
           map import (builtins.attrValues (builtins.fromJSON ${self.legacyPackages.${system}.lib.strings.escapeNixString (toJSON overlayPaths)}))
         '');
@@ -164,9 +165,9 @@
 
         apps = activateNixosConfigurations;
 
-        devShell = forAllSystems (system: systemPkgs: import ./shell.nix { pkgs = self.legacyPackages.${system}; deploy-rs = deploy-rs.defaultPackage.${system}; });
+        devShells = forAllSystems (system: systemPkgs: { default = import ./shell.nix { pkgs = self.legacyPackages.${system}; deploy-rs = deploy-rs.defaultPackage.${system}; }; });
 
-        defaultTemplate = {
+        templates.default = {
           path = ./.;
           description = "GKleen's flakey nixos configuration";
         };
-- 
cgit v1.2.3