RIP specialArgs.lib

krebs/3modules/Reaktor.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 let
 
   ReaktorConfig = pkgs.writeText "config.py" ''
@@ -16,7 +16,7 @@ let
 
   out = {
     options.krebs.Reaktor = api;
-    config = mkIf cfg.enable imp;
+    config = lib.mkIf cfg.enable imp;
   };
 
   api = {

krebs/3modules/apt-cacher-ng.nix

@@ -1,6 +1,6 @@
 { config, pkgs, lib, ... }:
 
-with lib;
+with config.krebs.lib;
 let
   acng-config = pkgs.writeTextFile {
     name = "acng-configuration";
@@ -151,5 +151,5 @@ let
 in
 {
   options.krebs.apt-cacher-ng = api;
-  config = mkIf cfg.enable imp;
+  config = lib.mkIf cfg.enable imp;
 }

krebs/3modules/backup.nix

@@ -1,9 +1,9 @@
 { config, lib, pkgs, ... }:
-with lib;
+with config.krebs.lib;
 let
   out = {
     options.krebs.backup = api;
-    config = mkIf cfg.enable imp;
+    config = lib.mkIf cfg.enable imp;
   };
 
   cfg = config.krebs.backup;

krebs/3modules/bepasty-server.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 let
   gunicorn = pkgs.pythonPackages.gunicorn;
   bepasty = pkgs.pythonPackages.bepasty-server;
@@ -10,8 +10,8 @@ let
 
   out = {
     options.krebs.bepasty = api;
-    config = mkIf cfg.enable (mkMerge [
+    config = lib.mkIf cfg.enable (lib.mkMerge [
-      (mkIf cfg.serveNginx nginx-imp)
+      (lib.mkIf cfg.serveNginx nginx-imp)
       imp
     ]);
   };

krebs/3modules/build.nix

@@ -1,6 +1,6 @@
 { config, lib, ... }:
 
-with lib;
+with config.krebs.lib;
 
 let
   out = {

krebs/3modules/buildbot/master.nix

@@ -1,6 +1,6 @@
 { config, pkgs, lib, ... }:
 
-with lib;
+with config.krebs.lib;
 let
   buildbot = pkgs.buildbot;
   buildbot-master-config = pkgs.writeText "buildbot-master.cfg" ''
@@ -381,5 +381,5 @@ let
 in
 {
   options.krebs.buildbot.master = api;
-  config = mkIf cfg.enable imp;
+  config = lib.mkIf cfg.enable imp;
 }

krebs/3modules/buildbot/slave.nix

@@ -1,6 +1,6 @@
 { config, pkgs, lib, ... }:
 
-with lib;
+with config.krebs.lib;
 let
   buildbot-slave-init = pkgs.writeText "buildbot-slave.tac" ''
     import os
@@ -182,5 +182,5 @@ let
 in
 {
   options.krebs.buildbot.slave = api;
-  config = mkIf cfg.enable imp;
+  config = lib.mkIf cfg.enable imp;
 }

krebs/3modules/current.nix

@@ -1,13 +1,13 @@
 { config, pkgs, lib, ... }:
 
-with lib;
+with config.krebs.lib;
 
 let
   cfg = config.krebs.current;
 
   out = {
     options.krebs.current = api;
-    config = mkIf cfg.enable imp;
+    config = lib.mkIf cfg.enable imp;
   };
 
   api = {

krebs/3modules/default.nix

@@ -1,6 +1,6 @@
 { config, lib, ... }:
 
-with lib;
+with config.krebs.lib;
 let
   cfg = config.krebs;
 
@@ -33,7 +33,7 @@ let
       ./urlwatch.nix
     ];
     options.krebs = api;
-    config = mkIf cfg.enable imp;
+    config = lib.mkIf cfg.enable imp;
   };
 
   api = {
@@ -84,13 +84,13 @@ let
     };
   };
 
-  imp = mkMerge [
+  imp = lib.mkMerge [
-    { krebs = import ./lass { inherit lib; }; }
+    { krebs = import ./lass   { inherit config lib; }; }
-    { krebs = import ./makefu { inherit lib; }; }
+    { krebs = import ./makefu { inherit config lib; }; }
-    { krebs = import ./miefda { inherit lib; }; }
+    { krebs = import ./miefda { inherit config lib; }; }
-    { krebs = import ./mv { inherit lib; }; }
+    { krebs = import ./mv     { inherit config lib; }; }
-    { krebs = import ./shared { inherit lib; }; }
+    { krebs = import ./shared { inherit config lib; }; }
-    { krebs = import ./tv { inherit lib; }; }
+    { krebs = import ./tv     { inherit config lib; }; }
     {
       krebs.dns.providers = {
         de.krebsco = "zones";

krebs/3modules/exim-retiolum.nix

@@ -1,12 +1,12 @@
 { config, pkgs, lib, ... }:
 
-with lib;
+with config.krebs.lib;
 let
   cfg = config.krebs.exim-retiolum;
 
   out = {
     options.krebs.exim-retiolum = api;
-    config = mkIf cfg.enable imp;
+    config = lib.mkIf cfg.enable imp;
   };
 
   api = {

krebs/3modules/exim-smarthost.nix

@@ -1,13 +1,12 @@
 { config, pkgs, lib, ... }:
 
-with builtins;
+with config.krebs.lib;
-with lib;
 let
   cfg = config.krebs.exim-smarthost;
 
   out = {
     options.krebs.exim-smarthost = api;
-    config = mkIf cfg.enable imp;
+    config = lib.mkIf cfg.enable imp;
   };
 
   api = {

krebs/3modules/fetchWallpaper.nix

@@ -1,13 +1,13 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 
 let
   cfg = config.krebs.fetchWallpaper;
 
   out = {
     options.krebs.fetchWallpaper = api;
-    config = mkIf cfg.enable imp;
+    config = lib.mkIf cfg.enable imp;
   };
 
   api = {

krebs/3modules/git.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, pkgs, ... }:
 
 # TODO unify logging of shell scripts to user and journal
 # TODO move all scripts to ${etcDir}, so ControlMaster connections
@@ -6,13 +6,13 @@
 # TODO when authorized_keys changes, then restart ssh
 #       (or kill already connected users somehow)
 
-with lib;
+with config.krebs.lib;
 let
   cfg = config.krebs.git;
 
   out = {
     options.krebs.git = api;
-    config = mkIf cfg.enable (mkMerge [
+    config = with lib; mkIf cfg.enable (mkMerge [
       (mkIf cfg.cgit cgit-imp)
       git-imp
     ]);
@@ -86,7 +86,7 @@ let
         singleton {
           user = [ config.krebs.users.tv ];
           repo = [ testing ]; # see literal example of repos
-          perm = push "refs/*" (with lib.git; [
+          perm = push "refs/*" (with config.krebs.lib.git; [
             non-fast-forward create delete merge
           ]);
         }

krebs/3modules/github-hosts-sync.nix

@@ -1,12 +1,12 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 let
   cfg = config.krebs.github-hosts-sync;
 
   out = {
     options.krebs.github-hosts-sync = api;
-    config = mkIf cfg.enable imp;
+    config = lib.mkIf cfg.enable imp;
   };
 
   api = {

krebs/3modules/go.nix

@@ -1,13 +1,13 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 
 let
   cfg = config.krebs.go;
 
   out = {
     options.krebs.go = api;
-    config = mkIf cfg.enable imp;
+    config = lib.mkIf cfg.enable imp;
   };
 
   api = {

krebs/3modules/lass/default.nix

@@ -1,6 +1,6 @@
-{ lib, ... }:
+{ config, lib, ... }:
 
-with lib;
+with config.krebs.lib;
 
 {
   hosts = {

krebs/3modules/makefu/default.nix

@@ -1,6 +1,6 @@
-{ lib, ... }:
+{ config, lib, ... }:
 
-with lib;
+with config.krebs.lib;
 
 {
   hosts = {

krebs/3modules/miefda/default.nix

@@ -1,6 +1,6 @@
-{ lib, ... }:
+{ config, lib, ... }:
 
-with lib;
+with config.krebs.lib;
 
 {
   hosts = {

krebs/3modules/mv/default.nix

@@ -1,6 +1,6 @@
-{ lib, ... }:
+{ config, ... }:
 
-with lib;
+with config.krebs.lib;
 
 {
   hosts = {

krebs/3modules/nginx.nix

@@ -1,13 +1,12 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, pkgs, ... }:
 
-with builtins;
+with config.krebs.lib;
-with lib;
 let
   cfg = config.krebs.nginx;
 
   out = {
     options.krebs.nginx = api;
-    config = mkIf cfg.enable imp;
+    config = lib.mkIf cfg.enable imp;
   };
 
   api = {

krebs/3modules/nixpkgs.nix

@@ -1,11 +1,11 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, pkgs, ... }:
-with lib;
+with config.krebs.lib;
 let
   cfg = config.krebs.nixpkgs;
 
   out = {
     options.krebs.nixpkgs = api;
-    config = mkIf cfg.enable imp;
+    config = lib.mkIf cfg.enable imp;
   };
 
   api = {
@@ -37,7 +37,7 @@ let
     };
   };
 
-  imp = mkIf (cfg.allowUnfreePredicate != null) {
+  imp = lib.mkIf (cfg.allowUnfreePredicate != null) {
     nixpkgs.config.allowUnfreePredicate = cfg.allowUnfreePredicate;
   };
 in out

krebs/3modules/per-user.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 
 let
   cfg = config.krebs.per-user;

krebs/3modules/realwallpaper.nix

@@ -1,12 +1,12 @@
-arg@{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 let
   cfg = config.krebs.realwallpaper;
 
   out = {
     options.krebs.realwallpaper = api;
-    config = mkIf cfg.enable imp;
+    config = lib.mkIf cfg.enable imp;
   };
 
   api = {

krebs/3modules/retiolum-bootstrap.nix

@@ -1,12 +1,12 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 let
   cfg = config.krebs.retiolum-bootstrap;
 
   out = {
     options.krebs.retiolum-bootstrap = api;
-    config = mkIf cfg.enable imp ;
+    config = lib.mkIf cfg.enable imp;
   };
 
   api = {

krebs/3modules/retiolum.nix

@@ -1,11 +1,11 @@
 { config, pkgs, lib, ... }:
-with lib;
+with config.krebs.lib;
 let
   cfg = config.krebs.retiolum;
 
   out = {
     options.krebs.retiolum = api;
-    config = mkIf cfg.enable imp;
+    config = lib.mkIf cfg.enable imp;
   };
 
   api = {

krebs/3modules/setuid.nix

@@ -1,5 +1,5 @@
 { config, pkgs, lib, ... }:
-with lib;
+with config.krebs.lib;
 let
   cfg = config.krebs.setuid;
 

krebs/3modules/shared/default.nix

@@ -1,9 +1,8 @@
-{ lib, ... }:
+{ config, ... }:
-
-with lib;
 
+with config.krebs.lib;
 let
-  testHosts = lib.genAttrs [
+  testHosts = genAttrs [
     "test-arch"
     "test-centos6"
     "test-centos7"

krebs/3modules/tinc_graphs.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 let
   cfg = config.krebs.tinc_graphs;
   internal_dir = "${cfg.workingDir}/internal";
@@ -8,7 +8,7 @@ let
 
   out = {
     options.krebs.tinc_graphs = api;
-    config = mkIf cfg.enable imp ;
+    config = lib.mkIf cfg.enable imp ;
   };
 
   api = {

krebs/3modules/tv/default.nix

@@ -1,6 +1,6 @@
-{ lib, ... }:
+{ config, ... }:
 
-with lib;
+with config.krebs.lib;
 
 {
   dns.providers = {

krebs/3modules/urlwatch.nix

@@ -5,14 +5,14 @@
 # cache = url: "${cfg.dataDir}/.urlwatch/cache/${hashString "sha1" url}"
 # TODO hooks.py
 
-with lib;
+with config.krebs.lib;
 let
   cfg = config.krebs.urlwatch;
 
   # TODO assert sendmail's existence
   out = {
     options.krebs.urlwatch = api;
-    config = mkIf cfg.enable imp;
+    config = lib.mkIf cfg.enable imp;
   };
 
   api = {

krebs/5pkgs/builders.nix

@@ -1,5 +1,5 @@
-{ lib, pkgs, ... }:
+{ config, lib, pkgs, ... }:
-with lib;
+with config.krebs.lib;
 rec {
   execve = name: { filename, argv ? null, envp ? {}, destination ? "" }: let
   in writeC name { inherit destination; } ''

krebs/5pkgs/default.nix

@@ -1,5 +1,5 @@
-{ lib, pkgs, ... }@args:
+{ config, lib, pkgs, ... }@args:
-with lib;
+with config.krebs.lib;
 {
   nixpkgs.config.packageOverrides = pkgs: {
     haskellPackages = pkgs.haskellPackages.override {

lass/2configs/base.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 {
   imports = [
     ../2configs/vim.nix

lass/2configs/downloading.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 
 let
   rpc-password = import <secrets/transmission-pw.nix>;

lass/2configs/fastpoke-pages.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 
 let
   createStaticPage = domain:

lass/2configs/git.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 
 let
 

lass/2configs/go.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 {
   environment.systemPackages = [
     pkgs.go

lass/2configs/teamviewer.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 {
   services.teamviewer.enable = true;
 }

lass/2configs/xserver/Xresources.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 
 pkgs.writeText "Xresources" ''
   URxvt*scrollBar:                      false

lass/2configs/xserver/default.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }@args:
 
-with lib;
+with config.krebs.lib;
 
 let
   # TODO krebs.build.user

lass/2configs/xserver/xserver.conf.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 
 let
   cfg = config.services.xserver;

lass/3modules/dnsmasq.nix

@@ -1,7 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with builtins;
+with config.krebs.lib;
-with lib;
 
 let
   cfg = config.lass.dnsmasq;

lass/3modules/newsbot-js.nix

@@ -1,7 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with builtins;
+with config.krebs.lib;
-with lib;
 
 let
   cfg = config.lass.newsbot-js;

lass/3modules/owncloud_nginx.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 
 let
   cfg = config.lass.owncloud;

lass/3modules/per-user.nix

@@ -1,7 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with builtins;
+with config.krebs.lib;
-with lib;
 let
   cfg = config.lass.per-user;
 

lass/3modules/static_nginx.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 
 let
   cfg = config.lass.staticPage;

lass/3modules/urxvtd.nix

@@ -3,8 +3,7 @@
 let
 in
 
-with builtins;
+with config.krebs.lib;
-with lib;
 
 {
   options = {

lass/3modules/wordpress_nginx.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 
 let
   cfg = config.lass.wordpress;

lass/3modules/xresources.nix

@@ -6,8 +6,7 @@
 
 #
 #
-with builtins;
+with config.krebs.lib;
-with lib;
 
 
 let

makefu/1systems/gum.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 let
   external-ip = head config.krebs.build.host.nets.internet.addrs4;
   internal-ip = head config.krebs.build.host.nets.retiolum.addrs4;

makefu/1systems/wry.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 let
 
   external-ip = head config.krebs.build.host.nets.internet.addrs4;

makefu/2configs/backup.nix

@@ -1,5 +1,5 @@
 { config, lib, ... }:
-with lib;
+with config.krebs.lib;
 let
   startAt = "0,6,12,18:00";
   defaultBackupServer = config.krebs.hosts.omo;

makefu/2configs/base-gui.nix

@@ -21,7 +21,7 @@
 # URxvt.visualBell: false
 # URxvt.font : xft:Terminus
 
-with lib;
+with config.krebs.lib;
 let
   mainUser = config.krebs.build.user.name;
   awesomecfg = pkgs.awesomecfg.full;

makefu/2configs/bepasty-dual.nix

@@ -10,7 +10,7 @@
 #   wildcard.krebsco.de.key
 #   bepasty-secret.nix     <- contains single string
 
-with lib;
+with config.krebs.lib;
 let
   sec = toString <secrets>;
   # secKey is nothing worth protecting on a local machine

makefu/2configs/collectd/collectd-base.nix

@@ -2,7 +2,7 @@
 
 # graphite-web on port 8080
 # carbon cache on port 2003 (tcp/udp)
-with lib;
+with config.krebs.lib;
 let
   connect-time-cfg = with pkgs; writeText "collectd-connect-time.cfg" ''
     LoadPlugin python

makefu/2configs/default.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 {
   system.stateVersion = "15.09";
 

makefu/2configs/exim-retiolum.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 {
   krebs.exim-retiolum.enable = true;
   environment.systemPackages = with pkgs; [

makefu/2configs/fs/cac-boot-partition.nix

@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 # vda1 ext4 (label nixos) -> only root partition
-with lib;
+with config.krebs.lib;
 {
   boot.loader.grub.enable = true;
   boot.loader.grub.version = 2;

makefu/2configs/fs/sda-crypto-root-home.nix

@@ -8,7 +8,7 @@
 #             /     (main-root)
 #             /home (main-home)
 
-with lib;
+with config.krebs.lib;
 {
 
   imports = [

makefu/2configs/fs/sda-crypto-root.nix

@@ -3,7 +3,7 @@
 # sda:  bootloader grub2
 # sda1: boot ext4 (label nixboot)
 # sda2: cryptoluks -> ext4
-with lib;
+with config.krebs.lib;
 {
   boot = {
     loader.grub.enable = true;

makefu/2configs/fs/vm-single-partition.nix

@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 # vda1 ext4 (label nixos) -> only root partition
-with lib;
+with config.krebs.lib;
 {
   imports = [
     ./single-partition-ext4.nix

makefu/2configs/git/brain-retiolum.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 # TODO: remove tv lib :)
-with lib;
+with config.krebs.lib;
 let
 
   repos = priv-repos // krebs-repos ;

makefu/2configs/git/cgit-retiolum.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 # TODO: remove tv lib :)
-with lib;
+with config.krebs.lib;
 let
 
   repos = priv-repos // krebs-repos // connector-repos ;

makefu/2configs/graphite-standalone.nix

@@ -2,7 +2,7 @@
 
 # graphite-web on port 8080
 # carbon cache on port 2003 (tcp/udp)
-with lib;
+with config.krebs.lib;
 {
   imports = [ ];
 

makefu/2configs/hw/tp-x200.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 {
 
   imports = [ ./tp-x2x0.nix ];

makefu/2configs/hw/tp-x220.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 {
 
   imports = [ ./tp-x2x0.nix ];

makefu/2configs/hw/tp-x2x0.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 {
   # TODO: put this somewhere else
   networking.wireless.enable = true;

makefu/2configs/mail-client.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 {
   environment.systemPackages = with pkgs; [
     msmtp

makefu/2configs/main-laptop.nix

@@ -5,7 +5,7 @@
 # not fit into base-gui
 # TODO split generic desktop stuff and laptop-specifics like lidswitching
 
-with lib;
+with config.krebs.lib;
 {
   imports = [
     ./base-gui.nix

makefu/2configs/mattermost-docker.nix

@@ -1,6 +1,6 @@
 {config, lib, ...}:
 
-with lib;
+with config.krebs.lib;
 let
   sec = toString <secrets>;
   ssl_cert = "${sec}/wildcard.krebsco.de.crt";

makefu/2configs/nginx/euer.blog.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 let
   sec = toString <secrets>;
   ssl_cert = "${sec}/wildcard.krebsco.de.crt";

makefu/2configs/nginx/euer.test.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 let
   hostname = config.krebs.build.host.name;
   user = config.services.nginx.user;

makefu/2configs/nginx/euer.wiki.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 let
   sec = toString <secrets>;
   ssl_cert = "${sec}/wildcard.krebsco.de.crt";

makefu/2configs/nginx/update.connector.one.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 let
   hostname = config.krebs.build.host.name;
   external-ip = head config.krebs.build.host.nets.internet.addrs4;

makefu/2configs/omo-share.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 let
   hostname = config.krebs.build.host.name;
   # TODO local-ip from the nets config

makefu/2configs/tinc-basic-retiolum.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 {
   krebs.retiolum = {
     enable = true;

makefu/2configs/zsh-user.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 ##
-with lib;
+with config.krebs.lib;
 let
   mainUser = config.krebs.build.user.name;
 in

makefu/3modules/snapraid.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 
 let
   # returns dirname without / , used as disk name

makefu/3modules/umts.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 
 let
   # TODO: currently it is only netzclub

miefda/2configs/git.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 
 let
 

miefda/2configs/miefda.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 {
   
   #networking.wicd.enable = true;

miefda/2configs/tinc-basic-retiolum.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 {
   krebs.retiolum = {
     enable = true;

miefda/2configs/tlp.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 {
   hardware.enableAllFirmware = true;
   nixpkgs.config.allowUnfree = true;

miefda/2configs/x220t.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 {
 
   services.xserver = {

mv/1systems/stro.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 
 {
   krebs.build.host = config.krebs.hosts.stro;

mv/2configs/default.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 let
   HOME = getEnv "HOME";
 in

mv/2configs/git.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 
 let
 

mv/2configs/vim.nix

@@ -1,6 +1,6 @@
-{ lib, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 let
   out = {
     environment.systemPackages = [

mv/2configs/xserver/Xresources.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 
 pkgs.writeText "Xresources" ''
   !URxvt*background:	#050505

mv/2configs/xserver/default.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }@args:
 
-with lib;
+with config.krebs.lib;
 
 let
   # TODO krebs.build.user

mv/2configs/xserver/xserver.conf.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 
 let
   cfg = config.services.xserver;

mv/3modules/iptables.nix

@@ -1,13 +1,12 @@
 { config, lib, pkgs, ... }:
 
-with builtins;
+with config.krebs.lib;
-with lib;
 let
   cfg = config.tv.iptables;
 
   out = {
     options.tv.iptables = api;
-    config = mkIf cfg.enable imp;
+    config = lib.mkIf cfg.enable imp;
   };
 
   api = {

shared/2configs/base.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 {
   krebs.enable = true;
   krebs.retiolum = {

shared/2configs/cgit-mirror.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 let
   rules = with git; singleton {
     user = [ git-sync ];

shared/2configs/collectd-base.nix

@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 # TODO: krebs.collectd.plugins
-with lib;
+with config.krebs.lib;
 let
   connect-time-cfg = with pkgs; writeText "collectd-connect-time.conf" ''
     LoadPlugin python

shared/2configs/graphite.nix

@@ -5,7 +5,7 @@
 
 # TODO: krebs.graphite.minimal.enable
 # TODO: configure firewall
-with lib;
+with config.krebs.lib;
 {
   imports = [ ];
 

tv/1systems/cd.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 
 {
   krebs.build.host = config.krebs.hosts.cd;

tv/1systems/mkdir.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 
 let
   # TODO merge with lass

tv/1systems/nomic.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 
 {
   krebs.build.host = config.krebs.hosts.nomic;

tv/1systems/rmdir.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 
 let
   # TODO merge with lass