From 37cc939cfde3d524bf7faf1a31d3ef5d6e6a78e7 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 5 Jun 2025 20:48:34 -0400 Subject: nix flake rsh - distinguish project use of Ruby & D environments --- .envrc-nix | 2 +- flake.lock | 6 +++--- flake.nix | 41 +++++++++++++++++++++++++++++++++++------ org/config_env.org | 2 +- org/config_nix.org | 41 +++++++++++++++++++++++++++++++++++------ 5 files changed, 75 insertions(+), 17 deletions(-) diff --git a/.envrc-nix b/.envrc-nix index f827dffa..09292482 100644 --- a/.envrc-nix +++ b/.envrc-nix @@ -23,7 +23,7 @@ echo " ❯❯ nix develop ❯❯ nix develop '.#' --print-build-logs -c zsh - ❯❯ nix develop '.#dsh-latex-pdf' --print-build-logs -c zsh + ❯❯ nix develop '.#rsh-latex-pdf' --print-build-logs -c zsh • to build project: diff --git a/flake.lock b/flake.lock index 4bd7fb7d..3da7b960 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1738009863, - "narHash": "sha256-KxmFlQ2j9PpDhKRXWu85bv3R2wmfkUqdpJhEwz9JN/E=", + "lastModified": 1748856973, + "narHash": "sha256-RlTsJUvvr8ErjPBsiwrGbbHYW8XbB/oek0Gi78XdWKg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f898cbfddfab52593da301a397a17d0af801bbc3", + "rev": "e4b09e47ace7d87de083786b404bf232eb6c89d8", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index a7dbf157..d4c8888a 100644 --- a/flake.nix +++ b/flake.nix @@ -82,7 +82,7 @@ ]; inherit shellHook; }; - dsh-epub = mkShell { + rsh-epub = mkShell { name = "sisu dev shell for epub output"; inherit shell; inherit devEnv; @@ -116,7 +116,7 @@ ]; inherit shellHook; }; - dsh-html = mkShell { + rsh-html = mkShell { name = "sisu dev shell for html output"; inherit shell; inherit devEnv; @@ -136,7 +136,7 @@ ]; inherit shellHook; }; - dsh-latex-pdf = mkShell { + rsh-latex-pdf = mkShell { name = "sisu dev shell for latex & pdf output"; inherit shell; inherit devEnv; @@ -153,7 +153,8 @@ source-sans-pro source-serif-pro source-code-pro - texliveFull # texliveTeTeX + texlive.combined.scheme-full + # texliveFull # texliveTeTeX noto-fonts noto-fonts-cjk-sans takao @@ -163,7 +164,35 @@ ]; inherit shellHook; }; - dsh-sqlite = mkShell { + rsh-comprehensive-shell = mkShell { + name = "comprehensive sisu dev shell (for epub & latex & pdf output)"; + inherit shell; + inherit devEnv; + packages = [ + ruby + rubyPackages.rake + rubyPackages.sqlite3 + rubyPackages.thor + sqlite + graphicsmagick + zip + unzip + xz + source-sans-pro + source-serif-pro + source-code-pro + texlive.combined.scheme-full + # texliveFull # texliveTeTeX + noto-fonts + noto-fonts-cjk-sans + takao + validatePkgConfig + jq + git + ]; + inherit shellHook; + }; + rsh-sqlite = mkShell { name = "sisu dev shell for sqlite3 output"; inherit shell; inherit devEnv; @@ -183,7 +212,7 @@ ]; inherit shellHook; }; - dsh-i18n = mkShell { + rsh-i18n = mkShell { name = "sisu dev shell internationalization, po4a"; inherit shell; inherit devEnv; diff --git a/org/config_env.org b/org/config_env.org index 83dcd2eb..49141822 100644 --- a/org/config_env.org +++ b/org/config_env.org @@ -84,7 +84,7 @@ echo " ❯❯ nix develop ❯❯ nix develop '.#' --print-build-logs -c zsh - ❯❯ nix develop '.#dsh-latex-pdf' --print-build-logs -c zsh + ❯❯ nix develop '.#rsh-latex-pdf' --print-build-logs -c zsh • to build project: diff --git a/org/config_nix.org b/org/config_nix.org index 33014ad3..9b0f535f 100644 --- a/org/config_nix.org +++ b/org/config_nix.org @@ -102,7 +102,7 @@ ]; inherit shellHook; }; - dsh-epub = mkShell { + rsh-epub = mkShell { name = "sisu dev shell for epub output"; inherit shell; inherit devEnv; @@ -133,7 +133,7 @@ ]; inherit shellHook; }; - dsh-html = mkShell { + rsh-html = mkShell { name = "sisu dev shell for html output"; inherit shell; inherit devEnv; @@ -150,7 +150,7 @@ ]; inherit shellHook; }; - dsh-latex-pdf = mkShell { + rsh-latex-pdf = mkShell { name = "sisu dev shell for latex & pdf output"; inherit shell; inherit devEnv; @@ -164,7 +164,8 @@ source-sans-pro source-serif-pro source-code-pro - texliveFull # texliveTeTeX + texlive.combined.scheme-full + # texliveFull # texliveTeTeX noto-fonts noto-fonts-cjk-sans takao @@ -174,7 +175,35 @@ ]; inherit shellHook; }; - dsh-sqlite = mkShell { + rsh-comprehensive-shell = mkShell { + name = "comprehensive sisu dev shell (for epub & latex & pdf output)"; + inherit shell; + inherit devEnv; + packages = [ + ruby + rubyPackages.rake + rubyPackages.sqlite3 + rubyPackages.thor + sqlite + graphicsmagick + zip + unzip + xz + source-sans-pro + source-serif-pro + source-code-pro + texlive.combined.scheme-full + # texliveFull # texliveTeTeX + noto-fonts + noto-fonts-cjk-sans + takao + validatePkgConfig + jq + git + ]; + inherit shellHook; + }; + rsh-sqlite = mkShell { name = "sisu dev shell for sqlite3 output"; inherit shell; inherit devEnv; @@ -191,7 +220,7 @@ ]; inherit shellHook; }; - dsh-i18n = mkShell { + rsh-i18n = mkShell { name = "sisu dev shell internationalization, po4a"; inherit shell; inherit devEnv; -- cgit v1.2.3