Merge pull request #56 from nix-community/cleanup

2 files changed, 22 insertions, 23 deletions

diff --git a/README.md b/README.md
index 20dea6f..333f2a6 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,8 @@ TODO: output of the cli --help
 
 You can use the NixOS module in one of the following ways:
 
-### Flakes
+<details>
+  <summary>Flakes (Current recommendation)</summary>
 
 If you use nix flakes support:
 
@@ -70,9 +71,11 @@ If you use nix flakes support:
   };
 }
 ```
-
-### [niv](https://github.com/nmattia/niv) (Current recommendation)
-  First add it to niv:
+</details>
+<details>
+  <summary>niv</summary>
+  
+  First add it to [niv](https://github.com/nmattia/niv):
 
 ```console
 $ niv add nix-community/disko
@@ -85,8 +88,9 @@ $ niv add nix-community/disko
   imports = [ "${(import ./nix/sources.nix).disko}/modules/disko.nix" ];
 }
 ```
-
-### nix-channel
+</details>
+<details>
+  <summary>nix-channel</summary>
 
   As root run:
 
@@ -102,8 +106,9 @@ $ nix-channel --update
   imports = [ <disko/modules/disko.nix> ];
 }
 ```
-
-### fetchTarball
+</details>
+<details>
+  <summary>fetchTarball</summary>
 
   Add the following to your configuration.nix:
 
@@ -129,6 +134,7 @@ $ nix-channel --update
   ];
 }
 ```
+</details>
 
 ## Using the NixOS module
 
diff --git a/types.nix b/types.nix
index 228052f..fe04e9c 100644
--- a/types.nix
+++ b/types.nix
@@ -51,21 +51,14 @@ rec {
        => "/dev/disk/by-id/xxx-part2"
     */
     deviceNumbering = dev: index:
-      let
-        schemas = {
-          dev__da = dev + toString index; # /dev/{s,v}da style
-          dev_disk = "${dev}-part${toString index}"; # /dev/disk/by-id/xxx style
-          dev_nvme = "${dev}p${toString index}"; # /dev/nvme0n1p1 style
-          dev_md = "${dev}p${toString index}"; # /dev/nvme0n1p1 style
-        };
-        detectSchema =
-          if match "/dev/[vs]d.*" dev != null then "dev__da" else
-          if match "/dev/disk/.*" dev != null then "dev_disk" else
-          if match "/dev/nvme.*" dev != null then "dev_nvme" else
-          if match "/dev/md/.*" dev != null then "dev_md" else
-          if match "/dev/mmcblk.*" dev != null then "dev_nvme" else
-          abort "${dev} seems not to be a supported disk format";
-      in schemas.${detectSchema};
+      if match "/dev/[vs]d.+" dev != null then
+        dev + toString index  # /dev/{s,v}da style
+      else if match "/dev/disk/.+" dev != null then
+        "${dev}-part${toString index}" # /dev/disk/by-id/xxx style
+      else if match "/dev/(nvme|md/|mmcblk).+" dev != null then
+        "${dev}p${toString index}" # /dev/nvme0n1p1 style
+      else
+        abort "${dev} seems not to be a supported disk format";
 
     /* A nix option type representing a json datastructure, vendored from nixpkgs to avoid dependency on pkgs */
     jsonType = let