diff options
| author | tv <tv@krebsco.de> | 2016-02-14 16:43:44 +0100 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2016-02-14 16:43:44 +0100 |
| commit | 673853e092c211e26a08030f87f9c868c6442a71 (patch) | |
| tree | c71d2ac88a48cd74c37f03d1665e666030500d1d /mv | |
| parent | 9f16d7ea71a2566b973ad0ac603c63ac3c6f4311 (diff) | |
RIP specialArgs.lib
Diffstat (limited to 'mv')
| -rw-r--r-- | mv/1systems/stro.nix | 2 | ||||
| -rw-r--r-- | mv/2configs/default.nix | 2 | ||||
| -rw-r--r-- | mv/2configs/git.nix | 2 | ||||
| -rw-r--r-- | mv/2configs/vim.nix | 4 | ||||
| -rw-r--r-- | mv/2configs/xserver/Xresources.nix | 2 | ||||
| -rw-r--r-- | mv/2configs/xserver/default.nix | 2 | ||||
| -rw-r--r-- | mv/2configs/xserver/xserver.conf.nix | 2 | ||||
| -rw-r--r-- | mv/3modules/iptables.nix | 5 |
8 files changed, 10 insertions, 11 deletions
diff --git a/mv/1systems/stro.nix b/mv/1systems/stro.nix index 3915219b..b3dfc570 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 9c412099..d93218a1 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 c182d0d1..933649f2 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 a961b6b2..adf1da9d 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 f287bf20..92357272 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 44539c54..3d4aa884 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 e8a997a9..c452b422 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 cbf49f57..b2b41bf0 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 = { |