feat(pg): add postgresql to templates

eFishery · Jun 24, 2023 · 217814b · 217814b
1 parent 62a8060
commit 217814b
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 53 deletions.
diff --git a/flake.nix b/flake.nix
@@ -8,69 +8,55 @@
 
   outputs = { self, nixpkgs, utils }: {
 
-    templates = {
-      go = {
-        path = ./go;
-        description = "Go development environment";
-      };
-
-      node = {
-        path = ./node;
-        description = "Nodejs development environment";
-      };
-
-      node14 = {
-        path = ./node14;
-        description = "Nodejs (v14) and pnpm (v5) development environment";
-      };
-
-      react-native = {
-        path = ./react-native;
-        description = "React Native development environment";
-      };
-    };
+    templates = import ./templates.nix;
 
   } // utils.lib.eachDefaultSystem (system:
     let
       pkgs = import nixpkgs { inherit system; };
+
       inherit (pkgs) mkShell writeScriptBin;
+
       run = pkg: "${pkgs.${pkg}}/bin/${pkg}";
 
-      dvt = writeScriptBin "dvt" ''
-        if [ -z $1 ]; then
-          echo "no template specified"
-          exit 1
-        fi
-        TEMPLATE=$1
-        ${run "nix"} \
-          --experimental-features 'nix-command flakes' \
-          flake init \
-          --template \
-          "github:efishery/dvt#''${TEMPLATE}"
-      '';
+      dvt = writeScriptBin "dvt"
+        ''
+          if [ -z $1 ]; then
+            echo "no template specified"
+            exit 1
+          fi
+          TEMPLATE=$1
+          ${run "nix"} \
+            --experimental-features 'nix-command flakes' \
+            flake init \
+            --template \
+            "github:efishery/dvt#''${TEMPLATE}"
+        '';
 
-      format = writeScriptBin "format" ''
-        ${run "nixpkgs-fmt"} **/*.nix
-      '';
+      format = writeScriptBin "format"
+        ''
+          ${run "nixpkgs-fmt"} **/*.nix
+        '';
 
-      update = writeScriptBin "update" ''
-        for dir in `ls -d */`; do
-          (
-            cd $dir
-            ${run "nix"} flake update # Update flake.lock 
-            ${run "nix"} develop $dir # Make sure this work after update
-          )
-        done
-      '';
+      update = writeScriptBin "update"
+        ''
+          for dir in `ls -d */`; do
+            (
+              cd $dir
+              ${run "nix"} flake update # Update flake.lock 
+              ${run "nix"} develop $dir # Make sure this work after update
+            )
+          done
+        '';
 
-      test-develop = writeScriptBin "test-develop" ''
-        for dir in `ls -d */`; do
-          (
-            ${run "nix"} develop $dir # Make sure this work after update
-            sleep 0.2
-          )
-        done
-      '';
+      test-develop = writeScriptBin "test-develop"
+        ''
+          for dir in `ls -d */`; do
+            (
+              ${run "nix"} develop $dir # Make sure this work after update
+              sleep 0.2
+            )
+          done
+        '';
     in
     {
       devShells.default = mkShell { buildInputs = [ format update ]; };

diff --git a/templates.nix b/templates.nix
@@ -0,0 +1,26 @@
+{
+  go = {
+    path = ./go;
+    description = "Go development environment";
+  };
+
+  node = {
+    path = ./node;
+    description = "Nodejs development environment";
+  };
+
+  node14 = {
+    path = ./node14;
+    description = "Nodejs (v14) and pnpm (v5) development environment";
+  };
+
+  react-native = {
+    path = ./react-native;
+    description = "React Native development environment";
+  };
+
+  pg = {
+    path = ./pg;
+    description = "PostgreSQL development environment";
+  };
+}