summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authormichael bishop <cleverca22@gmail.com>2016-12-16 12:58:40 -0400
committerJörg Thalheim <joerg@higgsboson.tk>2016-12-16 18:29:25 +0100
commite5cefadef7995b3eafacaf6f1f9099da0f7ccf79 (patch)
tree7921e0da0b25c1ba82087339d83bde3fed3cb284 /nixos
parent1946e872c04079f25e30ed9b3fa9e09f9f9e661c (diff)
downloadnixpkgs-e5cefadef7995b3eafacaf6f1f9099da0f7ccf79.tar
nixpkgs-e5cefadef7995b3eafacaf6f1f9099da0f7ccf79.tar.gz
nixpkgs-e5cefadef7995b3eafacaf6f1f9099da0f7ccf79.tar.bz2
nixpkgs-e5cefadef7995b3eafacaf6f1f9099da0f7ccf79.tar.lz
nixpkgs-e5cefadef7995b3eafacaf6f1f9099da0f7ccf79.tar.xz
nixpkgs-e5cefadef7995b3eafacaf6f1f9099da0f7ccf79.tar.zst
nixpkgs-e5cefadef7995b3eafacaf6f1f9099da0f7ccf79.zip
fix indentation in several nixos option descriptions
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/config/gnu.nix10
-rw-r--r--nixos/modules/config/i18n.nix2
-rw-r--r--nixos/modules/programs/mosh.nix16
-rw-r--r--nixos/modules/services/networking/wireguard.nix21
-rw-r--r--nixos/modules/system/boot/loader/generations-dir/generations-dir.nix4
5 files changed, 29 insertions, 24 deletions
diff --git a/nixos/modules/config/gnu.nix b/nixos/modules/config/gnu.nix
index f8c35b440d1..ef48ccb7b4f 100644
--- a/nixos/modules/config/gnu.nix
+++ b/nixos/modules/config/gnu.nix
@@ -7,11 +7,11 @@ with lib;
     gnu = mkOption {
       type = types.bool;
       default = false;
-      description =
-        '' When enabled, GNU software is chosen by default whenever a there is
-           a choice between GNU and non-GNU software (e.g., GNU lsh
-           vs. OpenSSH).
-        '';
+      description = ''
+        When enabled, GNU software is chosen by default whenever a there is
+        a choice between GNU and non-GNU software (e.g., GNU lsh
+        vs. OpenSSH).
+      '';
     };
   };
 
diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix
index d7fd38ebed9..799f0793c74 100644
--- a/nixos/modules/config/i18n.nix
+++ b/nixos/modules/config/i18n.nix
@@ -46,7 +46,7 @@ in
         default = with pkgs.kbdKeymaps; [ dvp neo ];
         defaultText = ''with pkgs.kbdKeymaps; [ dvp neo ]'';
         description = ''
-	  List of additional packages that provide console fonts, keymaps and
+          List of additional packages that provide console fonts, keymaps and
           other resources.
         '';
       };
diff --git a/nixos/modules/programs/mosh.nix b/nixos/modules/programs/mosh.nix
index b478f8e180f..1c29eddf01d 100644
--- a/nixos/modules/programs/mosh.nix
+++ b/nixos/modules/programs/mosh.nix
@@ -9,14 +9,14 @@ let
 in
 {
   options.programs.mosh = {
-      enable = mkOption {
-	description = ''
-	  Whether to enable mosh. Note, this will open ports in your firewall!
-	'';
-        default = false;
-	example = true;
-	type = lib.types.bool;
-      };
+    enable = mkOption {
+      description = ''
+        Whether to enable mosh. Note, this will open ports in your firewall!
+      '';
+      default = false;
+      example = true;
+      type = lib.types.bool;
+    };
   };
 
   config = mkIf cfg.enable {
diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix
index 52dd5502147..368d89e2e32 100644
--- a/nixos/modules/services/networking/wireguard.nix
+++ b/nixos/modules/services/networking/wireguard.nix
@@ -31,18 +31,22 @@ let
         default = null;
         example = "rVXs/Ni9tu3oDBLS4hOyAUAa1qTWVA3loR8eL20os3I=";
         type = with types; nullOr str;
-        description = ''base64 preshared key generated by wg genpsk. Optional,
-        and may be omitted. This option adds an additional layer of
-        symmetric-key cryptography to be mixed into the already existing
-        public-key  cryptography, for post-quantum resistance.'';
+        description = ''
+          base64 preshared key generated by wg genpsk. Optional,
+          and may be omitted. This option adds an additional layer of
+          symmetric-key cryptography to be mixed into the already existing
+          public-key  cryptography, for post-quantum resistance.
+        '';
       };
 
       listenPort = mkOption {
         default = null;
         type = with types; nullOr int;
         example = 51820;
-        description = ''16-bit port for listening. Optional; if not specified,
-        automatically generated based on interface name.'';
+        description = ''
+          16-bit port for listening. Optional; if not specified,
+          automatically generated based on interface name.
+        '';
       };
 
       preSetup = mkOption {
@@ -51,8 +55,9 @@ let
         ''];
         default = [];
         type = with types; listOf str;
-        description = ''A list of commands called at the start of the interface
-        setup.'';
+        description = ''
+          A list of commands called at the start of the interface setup.
+        '';
       };
 
       postSetup = mkOption {
diff --git a/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix b/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix
index 6153578612c..f8a00784034 100644
--- a/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix
+++ b/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix
@@ -44,10 +44,10 @@ in
       copyKernels = mkOption {
         default = false;
         type = types.bool;
-        description = "
+        description = ''
           Whether copy the necessary boot files into /boot, so
           /nix/store is not needed by the boot loader.
-        ";
+        '';
       };
 
     };