From 673853e092c211e26a08030f87f9c868c6442a71 Mon Sep 17 00:00:00 2001 From: tv Date: Sun, 14 Feb 2016 16:43:44 +0100 Subject: RIP specialArgs.lib --- lass/3modules/dnsmasq.nix | 3 +-- lass/3modules/newsbot-js.nix | 3 +-- lass/3modules/owncloud_nginx.nix | 2 +- lass/3modules/per-user.nix | 3 +-- lass/3modules/static_nginx.nix | 2 +- lass/3modules/urxvtd.nix | 3 +-- lass/3modules/wordpress_nginx.nix | 2 +- lass/3modules/xresources.nix | 3 +-- 8 files changed, 8 insertions(+), 13 deletions(-) (limited to 'lass/3modules') diff --git a/lass/3modules/dnsmasq.nix b/lass/3modules/dnsmasq.nix index 83a9cb180..c05ad0fc9 100644 --- a/lass/3modules/dnsmasq.nix +++ b/lass/3modules/dnsmasq.nix @@ -1,7 +1,6 @@ { config, lib, pkgs, ... }: -with builtins; -with lib; +with config.krebs.lib; let cfg = config.lass.dnsmasq; diff --git a/lass/3modules/newsbot-js.nix b/lass/3modules/newsbot-js.nix index 5e340b26f..ef4d97b76 100644 --- a/lass/3modules/newsbot-js.nix +++ b/lass/3modules/newsbot-js.nix @@ -1,7 +1,6 @@ { config, lib, pkgs, ... }: -with builtins; -with lib; +with config.krebs.lib; let cfg = config.lass.newsbot-js; diff --git a/lass/3modules/owncloud_nginx.nix b/lass/3modules/owncloud_nginx.nix index 79c9de1d4..a10df779e 100644 --- a/lass/3modules/owncloud_nginx.nix +++ b/lass/3modules/owncloud_nginx.nix @@ -1,6 +1,6 @@ { config, lib, pkgs, ... }: -with lib; +with config.krebs.lib; let cfg = config.lass.owncloud; diff --git a/lass/3modules/per-user.nix b/lass/3modules/per-user.nix index 98d6339db..f8d357ce2 100644 --- a/lass/3modules/per-user.nix +++ b/lass/3modules/per-user.nix @@ -1,7 +1,6 @@ { config, lib, pkgs, ... }: -with builtins; -with lib; +with config.krebs.lib; let cfg = config.lass.per-user; diff --git a/lass/3modules/static_nginx.nix b/lass/3modules/static_nginx.nix index fd5cfdfd7..93441cf0d 100644 --- a/lass/3modules/static_nginx.nix +++ b/lass/3modules/static_nginx.nix @@ -1,6 +1,6 @@ { config, lib, pkgs, ... }: -with lib; +with config.krebs.lib; let cfg = config.lass.staticPage; diff --git a/lass/3modules/urxvtd.nix b/lass/3modules/urxvtd.nix index 469616a9f..1eb463955 100644 --- a/lass/3modules/urxvtd.nix +++ b/lass/3modules/urxvtd.nix @@ -3,8 +3,7 @@ let in -with builtins; -with lib; +with config.krebs.lib; { options = { diff --git a/lass/3modules/wordpress_nginx.nix b/lass/3modules/wordpress_nginx.nix index bfed9e7c6..108054cb6 100644 --- a/lass/3modules/wordpress_nginx.nix +++ b/lass/3modules/wordpress_nginx.nix @@ -1,6 +1,6 @@ { config, lib, pkgs, ... }: -with lib; +with config.krebs.lib; let cfg = config.lass.wordpress; diff --git a/lass/3modules/xresources.nix b/lass/3modules/xresources.nix index 074963022..729eccecc 100644 --- a/lass/3modules/xresources.nix +++ b/lass/3modules/xresources.nix @@ -6,8 +6,7 @@ # # -with builtins; -with lib; +with config.krebs.lib; let -- cgit v1.2.3 From 8f520b19b623919fa6319029a955d43fd051773c Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 15 Feb 2016 16:27:11 +0100 Subject: don't try to mimic nixpkgs --- lass/3modules/dnsmasq.nix | 3 ++- lass/3modules/newsbot-js.nix | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'lass/3modules') diff --git a/lass/3modules/dnsmasq.nix b/lass/3modules/dnsmasq.nix index c05ad0fc9..83a9cb180 100644 --- a/lass/3modules/dnsmasq.nix +++ b/lass/3modules/dnsmasq.nix @@ -1,6 +1,7 @@ { config, lib, pkgs, ... }: -with config.krebs.lib; +with builtins; +with lib; let cfg = config.lass.dnsmasq; diff --git a/lass/3modules/newsbot-js.nix b/lass/3modules/newsbot-js.nix index ef4d97b76..5e340b26f 100644 --- a/lass/3modules/newsbot-js.nix +++ b/lass/3modules/newsbot-js.nix @@ -1,6 +1,7 @@ { config, lib, pkgs, ... }: -with config.krebs.lib; +with builtins; +with lib; let cfg = config.lass.newsbot-js; -- cgit v1.2.3 From b7a92f63884af00eb0243ec9328be689a6c9b845 Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 15 Feb 2016 16:29:01 +0100 Subject: *: make eval.config.krebs.build.host.name work everywhere --- lass/3modules/urxvtd.nix | 3 ++- lass/3modules/xresources.nix | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'lass/3modules') diff --git a/lass/3modules/urxvtd.nix b/lass/3modules/urxvtd.nix index 1eb463955..469616a9f 100644 --- a/lass/3modules/urxvtd.nix +++ b/lass/3modules/urxvtd.nix @@ -3,7 +3,8 @@ let in -with config.krebs.lib; +with builtins; +with lib; { options = { diff --git a/lass/3modules/xresources.nix b/lass/3modules/xresources.nix index 729eccecc..074963022 100644 --- a/lass/3modules/xresources.nix +++ b/lass/3modules/xresources.nix @@ -6,7 +6,8 @@ # # -with config.krebs.lib; +with builtins; +with lib; let -- cgit v1.2.3