5 files changed, 6 insertions, 7 deletions
diff --git a/modules/by-name/di/direnv/module.nix b/modules/by-name/di/direnv/module.nix
index 31c70dad..baa0d954 100644
--- a/modules/by-name/di/direnv/module.nix
+++ b/modules/by-name/di/direnv/module.nix
@@ -16,15 +16,14 @@
 }: let
   cfg = config.soispha.programs.direnv;
 
-  devshells = sources.loadFlake "devshells";
+  inherit (sources) devshells nixpkgs;
 
   pre-cache = pkgs.runCommand "pre-cache.sh" {} ''
     cat "${./pre-cache.sh}" > $out
 
     substituteInPlace $out \
       --replace-fail "%DEVSHELLS_REPO%" "${devshells}" \
-      --replace-fail "%DEVSHELLS_REPO_REF%" "${devshells.sourceInfo.rev}"
-
+      --replace-fail "%DEVSHELLS_REPO_REF%" "${devshells.sourceInfo.rev}.${builtins.readFile "${nixpkgs}/.git-revision"}"
   '';
 in {
   options.soispha.programs.direnv = {
diff --git a/modules/by-name/ni/nix/module.nix b/modules/by-name/ni/nix/module.nix
index 7caa8a8e..b7e64989 100644
--- a/modules/by-name/ni/nix/module.nix
+++ b/modules/by-name/ni/nix/module.nix
@@ -19,7 +19,7 @@
   externalDependencies,
   ...
 }: let
-  nixpkgs = sources.loadFlake "nixpkgs";
+  inherit (sources) nixpkgs;
 
   cfg = config.soispha.nix;
 in {
diff --git a/modules/by-name/ni/nixos-shell/module.nix b/modules/by-name/ni/nixos-shell/module.nix
index 3556a98b..1a0190c8 100644
--- a/modules/by-name/ni/nixos-shell/module.nix
+++ b/modules/by-name/ni/nixos-shell/module.nix
@@ -15,7 +15,7 @@
   ...
 }: let
   cfg = config.soispha.nixos-shell;
-  nixpkgs = sources.loadFlake "nixpkgs";
+  inherit (sources) nixpkgs;
 in {
   options.soispha.nixos-shell = {
     enable = lib.mkEnableOption "nixos-shell";
diff --git a/modules/by-name/qu/qutebrowser/module.nix b/modules/by-name/qu/qutebrowser/module.nix
index 51c1b239..d7689793 100644
--- a/modules/by-name/qu/qutebrowser/module.nix
+++ b/modules/by-name/qu/qutebrowser/module.nix
@@ -80,7 +80,7 @@ in {
   config = lib.mkIf cfg.enable {
     home-manager.users.soispha = {
       disabledModules = [
-        "${sources.sources.home-manager}/modules/programs/qutebrowser.nix"
+        "${sources.home-manager}/modules/programs/qutebrowser.nix"
       ];
       imports = [
         ./module.hm.nix
diff --git a/modules/by-name/ve/version/module.nix b/modules/by-name/ve/version/module.nix
index 28328d1d..d666695d 100644
--- a/modules/by-name/ve/version/module.nix
+++ b/modules/by-name/ve/version/module.nix
@@ -15,7 +15,7 @@
 }: let
   cfg = config.soispha.version;
 
-  nixpkgs = sources.loadFlake "nixpkgs";
+  inherit (sources) nixpkgs;
 in {
   options.soispha.version = {
     enable = lib.mkEnableOption "storing the git revision in /etc/nixpkgs-git-revision";