6 files changed, 24 insertions, 13 deletions
diff --git a/flake.nix b/flake.nix
index 49168bfd..a5ada983 100644
--- a/flake.nix
+++ b/flake.nix
@@ -86,6 +86,8 @@
     outputs = import ./flake {
       inherit
         self
+        sources
+        nixpkgs
         system
         openPRsNixpkgs
         packageSets
diff --git a/flake/default.nix b/flake/default.nix
index 83138f32..598dcbd2 100644
--- a/flake/default.nix
+++ b/flake/default.nix
@@ -9,6 +9,8 @@
 # If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>.
 {
   self,
+  sources,
+  nixpkgs,
   system,
   openPRsNixpkgs,
   packageSets,
@@ -29,6 +31,8 @@
   nixosConfigurations = import ../hosts {
     inherit
       self
+      sources
+      nixpkgs
       system
       openPRsNixpkgs
       packageSets
@@ -107,6 +111,7 @@ in {
         pkgs.alejandra
         pkgs.deadnix
         pkgs.nvd
+        pkgs.npins
       ];
     };
   };
diff --git a/hosts/default.nix b/hosts/default.nix
index 64768074..fc18d556 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -9,6 +9,8 @@
 # If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>.
 {
   self,
+  sources,
+  nixpkgs,
   system,
   openPRsNixpkgs,
   packageSets,
@@ -24,18 +26,19 @@
   };
 
   generateHost = _: path:
-    self.inputs.nixpkgs.lib.nixosSystem {
+    nixpkgs.lib.nixosSystem {
       specialArgs = {
         inherit
+          self
           libraries
           modules
-          self
           ;
       };
       modules = [
         {
           _module.args = {
             inherit
+              sources
               # extra package sources
               openPRsNixpkgs
               packageSets
diff --git a/modules/by-name/ni/nix/module.nix b/modules/by-name/ni/nix/module.nix
index 2b91f59b..ed4462f4 100644
--- a/modules/by-name/ni/nix/module.nix
+++ b/modules/by-name/ni/nix/module.nix
@@ -10,11 +10,15 @@
 {
   pkgs,
   # flakes
+  sources,
   self,
   system,
   externalDependencies,
   ...
-}: {
+}:
+let
+  nixpkgs = sources.loadFlake "nixpkgs";
+in {
   # TODO(@bpeetz): Modularize <2025-02-08>
 
   nix = {
@@ -24,9 +28,9 @@
     channel.enable = false;
 
     registry = {
-      nixpkgs.flake = self.inputs.nixpkgs;
+      nixpkgs.flake = nixpkgs;
       n.flake =
-        self.inputs.nixpkgs
+        nixpkgs
         // {
           # Otherwise nixpkgs's config and overlays are not available:
 
@@ -52,14 +56,10 @@
       experimental-features = [
         "nix-command"
         "flakes"
-        #"ca-derivations"
       ];
 
       use-xdg-base-directories = true;
 
-      #substituters = ["https://cache.ngi0.nixos.org/"];
-      #trusted-public-keys = ["cache.ngi0.nixos.org-1:KqH5CBLNSyX184S9BKZJo1LxrxJ9ltnY2uAs5c/f1MA="];
-
       fallback = true; # Build from source, if binary can't be substituted
 
       keep-failed = false; # keep failed tmp build dirs
diff --git a/modules/by-name/ni/nixos-shell/module.nix b/modules/by-name/ni/nixos-shell/module.nix
index 8dda2890..3556a98b 100644
--- a/modules/by-name/ni/nixos-shell/module.nix
+++ b/modules/by-name/ni/nixos-shell/module.nix
@@ -11,10 +11,11 @@
   lib,
   config,
   pkgs,
-  self,
+  sources,
   ...
 }: let
   cfg = config.soispha.nixos-shell;
+  nixpkgs = sources.loadFlake "nixpkgs";
 in {
   options.soispha.nixos-shell = {
     enable = lib.mkEnableOption "nixos-shell";
@@ -85,7 +86,7 @@ in {
   };
 
   config = let
-    vmSystem = self.inputs.nixpkgs.lib.nixosSystem {
+    vmSystem = nixpkgs.lib.nixosSystem {
       inherit (cfg.configuration) specialArgs;
 
       modules = [
diff --git a/modules/by-name/qu/qutebrowser/module.nix b/modules/by-name/qu/qutebrowser/module.nix
index dab06237..d233b98a 100644
--- a/modules/by-name/qu/qutebrowser/module.nix
+++ b/modules/by-name/qu/qutebrowser/module.nix
@@ -2,7 +2,7 @@
   config,
   lib,
   pkgs,
-  self,
+  sources,
   ...
 }: let
   cfg = config.soispha.programs.qutebrowser;
@@ -80,7 +80,7 @@ in {
   config = lib.mkIf cfg.enable {
     home-manager.users.soispha = {
       disabledModules = [
-        "${self.inputs.home-manager}/modules/programs/qutebrowser.nix"
+        "${sources.sources.home-manager}/modules/programs/qutebrowser.nix"
       ];
       imports = [
         ./module.hm.nix