diff --git a/2configs/gui/automatic-diskmount.nix b/2configs/gui/automatic-diskmount.nix
index ad3774b..2cf97da 100644
--- a/2configs/gui/automatic-diskmount.nix
+++ b/2configs/gui/automatic-diskmount.nix
@@ -1,5 +1,5 @@
-{ pkgs, ... }:
-with import <stockholm/lib>; #genid
+{ pkgs, stockholm, ... }:
+with stockholm.lib; #genid
 { # auto-mounting via polkit
   services.udisks2.enable = true;
 ## automount all disks:
diff --git a/2configs/home-manager/default.nix b/2configs/home-manager/default.nix
index be88611..6af0355 100644
--- a/2configs/home-manager/default.nix
+++ b/2configs/home-manager/default.nix
@@ -1,7 +1,5 @@
 {
-  imports = [
-    <home-manager/nixos>
-  ];
+  imports = [ ];
   home-manager.useUserPackages = true;
   home-manager.useGlobalPkgs = true;
   home-manager.users.makefu = {
diff --git a/2configs/home-manager/zsh.nix b/2configs/home-manager/zsh.nix
index c875d52..6f05bcc 100644
--- a/2configs/home-manager/zsh.nix
+++ b/2configs/home-manager/zsh.nix
@@ -37,7 +37,7 @@
     programs.direnv.enable = true;
     programs.direnv.nix-direnv.enable = true;
     programs.direnv.enableZshIntegration = true;
-    home.packages = [ (pkgs.writeDashBin "nixify" ''
+    home.packages = [ (pkgs.writers.writeDashBin "nixify" ''
 test ! -e shell.nix && cat > shell.nix <<EOF
 { pkgs ? import <nixpkgs> {}}:
 
diff --git a/2configs/tools/core-gui.nix b/2configs/tools/core-gui.nix
index bcd3022..74d122c 100644
--- a/2configs/tools/core-gui.nix
+++ b/2configs/tools/core-gui.nix
@@ -7,7 +7,6 @@
     feh
     clipit
     # firefox
-    keepassx
     pcmanfm
     evince
     # replacement for mirage:
diff --git a/2configs/tools/core.nix b/2configs/tools/core.nix
index aea2e56..378c89b 100644
--- a/2configs/tools/core.nix
+++ b/2configs/tools/core.nix
@@ -49,10 +49,11 @@ ${gnused}/bin/sed -i "''${1}d" ~/.ssh/known_hosts
     jq
     parallel
     proot
-    populate
 
     rxvt_unicode.terminfo
-    kpaste
+
+    # TODO: missing stockholm overlay
+    # kpaste
 
   ];
 }
diff --git a/2configs/wireguard/wiregrill.nix b/2configs/wireguard/wiregrill.nix
index 922dc8c..27984d4 100644
--- a/2configs/wireguard/wiregrill.nix
+++ b/2configs/wireguard/wiregrill.nix
@@ -1,5 +1,6 @@
-with import <stockholm/lib>;
-{ config, pkgs, ... }: let
+
+{ config, pkgs, lib, ... }: with lib; with pkgs.stockholm.lib;
+let
 
   self = config.krebs.build.host.nets.wiregrill;
   isRouter = !isNull self.via; # via "internet" is not set