flake.nix: Don't perform source mapping via sources and raw_sources

1 files changed, 7 insertions, 9 deletions

diff --git a/flake.nix b/flake.nix
index 860ce277..9b729bd0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,16 +4,13 @@
   inputs = {};
 
   outputs = {self, ...}: let
-    raw_sources = import ./unflake.nix;
+    sources = import ./unflake.nix;
 
     system = "x86_64-linux";
 
-    # Filter out the nixpkgs's from the sources, so we always use the `packageSets`.
-    sources = builtins.removeAttrs raw_sources ["nixpkgs-stable" "nixpkgs-unstable" "library"];
-
     packageSets = rec {
-      stable = raw_sources.nixpkgs-stable.legacyPackages.${system};
-      unstable = raw_sources.nixpkgs-unstable.legacyPackages.${system};
+      stable = sources.nixpkgs-stable.legacyPackages.${system};
+      unstable = sources.nixpkgs-unstable.legacyPackages.${system};
 
       in_tree = import ./pkgs {
         unstable_pkgs = unstable;
@@ -22,7 +19,7 @@
       };
     };
     lib = packageSets.unstable.lib;
-    extra_lib = raw_sources.library.nixLib;
+    extra_lib = sources.library.extraLib {inherit lib;};
 
     extra_modules = {
       nixos = {
@@ -37,7 +34,8 @@
       };
       home = {
         nix-index-database = sources.nix-index-database.homeModules.nix-index;
-        nixvim = sources.nixvim.homeManagerModule;
+        nixvim = sources.nixvim.homeModules.nixvim;
+        turtle = sources.turtle.nixosModules.home-manager;
       };
     };
     module_args = {
@@ -76,7 +74,7 @@
         system
         ;
       inherit
-        (raw_sources)
+        (sources)
         nixpkgs-unstable
         nixpkgs-stable
         deploy-rs