From 481173c1ae8bd00f3759be25bb6014b996af9ddd Mon Sep 17 00:00:00 2001
From: Igor Pashev <pashev.igor@gmail.com>
Date: Mon, 27 May 2019 17:58:53 +0200
Subject: Clean imports (and spaces)

---
 modules/apps/juandelacosa.nix       | 1 -
 modules/apps/mariadb/default.nix    | 3 +--
 modules/apps/mysqlbackup.nix        | 4 ++--
 modules/apps/mywatch.nix            | 1 -
 modules/apps/postgresql/default.nix | 2 +-
 modules/apps/postgresql/server.nix  | 2 +-
 modules/apps/sproxy-web.nix         | 1 -
 modules/apps/strongswan/default.nix | 8 ++++----
 modules/system/firewall.nix         | 2 +-
 9 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/modules/apps/juandelacosa.nix b/modules/apps/juandelacosa.nix
index d417727..7d0c200 100644
--- a/modules/apps/juandelacosa.nix
+++ b/modules/apps/juandelacosa.nix
@@ -1,7 +1,6 @@
 { config, pkgs, lib, ... }:
 
 let
-  inherit (builtins) toString;
   inherit (lib) types mkOption mkEnableOption mkIf hasPrefix
                 concatStrings optionalString;
   inherit (types) str path int nullOr;
diff --git a/modules/apps/mariadb/default.nix b/modules/apps/mariadb/default.nix
index 81b8dd6..2e44635 100644
--- a/modules/apps/mariadb/default.nix
+++ b/modules/apps/mariadb/default.nix
@@ -1,8 +1,7 @@
 { config, pkgs, lib, ... }:
 let
   inherit (builtins)
-    attrNames filter isBool isInt isList isPath isString length replaceStrings
-    toString ;
+    attrNames filter isBool isInt isList isPath isString length replaceStrings;
 
   inherit (lib)
     mkOption mkEnableOption mkIf types toUpper unique
diff --git a/modules/apps/mysqlbackup.nix b/modules/apps/mysqlbackup.nix
index 96e5f08..c1fc421 100644
--- a/modules/apps/mysqlbackup.nix
+++ b/modules/apps/mysqlbackup.nix
@@ -1,10 +1,10 @@
 { config, pkgs, lib, ... }:
 let
-  inherit (lib) mkOption mkIf mkDefault mapAttrsToList flatten hasPrefix 
+  inherit (lib) mkOption mkIf mkDefault mapAttrsToList flatten hasPrefix
                 concatMapStringsSep concatStringsSep optionalString filterAttrs
                 splitString removeSuffix;
   inherit (lib.types) bool str int path either enum nullOr listOf attrsOf submodule;
-  inherit (builtins) isString isBool isInt isList isPath toString length;
+  inherit (builtins) isString isBool isInt isList isPath length;
 
   cfg = config.nixsap.apps.mysqlbackup;
   privateDir = "/run/mysqlbackup";
diff --git a/modules/apps/mywatch.nix b/modules/apps/mywatch.nix
index 2698ba5..1b956dc 100644
--- a/modules/apps/mywatch.nix
+++ b/modules/apps/mywatch.nix
@@ -1,7 +1,6 @@
 { config, pkgs, lib, ... }:
 
 let
-  inherit (builtins) toString;
   inherit (lib) types mkOption mkEnableOption mkIf hasPrefix
                 concatStrings optionalString;
   inherit (types) str path int nullOr;
diff --git a/modules/apps/postgresql/default.nix b/modules/apps/postgresql/default.nix
index f479e86..9d05b2d 100644
--- a/modules/apps/postgresql/default.nix
+++ b/modules/apps/postgresql/default.nix
@@ -2,7 +2,7 @@
 let
 
   inherit (builtins)
-    match toString ;
+    match ;
 
   inherit (lib)
     concatMapStrings concatStringsSep filterAttrs foldAttrs filter foldl
diff --git a/modules/apps/postgresql/server.nix b/modules/apps/postgresql/server.nix
index 864af5c..30488db 100644
--- a/modules/apps/postgresql/server.nix
+++ b/modules/apps/postgresql/server.nix
@@ -4,7 +4,7 @@ let
   inherit (lib) mkOption mkOptionType mkIf types isInt isString
                 all length splitString stringToCharacters filter;
   inherit (types) either enum attrsOf nullOr listOf str path lines int bool;
-  inherit (builtins) toString match;
+  inherit (builtins) match;
 
   default = d: t: mkOption { type = t; default = d; };
   mandatory = t: mkOption { type = t; };
diff --git a/modules/apps/sproxy-web.nix b/modules/apps/sproxy-web.nix
index 04ddcdf..4634958 100644
--- a/modules/apps/sproxy-web.nix
+++ b/modules/apps/sproxy-web.nix
@@ -2,7 +2,6 @@
 
 let
 
-  inherit (builtins) toString ;
   inherit (lib)
     concatStrings hasPrefix mkEnableOption mkIf mkOption
     optionalString types ;
diff --git a/modules/apps/strongswan/default.nix b/modules/apps/strongswan/default.nix
index ca95464..b81fdd9 100644
--- a/modules/apps/strongswan/default.nix
+++ b/modules/apps/strongswan/default.nix
@@ -5,7 +5,7 @@ let
   inherit (lib) mkIf mkOption types filterAttrs hasPrefix
                 mapAttrsToList concatStringsSep concatMapStringsSep;
   inherit (types) listOf submodule path attrsOf;
-  inherit (builtins) toString toFile isList isBool;
+  inherit (builtins) toFile isList isBool;
 
   cfg = config.nixsap.apps.strongswan;
   explicit = filterAttrs (n: v: n != "_module" && v != null);
@@ -30,9 +30,9 @@ let
             ))
         ) (explicit sections)
       );
-      setupSec = makeSections "config" { inherit (cfg) setup; }; 
-      caSec = makeSections "ca" cfg.ca; 
-      connSec = makeSections "conn" cfg.conn; 
+      setupSec = makeSections "config" { inherit (cfg) setup; };
+      caSec = makeSections "ca" cfg.ca;
+      connSec = makeSections "conn" cfg.conn;
     in toFile "ipsec.conf" ''
       ${setupSec}
       ${caSec}
diff --git a/modules/system/firewall.nix b/modules/system/firewall.nix
index ccd5750..654ccad 100644
--- a/modules/system/firewall.nix
+++ b/modules/system/firewall.nix
@@ -1,7 +1,7 @@
 { config, lib, ... }:
 
 let
-  inherit (builtins) length toString replaceStrings;
+  inherit (builtins) length replaceStrings;
   inherit (lib) concatMapStringsSep optionalString splitString mkOption;
   inherit (lib.types) listOf int submodule enum str;
 
-- 
cgit v1.2.3