From 3798d2065cd6b05c0bf9078430fa0551e6b09fdc Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Wed, 28 Jun 2023 14:37:51 -0400 Subject: nixenv generic set shell from system (from zsh) --- .envrc-local | 4 ++-- makefile | 4 ++-- org/config_env.org | 4 ++-- org/config_make.org | 4 ++-- org/nixpkgs_overlays_d_related.org | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.envrc-local b/.envrc-local index bfa75d7..d56ab09 100644 --- a/.envrc-local +++ b/.envrc-local @@ -5,10 +5,10 @@ fi echo ' .envrc-local echo ❯❯ - ❯❯ nix flake update && nix flake check --show-trace && nix flake show && nix develop ".#devShell" -c zsh + ❯❯ nix flake update && nix flake check --show-trace && nix flake show && nix develop ".#devShell" -c $SHELL ❯❯ nix develop - ❯❯ nix develop -c zsh + ❯❯ nix develop -c $SHELL ❯❯ nix develop ".#dsh-overlay-ldc" --print-build-logs ❯❯ nix build diff --git a/makefile b/makefile index ac0d8c9..970a722 100644 --- a/makefile +++ b/makefile @@ -72,8 +72,8 @@ flake-check: nix flake check; \ echo -e 'nix flake show ❯❯\n'; \ nix flake show; \ - echo -e '\n❯❯ nix flake update && nix flake check --show-trace && nix flake show && nix develop ".#devShell" -c zsh\n'; \ - echo -e '❯❯ nix develop\n❯❯ nix develop -c zsh\n'; \ + echo -e '\n❯❯ nix flake update && nix flake check --show-trace && nix flake show && nix develop ".#devShell" -c $SHELL\n'; \ + echo -e '❯❯ nix develop\n❯❯ nix develop -c $SHELL\n'; \ echo -e '❯❯ nix build ".#spine-ldc" --print-build-logs |& nom\n❯❯ nix build ".#spine-dmd" --print-build-logs |& nom\n'; \ echo -e '❯❯ make -s\n❯❯ make -s nix-build-ldc\n❯❯ make -s nix-build-dmd\n'; \ echo -e '❯❯ make -s ldc\n❯❯ make -s dmd\n'; \ diff --git a/org/config_env.org b/org/config_env.org index c9f9407..bbf43fe 100644 --- a/org/config_env.org +++ b/org/config_env.org @@ -102,10 +102,10 @@ fi echo ' .envrc-local echo ❯❯ - ❯❯ nix flake update && nix flake check --show-trace && nix flake show && nix develop ".#devShell" -c zsh + ❯❯ nix flake update && nix flake check --show-trace && nix flake show && nix develop ".#devShell" -c $SHELL ❯❯ nix develop - ❯❯ nix develop -c zsh + ❯❯ nix develop -c $SHELL ❯❯ nix develop ".#dsh-overlay-ldc" --print-build-logs ❯❯ nix build diff --git a/org/config_make.org b/org/config_make.org index 58f58fb..99940c6 100644 --- a/org/config_make.org +++ b/org/config_make.org @@ -122,8 +122,8 @@ flake-check: nix flake check; \ echo -e 'nix flake show ❯❯\n'; \ nix flake show; \ - echo -e '\n❯❯ nix flake update && nix flake check --show-trace && nix flake show && nix develop ".#devShell" -c zsh\n'; \ - echo -e '❯❯ nix develop\n❯❯ nix develop -c zsh\n'; \ + echo -e '\n❯❯ nix flake update && nix flake check --show-trace && nix flake show && nix develop ".#devShell" -c $SHELL\n'; \ + echo -e '❯❯ nix develop\n❯❯ nix develop -c $SHELL\n'; \ echo -e '❯❯ nix build ".#spine-ldc" --print-build-logs |& nom\n❯❯ nix build ".#spine-dmd" --print-build-logs |& nom\n'; \ echo -e '❯❯ make -s\n❯❯ make -s nix-build-ldc\n❯❯ make -s nix-build-dmd\n'; \ echo -e '❯❯ make -s ldc\n❯❯ make -s dmd\n'; \ diff --git a/org/nixpkgs_overlays_d_related.org b/org/nixpkgs_overlays_d_related.org index 589f901..5c9dfc0 100644 --- a/org/nixpkgs_overlays_d_related.org +++ b/org/nixpkgs_overlays_d_related.org @@ -247,10 +247,10 @@ fi echo ' .envrc-local echo ❯❯ - ❯❯ nix flake update && nix flake check --show-trace && nix flake show && nix develop ".#devShell" -c zsh + ❯❯ nix flake update && nix flake check --show-trace && nix flake show && nix develop ".#devShell" -c $SHELL ❯❯ nix develop - ❯❯ nix develop -c zsh + ❯❯ nix develop -c $SHELL ❯❯ nix develop ".#dsh-overlay-ldc" --print-build-logs ❯❯ nix build @@ -459,7 +459,7 @@ with pkgs; #echo ' # shell.nix echo ❯❯ - # ❯❯ nix flake update && nix flake check --show-trace && nix flake show && nix develop ".#devShell" -c zsh + # ❯❯ nix flake update && nix flake check --show-trace && nix flake show && nix develop ".#devShell" -c $SHELL #' ''; } -- cgit v1.2.3