From 847bb22acddd1ac5beb1d5b597eb43ff673f0fc4 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph.amissah@gmail.com>
Date: Fri, 10 Feb 2023 10:21:30 -0500
Subject: nix .envrc, add ./result/bin path, flake.nix minor

---
 org/config_nix.org | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'org/config_nix.org')

diff --git a/org/config_nix.org b/org/config_nix.org
index 7e16bc4..d206b6d 100644
--- a/org/config_nix.org
+++ b/org/config_nix.org
@@ -50,6 +50,7 @@ watch_file flake.nix
 if [ -f .envrc-local ]; then
   source_env_if_exists .envrc-local || source .envrc-local
 fi
+PATH_add result/bin
 # echo "
 #
 # - nix flake update && nix flake check --show-trace && nix flake show && nix develop .#devShell
@@ -78,7 +79,6 @@ fi
 #+HEADER: :tangle ../.envrc-local_
 #+HEADER: :noweb yes
 #+BEGIN_SRC sh
-PATH_add result/bin
 #export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos
 #export NIX_PATH=/srv/nix/nixpkgs
 #export NIX_PATH=nixpkgs=/srv/nix/nixpkgs
@@ -161,14 +161,14 @@ export SpineSQLdb='spine.search.db'
           '';
         in with pkgs; {
           devShell = mkShell rec {
-            name = "spine dev shell default";
+            name = "spine base dev shell";
             inherit shell;
             inherit devEnv;
             #buildInputs        = [ sqlite ];
             #nativeBuildInputs  = [ dub dmd ldc gdc gnumake ];
             packages     = [
-              sqlite
               dub dmd ldc gdc gnumake
+              sqlite
             ];
             inherit shellHook;
           };
@@ -177,8 +177,8 @@ export SpineSQLdb='spine.search.db'
             inherit shell;
             inherit devEnv;
             packages     = [
-              sqlite
               dub dmd ldc gdc gnumake
+              sqlite
               libxml2
               html-tidy
               xmlstarlet
@@ -201,8 +201,8 @@ export SpineSQLdb='spine.search.db'
             inherit shell;
             inherit devEnv;
             packages     = [
-              sqlite
               dub dmd ldc gdc gnumake
+              sqlite
             ];
             inherit shellHook;
           };
@@ -211,8 +211,8 @@ export SpineSQLdb='spine.search.db'
             inherit shell;
             inherit devEnv;
             packages     = [
-              sqlite
               dub dmd ldc gdc gnumake
+              sqlite
               source-sans-pro
               source-serif-pro
               source-code-pro
@@ -225,8 +225,8 @@ export SpineSQLdb='spine.search.db'
             inherit shell;
             inherit devEnv;
             packages     = [
-              sqlite
               dub dmd ldc gdc gnumake
+              sqlite
             ];
             inherit shellHook;
           };
@@ -234,12 +234,13 @@ export SpineSQLdb='spine.search.db'
             inherit shell;
             inherit devEnv;
             packages     = [
-              sqlite
               dub dmd ldc gdc gnumake
+              sqlite
               perl534Packages.Po4a
             ];
             inherit shellHook;
           };
+          default = import ./shell.nix { inherit pkgs; };
       });
   };
 }
-- 
cgit v1.2.3