improve some minors

zbioe · Aug 22, 2022 · b35cf2c · b35cf2c
1 parent 3b4808b
commit b35cf2c
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ Add follow options to your `configuration.nix`:
 ```
 
 ### GCP
-Need instalation of gcloud, or append it inside devShell.
+Need instalation of gcloud, or append it inside devShell.  
 ``` nix
 {
   environment.systemPackages = [
@@ -39,7 +39,7 @@ gcloud auth application-default login
 ```
 
 ### Azure
-required az command. you can put it inside devShell too.
+required az command. you can put it inside devShell too.  
 ``` nix
 {
   environment.systemPackages = [

diff --git a/devShell.nix b/devShell.nix
@@ -145,7 +145,7 @@ in mkShell {
   ];
   shellHook = ''
     export NIX_PATH=${pkgs.path}
-    export VAULT_ADDR=''${CD_VAULT_ADDR:-"http://10.0.62.1:8200"}
-    export VAULT_TOKEN=''${CD_VAULT_TOKEN:-"root-token"}
+    export VAULT_ADDR=''${IC_VAULT_ADDR:-"http://10.0.62.1:8200"}
+    export VAULT_TOKEN=''${IC_VAULT_TOKEN:-"root-token"}
   '';
 }
diff --git a/flake.nix b/flake.nix
@@ -119,7 +119,7 @@
         destroy-azure = {
           type = "app";
           program = toString (pkgs.writers.writeBash "destroy-azure" ''
-            scripts/terranix-destroy.sh "azure" ${gcpConfig}
+            scripts/terranix-destroy.sh "azure" ${azureConfig}
           '');
         };
 

diff --git a/lib/default.nix b/lib/default.nix
@@ -1,4 +1,4 @@
-{ lib }:
+{ lib, pkgs }:
 {
   opt = import ./opt.nix { inherit lib; };
   cfg = import ./cfg.nix { inherit lib; };

diff --git a/overlays/default.nix b/overlays/default.nix
@@ -1,7 +1,7 @@
 {
   default = (_: prev: {
     # extend lib
-    lib = prev.lib // import ../lib { inherit (prev) lib; };
+    lib = prev.lib // import ../lib { inherit (prev) lib pkgs; };
     terraformWithPlugins =
       prev.terraform.withPlugins (p: [ p.libvirt p.google p.azurerm ]);
   });