4 files changed, 11 insertions, 9 deletions
diff --git a/krebs/3modules/upstream/default.nix b/krebs/3modules/upstream/default.nix
index ce7bd1644..91de6beeb 100644
--- a/krebs/3modules/upstream/default.nix
+++ b/krebs/3modules/upstream/default.nix
@@ -1,4 +1,5 @@
-with import <stockholm/lib>;
+{ pkgs, lib, ... }:
+with lib;
 
 {
   imports =
@@ -6,5 +7,5 @@ with import <stockholm/lib>;
       (name: ./. + "/${name}")
       (filter
         (name: name != "default.nix" && !hasPrefix "." name)
-        (attrNames (readDir ./.)));
+        (attrNames (builtins.readDir ./.)));
 }
diff --git a/krebs/3modules/upstream/desktop-managers/coma.nix b/krebs/3modules/upstream/desktop-managers/coma.nix
index 95db7fb5c..e12f4b981 100644
--- a/krebs/3modules/upstream/desktop-managers/coma.nix
+++ b/krebs/3modules/upstream/desktop-managers/coma.nix
@@ -1,5 +1,6 @@
-with import <stockholm/lib>;
-{ config, pkgs, ... }: {
+{ config, pkgs, lib, ... }:
+with lib;
+{
   options = {
     services.xserver.desktopManager.coma = {
       enable = mkEnableOption "sleep as a desktop manager";
diff --git a/krebs/3modules/upstream/desktop-managers/none.nix b/krebs/3modules/upstream/desktop-managers/none.nix
index 892def985..77f7ad513 100644
--- a/krebs/3modules/upstream/desktop-managers/none.nix
+++ b/krebs/3modules/upstream/desktop-managers/none.nix
@@ -1,9 +1,9 @@
+{ lib, ... }:
 # Replace upstream none desktop-manager by a real none, that doesn't pull in
 # any dependencies.
-with import <stockholm/lib>;
 {
-  disabledModules = singleton "services/x11/desktop-managers/none.nix";
-  config.services.xserver.desktopManager.session = singleton {
+  disabledModules = lib.singleton "services/x11/desktop-managers/none.nix";
+  config.services.xserver.desktopManager.session = lib.singleton {
     name = "none";
     bgSupport = true;
     start = "";
diff --git a/krebs/3modules/upstream/window-managers/default.nix b/krebs/3modules/upstream/window-managers/default.nix
index eecadca7e..cdd82076d 100644
--- a/krebs/3modules/upstream/window-managers/default.nix
+++ b/krebs/3modules/upstream/window-managers/default.nix
@@ -13,8 +13,8 @@
       imports = [ ./xmonad.nix ];
       nixpkgs.overlays = [(self: super: {
         writers = super.writers // {
-          writeHaskellBin = name: spec: with import <stockholm/lib>;
-            super.writers.writeHaskellBin name (removeAttrs spec ["ghcArgs"]);
+          writeHaskellBin = name: spec:
+            super.writers.writeHaskellBin name (builtins.removeAttrs spec ["ghcArgs"]);
         };
       })];
     }