From 6048a641b830ed4858cdc76ffc86ee75edac3961 Mon Sep 17 00:00:00 2001
From: Gabriel Volpe <volpegabriel@gmail.com>
Date: Sat, 24 Feb 2024 22:02:42 +0100
Subject: [PATCH] expose configuration builders so they can be used from a
 local private flake

---
 flake.nix        | 17 +++++++++--------
 lib/overlays.nix |  8 +-------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/flake.nix b/flake.nix
index 38db03ae..1bcc4d57 100644
--- a/flake.nix
+++ b/flake.nix
@@ -16,10 +16,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    #sxm-flake = {
-    #url = git+file:///home/gvolpe/workspace/sxm/sxm-flake;
-    #};
-
     neovim-flake = {
       #url = git+file:///home/gvolpe/workspace/neovim-flake;
       url = github:gvolpe/neovim-flake;
@@ -82,13 +78,18 @@
         inherit (inputs.rycee-nurpkgs.lib.${system}) buildFirefoxXpiAddon;
         addons = pkgs.nur.repos.rycee.firefox-addons;
       };
+
+      mkHomeConfigurations = p:
+        import ./outputs/home-conf.nix { inherit inputs system extraArgs; pkgs = p; };
+
+      mkNixosConfigurations = p:
+        import ./outputs/nixos-conf.nix { inherit inputs system extraArgs; pkgs = p; };
     in
     {
-      homeConfigurations =
-        import ./outputs/home-conf.nix { inherit inputs system pkgs extraArgs; };
+      inherit mkHomeConfigurations mkNixosConfigurations pkgs;
 
-      nixosConfigurations =
-        import ./outputs/nixos-conf.nix { inherit inputs system pkgs extraArgs; };
+      homeConfigurations = mkHomeConfigurations pkgs;
+      nixosConfigurations = mkNixosConfigurations pkgs;
 
       packages.${system} = {
         inherit (pkgs) bazecor metals metals-updater;
diff --git a/lib/overlays.nix b/lib/overlays.nix
index b5a0a2c3..9cf5c168 100644
--- a/lib/overlays.nix
+++ b/lib/overlays.nix
@@ -4,7 +4,7 @@ with inputs;
 
 let
   cowsayOverlay = f: p: {
-    inherit (inputs.cowsay.packages.${system}) cowsay;
+    inherit (cowsay.packages.${system}) cowsay;
   };
 
   fishOverlay = f: p: {
@@ -22,11 +22,6 @@ let
       inherit (libx) removeNewline secretManager;
     });
   };
-
-  sxmOverlay =
-    if (builtins.hasAttr "sxm-flake" inputs)
-    then sxm-flake.overlays.default
-    else (f: p: { });
 in
 [
   cowsayOverlay
@@ -36,7 +31,6 @@ in
   nurpkgs.overlay
   neovim-flake.overlays.${system}.default
   statix.overlays.default
-  sxmOverlay
   (import ../home/overlays/bat-lvl)
   (import ../home/overlays/bazecor)
   (import ../home/overlays/juno-theme)