Merge branch 'da-add-overlays' into da-add-hostname-management

numtide · Oct 9, 2020 · 231e120 · 231e120
2 parents d7a9a19 + 4484300
commit 231e120
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 14 deletions.
diff --git a/default.nix b/default.nix
@@ -1,10 +1,8 @@
 { nixpkgs ? import ./nix/nixpkgs.nix
 , system ? builtins.currentSystem
+, overlays ? [ ]
 }:
 import nixpkgs {
   inherit system;
-  overlays = [
-      (import ./overlay.nix)
-      (import ./extensions/overlay.nix)
-  ];
+  overlays = [ (import ./overlay.nix) ] ++ overlays;
 }
diff --git a/extensions/options.nix b/extensions/options.nix
@@ -32,10 +32,12 @@ let
     '';
   };
 
-  etcHosts = pkgs.writeText "${name}-etchosts"
-    (lib.concatStringsSep "\n"
-      (lib.mapAttrsToList (name: value: value + " " + name) static-dns)
-    );
+  etcHosts =
+    pkgs.writeText "${name}-etchosts"
+      (
+        lib.concatStringsSep "\n"
+          (lib.mapAttrsToList (name: value: value + " " + name) static-dns)
+      );
   # since this temporarily modifies /etc/hosts, use of sudo can't be avoided
   fqdnsActivate = {
     name = "dns-activate";
@@ -115,4 +117,3 @@ in
       );
   };
 }
-
diff --git a/extensions/overlay.nix b/extensions/overlay.nix
@@ -2,4 +2,3 @@ final: prev:
 {
   hostctl = prev.callPackage ./hostctl { };
 }
-
diff --git a/mkDevShell/options.nix b/mkDevShell/options.nix
@@ -48,7 +48,7 @@ let
 
       opCat = { name, value }:
         let
-          opCmd = { name, help, ...}:
+          opCmd = { name, help, ... }:
             let
               len = maxCommandLength - (builtins.stringLength name);
             in
@@ -57,7 +57,7 @@ let
             else
               "${pad name len} - ${help}";
         in
-         "\n[${name}]\n" + builtins.concatStringsSep "\n" (map opCmd value);
+        "\n[${name}]\n" + builtins.concatStringsSep "\n" (map opCmd value);
     in
     builtins.concatStringsSep "\n" (map opCat commandByCategoriesSorted)
   ;
@@ -226,7 +226,8 @@ in
     ];
 
     packages =
-      builtins.filter (x: x != null)
+      builtins.filter
+        (x: x != null)
         (map (x: x.package) config.commands);
   };
 }
diff --git a/shell.nix b/shell.nix
@@ -1,6 +1,11 @@
 #!/usr/bin/env nix-build
 # Used to test the shell
-{ pkgs ? import ./. { } }:
+{ pkgs ? import ./. {
+    overlays = [
+      (import ./extensions/overlay.nix)
+    ];
+  }
+}:
 pkgs.mkDevShell {
   imports = [
     (pkgs.mkDevShell.importTOML ./devshell.toml)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,3 @@ final: prev:
		{
		hostctl = prev.callPackage ./hostctl { };
		}