summaryrefslogtreecommitdiffstats
path: root/makefu/3modules
diff options
context:
space:
mode:
authornin <nineinchnade@gmail.com>2017-10-17 19:54:15 +0200
committernin <nineinchnade@gmail.com>2017-10-17 19:54:15 +0200
commit9afe5210f2a44cacac4f3527b6c8b561d9e4296b (patch)
treea83c412966783b123cd3152fe34a6f7cddcb55d6 /makefu/3modules
parentf4bf9110727f2c7113c80aaa88427b81605016ae (diff)
parent4667bb8e4111abde822ae57993a29929c5cc9aad (diff)
Merge remote-tracking branch 'temp/master'
Diffstat (limited to 'makefu/3modules')
-rw-r--r--makefu/3modules/server-config.nix15
-rw-r--r--makefu/3modules/wvdial.nix3
2 files changed, 9 insertions, 9 deletions
diff --git a/makefu/3modules/server-config.nix b/makefu/3modules/server-config.nix
index 846642580..9cac59205 100644
--- a/makefu/3modules/server-config.nix
+++ b/makefu/3modules/server-config.nix
@@ -1,15 +1,14 @@
{config, lib, pkgs, ... }:
-with import <stockholm/lib>;
-{
+with lib;{
options.makefu.server.primary-itf = lib.mkOption {
- type = types.str;
- description = "Primary interface of the server";
- };
+ type = types.str;
+ description = "Primary interface of the server";
+ };
options.makefu.gui.user = lib.mkOption {
- type = types.str;
- description = "GUI user";
+ type = types.str;
+ description = "GUI user";
default = config.krebs.build.user.name;
- };
+ };
}
diff --git a/makefu/3modules/wvdial.nix b/makefu/3modules/wvdial.nix
index 982f4a7db..1ed929ed4 100644
--- a/makefu/3modules/wvdial.nix
+++ b/makefu/3modules/wvdial.nix
@@ -1,5 +1,6 @@
+# Global configuration for wvdial.
+
{ config, lib, pkgs, ... }:
-# from 17.03/nixos/modules/programs/wvdial.nix
with lib;