Merge remote-tracking branch 'temp/master'

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;