1systems: stockholm/lib -> stockholm.lib

9 files changed, 173 insertions, 174 deletions

diff --git a/1systems/darth/config.nix b/1systems/darth/config.nix
index 4e71d1426..52df9b5df 100644
--- a/1systems/darth/config.nix
+++ b/1systems/darth/config.nix
@@ -1,6 +1,6 @@
 { config, pkgs, lib, ... }:
 
-with import <stockholm/lib>;
+with pkgs.stockholm.lib;
 let
   # all the good stuff resides in /data
 
diff --git a/1systems/gum/config.nix b/1systems/gum/config.nix
index f40f113bb..8d6acf63c 100644
--- a/1systems/gum/config.nix
+++ b/1systems/gum/config.nix
@@ -1,13 +1,12 @@
 { config, lib, pkgs, ... }:
 
-with import <stockholm/lib>;
+with pkgs.stockholm.lib;
 let
   external-ip = config.krebs.build.host.nets.internet.ip4.addr;
   ext-if = config.makefu.server.primary-itf;
   allDisks = [ "/dev/sda" "/dev/sdb" ];
 in {
   imports = [
-      <stockholm/makefu>
       ./hetznercloud
       {
         # wait for mount
@@ -27,38 +26,38 @@ in {
           ];
         };
       }
-      <stockholm/makefu/2configs/nur.nix>
-      <stockholm/makefu/2configs/support-nixos.nix>
-      <stockholm/makefu/2configs/nix-community/supervision.nix>
-      <stockholm/makefu/2configs/home-manager>
-      <stockholm/makefu/2configs/home-manager/cli.nix>
-      # <stockholm/makefu/2configs/stats/client.nix>
-      <stockholm/makefu/2configs/share>
-      <stockholm/makefu/2configs/share/hetzner-client.nix>
-      # <stockholm/makefu/2configs/stats/netdata-server.nix>
+      ../../2configs/nur.nix
+      ../../2configs/support-nixos.nix
+      ../../2configs/nix-community/supervision.nix
+      ../../2configs/home-manager
+      ../../2configs/home-manager/cli.nix
+      # ../../2configs/stats/client.nix
+      ../../2configs/share
+      ../../2configs/share/hetzner-client.nix
+      # ../../2configs/stats/netdata-server.nix
 
-      <stockholm/makefu/2configs/headless.nix>
+      ../../2configs/headless.nix
 
       # Security
-      <stockholm/makefu/2configs/sshd-totp.nix>
+      ../../2configs/sshd-totp.nix
 
       # Tools
-      <stockholm/makefu/2configs/tools/core.nix>
-      <stockholm/makefu/2configs/tools/dev.nix>
-      <stockholm/makefu/2configs/tools/sec.nix>
-      #<stockholm/makefu/2configs/tools/desktop.nix>
+      ../../2configs/tools/core.nix
+      ../../2configs/tools/dev.nix
+      ../../2configs/tools/sec.nix
+      #../../2configs/tools/desktop.nix
 
-      <stockholm/makefu/2configs/zsh-user.nix>
-      <stockholm/makefu/2configs/mosh.nix>
-      <stockholm/makefu/2configs/storj/forward-port.nix>
-      # <stockholm/makefu/2configs/gui/xpra.nix>
+      ../../2configs/zsh-user.nix
+      ../../2configs/mosh.nix
+      ../../2configs/storj/forward-port.nix
+      # ../../2configs/gui/xpra.nix
 
       # networking
-      # <stockholm/makefu/2configs/vpn/vpnws/server.nix>
-      #<stockholm/makefu/2configs/dnscrypt/server.nix>
-      # <stockholm/makefu/2configs/iodined.nix>
-      # <stockholm/makefu/2configs/backup.nix>
-      <stockholm/makefu/2configs/tinc/retiolum.nix>
+      # ../../2configs/vpn/vpnws/server.nix
+      #../../2configs/dnscrypt/server.nix
+      # ../../2configs/iodined.nix
+      # ../../2configs/backup.nix
+      ../../2configs/tinc/retiolum.nix
       { # bonus retiolum config for connecting more hosts
         krebs.tinc.retiolum = {
           #extraConfig = lib.mkForce ''
@@ -89,65 +88,65 @@ in {
       }
 
       # ci
-      # <stockholm/makefu/2configs/exim-retiolum.nix>
-      <stockholm/makefu/2configs/git/cgit-retiolum.nix>
+      # ../../2configs/exim-retiolum.nix
+      ../../2configs/git/cgit-retiolum.nix
 
       ### systemdUltras ###
-      <stockholm/makefu/2configs/systemdultras/ircbot.nix>
+      ../../2configs/systemdultras/ircbot.nix
 
       ###### Shack #####
-      # <stockholm/makefu/2configs/shack/events-publisher>
-      # <stockholm/makefu/2configs/shack/gitlab-runner>
+      # ../../2configs/shack/events-publisher
+      # ../../2configs/shack/gitlab-runner
 
 
-      <stockholm/makefu/2configs/remote-build/slave.nix>
-      <stockholm/makefu/2configs/remote-build/aarch64-community.nix>
-      <stockholm/makefu/2configs/taskd.nix>
+      ../../2configs/remote-build/slave.nix
+      ../../2configs/remote-build/aarch64-community.nix
+      ../../2configs/taskd.nix
 
       # services
-      <stockholm/makefu/2configs/bitlbee.nix> # postgres backend
-      # <stockholm/makefu/2configs/sabnzbd.nix>
-      # <stockholm/makefu/2configs/mail/mail.euer.nix>
+      ../../2configs/bitlbee.nix # postgres backend
+      # ../../2configs/sabnzbd.nix
+      # ../../2configs/mail/mail.euer.nix
       { krebs.exim.enable = mkDefault true; }
-      <stockholm/makefu/2configs/nix-community/mediawiki-matrix-bot.nix>
+      ../../2configs/nix-community/mediawiki-matrix-bot.nix
 
       # sharing
-      <stockholm/makefu/2configs/share/gum.nix> # samba sahre
-      <stockholm/makefu/2configs/torrent/rtorrent.nix>
-      # <stockholm/makefu/2configs/sickbeard>
+      ../../2configs/share/gum.nix # samba sahre
+      ../../2configs/torrent/rtorrent.nix
+      # ../../2configs/sickbeard
 
       { nixpkgs.config.allowUnfree = true; }
-      #<stockholm/makefu/2configs/retroshare.nix>
-      ## <stockholm/makefu/2configs/ipfs.nix>
-      #<stockholm/makefu/2configs/syncthing.nix>
-      # <stockholm/makefu/2configs/sync>
-      # <stockholm/makefu/2configs/opentracker.nix>
+      #../../2configs/retroshare.nix
+      ## ../../2configs/ipfs.nix
+      #../../2configs/syncthing.nix
+      # ../../2configs/sync
+      # ../../2configs/opentracker.nix
 
 
       ## network
-      # <stockholm/makefu/2configs/vpn/openvpn-server.nix>
-      # <stockholm/makefu/2configs/vpn/vpnws/server.nix>
-      <stockholm/makefu/2configs/binary-cache/server.nix>
+      # ../../2configs/vpn/openvpn-server.nix
+      # ../../2configs/vpn/vpnws/server.nix
+      ../../2configs/binary-cache/server.nix
       { makefu.backup.server.repo = "/var/backup/borg"; }
-      <stockholm/makefu/2configs/backup/server.nix>
-      <stockholm/makefu/2configs/backup/state.nix>
-      <stockholm/makefu/2configs/wireguard/server.nix>
-      <stockholm/makefu/2configs/wireguard/wiregrill.nix>
+      ../../2configs/backup/server.nix
+      ../../2configs/backup/state.nix
+      ../../2configs/wireguard/server.nix
+      ../../2configs/wireguard/wiregrill.nix
 
       { # recent changes mediawiki bot
         networking.firewall.allowedUDPPorts = [ 5005 5006 ];
       }
       # Removed until move: no extra mails
-      # <stockholm/makefu/2configs/urlwatch>
+      # ../../2configs/urlwatch
       # Removed until move: avoid letsencrypt ban
       ### Web
 
-      <stockholm/makefu/2configs/bitwarden.nix> # postgres backend
-      <stockholm/makefu/2configs/deployment/rss/rss.euer.krebsco.de.nix> # postgres backend
-      <stockholm/makefu/2configs/deployment/rss/ratt.nix>
+      ../../2configs/bitwarden.nix # postgres backend
+      ../../2configs/deployment/rss/rss.euer.krebsco.de.nix # postgres backend
+      ../../2configs/deployment/rss/ratt.nix
 
-      <stockholm/makefu/2configs/deployment/ntfysh.nix>
-      <stockholm/makefu/2configs/deployment/owncloud.nix> #postgres backend
+      ../../2configs/deployment/ntfysh.nix
+      ../../2configs/deployment/owncloud.nix #postgres backend
       ### Moving owncloud data dir to /media/cloud/nextcloud-data
       {
         users.users.nextcloud.extraGroups = [ "download" ];
@@ -167,57 +166,57 @@ in {
         #};
       }
 
-      <stockholm/makefu/2configs/nginx/dl.euer.krebsco.de.nix>
-      #<stockholm/makefu/2configs/nginx/euer.test.nix>
-      <stockholm/makefu/2configs/nginx/euer.mon.nix>
-      <stockholm/makefu/2configs/nginx/euer.wiki.nix>
-      <stockholm/makefu/2configs/nginx/euer.blog.nix>
-      <stockholm/makefu/2configs/nginx/music.euer.nix>
-      ## <stockholm/makefu/2configs/nginx/gum.krebsco.de.nix>
-      #<stockholm/makefu/2configs/nginx/public_html.nix>
-      #<stockholm/makefu/2configs/nginx/update.connector.one.nix>
-      <stockholm/makefu/2configs/nginx/misa-felix-hochzeit.ml.nix>
-      # <stockholm/makefu/2configs/nginx/gold.krebsco.de.nix>
-      # <stockholm/makefu/2configs/nginx/iso.euer.nix>
+      ../../2configs/nginx/dl.euer.krebsco.de.nix
+      #../../2configs/nginx/euer.test.nix
+      ../../2configs/nginx/euer.mon.nix
+      ../../2configs/nginx/euer.wiki.nix
+      ../../2configs/nginx/euer.blog.nix
+      ../../2configs/nginx/music.euer.nix
+      ## ../../2configs/nginx/gum.krebsco.de.nix
+      #../../2configs/nginx/public_html.nix
+      #../../2configs/nginx/update.connector.one.nix
+      ../../2configs/nginx/misa-felix-hochzeit.ml.nix
+      # ../../2configs/nginx/gold.krebsco.de.nix
+      # ../../2configs/nginx/iso.euer.nix
 
-      # <stockholm/makefu/2configs/deployment/photostore.krebsco.de.nix>
-      # <stockholm/makefu/2configs/deployment/graphs.nix>
-      #<stockholm/makefu/2configs/deployment/owncloud.nix>
-      # <stockholm/makefu/2configs/deployment/board.euer.krebsco.de.nix>
-      #<stockholm/makefu/2configs/deployment/feed.euer.krebsco.de>
-      <stockholm/makefu/2configs/deployment/boot-euer.nix>
-      <stockholm/makefu/2configs/deployment/gecloudpad>
-      #<stockholm/makefu/2configs/deployment/docker/archiveteam-warrior.nix>
-      <stockholm/makefu/2configs/deployment/mediengewitter.de.nix>
-      <stockholm/makefu/2configs/bgt/etherpad.euer.krebsco.de.nix>
-      # <stockholm/makefu/2configs/deployment/systemdultras-rss.nix>
+      # ../../2configs/deployment/photostore.krebsco.de.nix
+      # ../../2configs/deployment/graphs.nix
+      #../../2configs/deployment/owncloud.nix
+      # ../../2configs/deployment/board.euer.krebsco.de.nix
+      #../../2configs/deployment/feed.euer.krebsco.de
+      ../../2configs/deployment/boot-euer.nix
+      ../../2configs/deployment/gecloudpad
+      #../../2configs/deployment/docker/archiveteam-warrior.nix
+      ../../2configs/deployment/mediengewitter.de.nix
+      ../../2configs/bgt/etherpad.euer.krebsco.de.nix
+      # ../../2configs/deployment/systemdultras-rss.nix
 
-      <stockholm/makefu/2configs/shiori.nix>
-      #<stockholm/makefu/2configs/workadventure>
+      ../../2configs/shiori.nix
+      #../../2configs/workadventure
 
-      <stockholm/makefu/2configs/bgt/download.binaergewitter.de.nix>
-      <stockholm/makefu/2configs/bgt/hidden_service.nix>
-      <stockholm/makefu/2configs/bgt/backup.nix>
-      # <stockholm/makefu/2configs/bgt/social-to-irc.nix>
+      ../../2configs/bgt/download.binaergewitter.de.nix
+      ../../2configs/bgt/hidden_service.nix
+      ../../2configs/bgt/backup.nix
+      # ../../2configs/bgt/social-to-irc.nix
 
-      # <stockholm/makefu/2configs/logging/client.nix>
+      # ../../2configs/logging/client.nix
 
       # sharing
-      <stockholm/makefu/2configs/dcpp/airdcpp.nix>
-      { krebs.airdcpp.dcpp.shares = {
-          download.path = config.makefu.dl-dir + "/finished";
-          sorted.path = config.makefu.dl-dir + "/sorted";
-        };
-      }
-      <stockholm/makefu/2configs/dcpp/hub.nix>
+      # ../../2configs/dcpp/airdcpp.nix
+      #{ krebs.airdcpp.dcpp.shares = {
+      #    download.path = config.makefu.dl-dir + "/finished";
+      #    sorted.path = config.makefu.dl-dir + "/sorted";
+      #  };
+      #}
+      # ../../2configs/dcpp/hub.nix
 
       ## Temporary:
-      # <stockholm/makefu/2configs/temp/rst-issue.nix>
-      # <stockholm/makefu/2configs/virtualisation/docker.nix>
-      #<stockholm/makefu/2configs/virtualisation/libvirt.nix>
+      # ../../2configs/temp/rst-issue.nix
+      # ../../2configs/virtualisation/docker.nix
+      #../../2configs/virtualisation/libvirt.nix
 
       # krebs infrastructure services
-      # <stockholm/makefu/2configs/stats/server.nix>
+      # ../../2configs/stats/server.nix
     ];
 
   # makefu.dl-dir = "/var/download";
diff --git a/1systems/iso/config.nix b/1systems/iso/config.nix
index 207121236..f64deb028 100644
--- a/1systems/iso/config.nix
+++ b/1systems/iso/config.nix
@@ -1,6 +1,6 @@
 { config, pkgs, lib, ... }:
 
-with import <stockholm/lib>;
+with pkgs.stockholm.lib;
 {
   imports = [
     #<stockholm/makefu>
diff --git a/1systems/kexec/config.nix b/1systems/kexec/config.nix
index 5bf19f978..545bbb125 100644
--- a/1systems/kexec/config.nix
+++ b/1systems/kexec/config.nix
@@ -1,6 +1,6 @@
 { config, pkgs, lib, ... }:
 
-with import <stockholm/lib>;
+with pkgs.stockholm.lib;
 {
   imports = [
     <stockholm/makefu>
diff --git a/1systems/omo/config.nix b/1systems/omo/config.nix
index 224e170dd..27fe31815 100644
--- a/1systems/omo/config.nix
+++ b/1systems/omo/config.nix
@@ -10,10 +10,10 @@ in {
     [
       ./hw/omo.nix
       #./hw/tsp.nix
-      <stockholm/makefu>
-      <stockholm/makefu/2configs/headless.nix>
-      <stockholm/makefu/2configs/support-nixos.nix>
-      <stockholm/makefu/2configs/nur.nix>
+      ../../2configs/default.nix
+      ../../2configs/headless.nix
+      ../../2configs/support-nixos.nix
+      ../../2configs/nur.nix
       # x11 forwarding
       {
         services.openssh.forwardX11 = true;
@@ -24,39 +24,39 @@ in {
       { environment.systemPackages = [ pkgs.youtube-dl2kodi pkgs.youtube-dl]; }
 
 
-      <stockholm/makefu/2configs/zsh-user.nix>
-      <stockholm/makefu/2configs/home-manager>
-      <stockholm/makefu/2configs/home-manager/cli.nix>
-      <stockholm/makefu/2configs/editor/neovim>
-      # <stockholm/makefu/2configs/storj/client.nix>
+      ../../2configs/zsh-user.nix
+      ../../2configs/home-manager
+      ../../2configs/home-manager/cli.nix
+      ../../2configs/editor/neovim
+      # ../../2configs/storj/client.nix
 
 
-      <stockholm/makefu/2configs/backup/state.nix>
+      ../../2configs/backup/state.nix
 
       { makefu.backup.server.repo = "/media/cryptX/backup/borg"; }
-      <stockholm/makefu/2configs/backup/server.nix>
-      <stockholm/makefu/2configs/exim-retiolum.nix>
-      # <stockholm/makefu/2configs/smart-monitor.nix>
-      <stockholm/makefu/2configs/mail-client.nix>
-      <stockholm/makefu/2configs/mosh.nix>
-      <stockholm/makefu/2configs/tools/core.nix>
-      <stockholm/makefu/2configs/tools/dev.nix>
-      <stockholm/makefu/2configs/tools/desktop.nix>
-      <stockholm/makefu/2configs/tools/mobility.nix>
-      <stockholm/makefu/2configs/tools/consoles.nix>
-      #<stockholm/makefu/2configs/graphite-standalone.nix>
-      #<stockholm/makefu/2configs/share-user-sftp.nix>
-
-      <stockholm/makefu/2configs/urlwatch>
-      # <stockholm/makefu/2configs/legacy_only.nix>
-
-      <stockholm/makefu/2configs/share>
-      <stockholm/makefu/2configs/share/omo.nix>
-      <stockholm/makefu/2configs/share/gum-client.nix>
-      <stockholm/makefu/2configs/sync>
-
-      <stockholm/makefu/2configs/wireguard/wiregrill.nix>
-      #<stockholm/makefu/2configs/dcpp/airdcpp.nix>
+      ../../2configs/backup/server.nix
+      ../../2configs/exim-retiolum.nix
+      # ../../2configs/smart-monitor.nix
+      ../../2configs/mail-client.nix
+      ../../2configs/mosh.nix
+      ../../2configs/tools/core.nix
+      ../../2configs/tools/dev.nix
+      ../../2configs/tools/desktop.nix
+      ../../2configs/tools/mobility.nix
+      ../../2configs/tools/consoles.nix
+      #../../2configs/graphite-standalone.nix
+      #../../2configs/share-user-sftp.nix
+
+      ../../2configs/urlwatch
+      # ../../2configs/legacy_only.nix
+
+      ../../2configs/share
+      ../../2configs/share/omo.nix
+      ../../2configs/share/gum-client.nix
+      ../../2configs/sync
+
+      ../../2configs/wireguard/wiregrill.nix
+      #../../2configs/dcpp/airdcpp.nix
       #{ krebs.airdcpp.dcpp.shares = let
       #    d = path: "/media/cryptX/${path}";
       #  in {
@@ -72,42 +72,42 @@ in {
         #services.sabnzbd.enable = true;
         #systemd.services.sabnzbd.environment.SSL_CERT_FILE = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
       }
-      # <stockholm/makefu/2configs/share/omo-timemachine.nix>
-      <stockholm/makefu/2configs/tinc/retiolum.nix>
+      # ../../2configs/share/omo-timemachine.nix
+      ../../2configs/tinc/retiolum.nix
 
       # statistics
-      # <stockholm/makefu/2configs/stats/client.nix>
+      # ../../2configs/stats/client.nix
       # Logging
       #influx + grafana
-      <stockholm/makefu/2configs/stats/server.nix>
-      # <stockholm/makefu/2configs/stats/nodisk-client.nix>
+      ../../2configs/stats/server.nix
+      # ../../2configs/stats/nodisk-client.nix
       # logs to influx
-      <stockholm/makefu/2configs/stats/external/aralast.nix>
-      <stockholm/makefu/2configs/stats/telegraf>
-      # <stockholm/makefu/2configs/stats/telegraf/europastats.nix>
-      <stockholm/makefu/2configs/stats/telegraf/hamstats.nix>
-      <stockholm/makefu/2configs/hw/cdrip.nix>
+      ../../2configs/stats/external/aralast.nix
+      ../../2configs/stats/telegraf
+      # ../../2configs/stats/telegraf/europastats.nix
+      ../../2configs/stats/telegraf/hamstats.nix
+      ../../2configs/hw/cdrip.nix
 
       # services
       {
         services.nginx.enable = true;
         networking.firewall.allowedTCPPorts = [ 80 8123 ];
       }
-      # <stockholm/makefu/2configs/syncthing.nix>
-      <stockholm/makefu/2configs/remote-build/slave.nix>
+      # ../../2configs/syncthing.nix
+      ../../2configs/remote-build/slave.nix
       # TODO:
-      <stockholm/makefu/2configs/virtualisation/docker.nix>
-      <stockholm/makefu/2configs/bluetooth-mpd.nix>
-
-      <stockholm/makefu/2configs/home/jellyfin.nix>
-      <stockholm/makefu/2configs/home/music.nix>
-      <stockholm/makefu/2configs/home/photoprism.nix>
-      # <stockholm/makefu/2configs/home/tonie.nix>
-      <stockholm/makefu/2configs/home/ps4srv.nix>
-      # <stockholm/makefu/2configs/home/metube.nix>
-      # <stockholm/makefu/2configs/home/ham>
-      <stockholm/makefu/2configs/home/ham/docker.nix>
-      <stockholm/makefu/2configs/home/zigbee2mqtt>
+      ../../2configs/virtualisation/docker.nix
+      ../../2configs/bluetooth-mpd.nix
+
+      ../../2configs/home/jellyfin.nix
+      ../../2configs/home/music.nix
+      ../../2configs/home/photoprism.nix
+      # ../../2configs/home/tonie.nix
+      ../../2configs/home/ps4srv.nix
+      # ../../2configs/home/metube.nix
+      # ../../2configs/home/ham
+      ../../2configs/home/ham/docker.nix
+      ../../2configs/home/zigbee2mqtt
       {
         makefu.ps3netsrv = {
           enable = true;
@@ -123,10 +123,10 @@ in {
       }
 
       # security
-      <stockholm/makefu/2configs/sshd-totp.nix>
-      # <stockholm/makefu/2configs/logging/central-logging-client.nix>
+      ../../2configs/sshd-totp.nix
+      # ../../2configs/logging/central-logging-client.nix
 
-      # <stockholm/makefu/2configs/torrent.nix>
+      # ../../2configs/torrent.nix
       {
         #krebs.rtorrent = {
         #  downloadDir = lib.mkForce "/media/cryptX/torrent";
@@ -136,23 +136,23 @@ in {
         #};
       }
 
-      # <stockholm/makefu/2configs/elchos/search.nix>
-      # <stockholm/makefu/2configs/elchos/log.nix>
-      # <stockholm/makefu/2configs/elchos/irc-token.nix>
+      # ../../2configs/elchos/search.nix
+      # ../../2configs/elchos/log.nix
+      # ../../2configs/elchos/irc-token.nix
 
       ## as long as pyload is not in nixpkgs:
       # docker run -d -v /var/lib/pyload:/opt/pyload/pyload-config -v /media/crypt0/pyload:/opt/pyload/Downloads --name pyload --restart=always -p 8112:8000 -P writl/pyload
 
       # Temporary:
-      # <stockholm/makefu/2configs/temp/rst-issue.nix>
-      <stockholm/makefu/2configs/bgt/social-to-irc.nix>
+      # ../../2configs/temp/rst-issue.nix
+      ../../2configs/bgt/social-to-irc.nix
 
     ];
   makefu.full-populate =  true;
   nixpkgs.config.allowUnfree = true;
   users.users.share.isNormalUser = true;
   users.groups.share = {
-    gid = (import <stockholm/lib>).genid "share";
+    gid = pkgs.stockholm.lib.genid "share";
     members = [ "makefu" "misa" ];
   };
   networking.firewall.trustedInterfaces = [ primaryInterface "docker0" ];
diff --git a/1systems/omo/hw/omo.nix b/1systems/omo/hw/omo.nix
index eaedbb779..1fd5212ed 100644
--- a/1systems/omo/hw/omo.nix
+++ b/1systems/omo/hw/omo.nix
@@ -40,7 +40,8 @@ in {
   imports =
     [ # TODO: unlock home partition via ssh
       ./vaapi.nix
-    <stockholm/makefu/2configs/fs/sda-crypto-root.nix> ];
+      ../../../2configs/fs/sda-crypto-root.nix
+    ];
     
   makefu.server.primary-itf = primaryInterface;
   system.activationScripts.createCryptFolders = ''
diff --git a/1systems/shack-autoinstall/config.nix b/1systems/shack-autoinstall/config.nix
index d53c411c0..18bfd2ce1 100644
--- a/1systems/shack-autoinstall/config.nix
+++ b/1systems/shack-autoinstall/config.nix
@@ -1,6 +1,6 @@
 { config, pkgs, lib, ... }:
 
-with import <stockholm/lib>;
+with pkgs.stockholm.lib;
 let
   disk = "/dev/sda";
 in {
diff --git a/1systems/wry/config.nix b/1systems/wry/config.nix
index b728703ec..abeb7d8d3 100644
--- a/1systems/wry/config.nix
+++ b/1systems/wry/config.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with import <stockholm/lib>;
+with pkgs.stockholm.lib;
 let
 
   external-ip = config.krebs.build.host.nets.internet.ip4.addr;
diff --git a/1systems/x/config.nix b/1systems/x/config.nix
index 18722dc3d..e4602b3e7 100644
--- a/1systems/x/config.nix
+++ b/1systems/x/config.nix
@@ -6,8 +6,7 @@
       # ./x230
       ./x13
 
-      (self + "/2configs/default.nix")
-
+      ../../2configs/default.nix
       ## Common Hardware Components
       # (self + "/makefu/2configs/hw/mceusb.nix")
       # (self + "/2configs/hw/rtl8812au.nix")