From 673853e092c211e26a08030f87f9c868c6442a71 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 14 Feb 2016 16:43:44 +0100
Subject: RIP specialArgs.lib

---
 mv/1systems/stro.nix                 | 2 +-
 mv/2configs/default.nix              | 2 +-
 mv/2configs/git.nix                  | 2 +-
 mv/2configs/vim.nix                  | 4 ++--
 mv/2configs/xserver/Xresources.nix   | 2 +-
 mv/2configs/xserver/default.nix      | 2 +-
 mv/2configs/xserver/xserver.conf.nix | 2 +-
 mv/3modules/iptables.nix             | 5 ++---
 8 files changed, 10 insertions(+), 11 deletions(-)

(limited to 'mv')

diff --git a/mv/1systems/stro.nix b/mv/1systems/stro.nix
index 3915219b7..b3dfc5708 100644
--- a/mv/1systems/stro.nix
+++ b/mv/1systems/stro.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 
 {
   krebs.build.host = config.krebs.hosts.stro;
diff --git a/mv/2configs/default.nix b/mv/2configs/default.nix
index 9c412099e..d93218a18 100644
--- a/mv/2configs/default.nix
+++ b/mv/2configs/default.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 let
   HOME = getEnv "HOME";
 in
diff --git a/mv/2configs/git.nix b/mv/2configs/git.nix
index c182d0d1e..933649f20 100644
--- a/mv/2configs/git.nix
+++ b/mv/2configs/git.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 
 let
 
diff --git a/mv/2configs/vim.nix b/mv/2configs/vim.nix
index a961b6b26..adf1da9db 100644
--- a/mv/2configs/vim.nix
+++ b/mv/2configs/vim.nix
@@ -1,6 +1,6 @@
-{ lib, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 let
   out = {
     environment.systemPackages = [
diff --git a/mv/2configs/xserver/Xresources.nix b/mv/2configs/xserver/Xresources.nix
index f287bf206..923572721 100644
--- a/mv/2configs/xserver/Xresources.nix
+++ b/mv/2configs/xserver/Xresources.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 
 pkgs.writeText "Xresources" ''
   !URxvt*background:	#050505
diff --git a/mv/2configs/xserver/default.nix b/mv/2configs/xserver/default.nix
index 44539c54b..3d4aa8847 100644
--- a/mv/2configs/xserver/default.nix
+++ b/mv/2configs/xserver/default.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }@args:
 
-with lib;
+with config.krebs.lib;
 
 let
   # TODO krebs.build.user
diff --git a/mv/2configs/xserver/xserver.conf.nix b/mv/2configs/xserver/xserver.conf.nix
index e8a997a99..c452b4226 100644
--- a/mv/2configs/xserver/xserver.conf.nix
+++ b/mv/2configs/xserver/xserver.conf.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 
 let
   cfg = config.services.xserver;
diff --git a/mv/3modules/iptables.nix b/mv/3modules/iptables.nix
index cbf49f577..b2b41bf00 100644
--- a/mv/3modules/iptables.nix
+++ b/mv/3modules/iptables.nix
@@ -1,13 +1,12 @@
 { config, lib, pkgs, ... }:
 
-with builtins;
-with lib;
+with config.krebs.lib;
 let
   cfg = config.tv.iptables;
 
   out = {
     options.tv.iptables = api;
-    config = mkIf cfg.enable imp;
+    config = lib.mkIf cfg.enable imp;
   };
 
   api = {
-- 
cgit v1.2.3


From 8f520b19b623919fa6319029a955d43fd051773c Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 15 Feb 2016 16:27:11 +0100
Subject: don't try to mimic nixpkgs

---
 mv/1systems/stro.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'mv')

diff --git a/mv/1systems/stro.nix b/mv/1systems/stro.nix
index b3dfc5708..f251cb092 100644
--- a/mv/1systems/stro.nix
+++ b/mv/1systems/stro.nix
@@ -9,6 +9,7 @@ with config.krebs.lib;
     "7ae05edcdd14f6ace83ead9bf0d114e97c89a83a";
 
   imports = [
+    ../.
     ../2configs/hw/x220.nix
     ../2configs/git.nix
     ../2configs/mail-client.nix
-- 
cgit v1.2.3