aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--.envrc-nix6
-rw-r--r--.gitignore18
-rw-r--r--flake.lock6
-rw-r--r--flake.nix17
-rw-r--r--org/config_env.org16
-rw-r--r--org/config_git.org18
-rw-r--r--org/config_nix.org17
7 files changed, 85 insertions, 13 deletions
diff --git a/.envrc-nix b/.envrc-nix
index 09292482..50551ecc 100644
--- a/.envrc-nix
+++ b/.envrc-nix
@@ -1,7 +1,7 @@
NIX_ENFORCE_PURITY=1
# - https://github.com/nix-community/nix-direnv
-NixDirEnvVersion="3.0.6"
-NixDirEnvSHA="sha256-RYcUJaRMf8oF5LznDrlCXbkOQrywm0HDv1VjYGaJGdM="
+NixDirEnvVersion="3.0.7"
+NixDirEnvSHA="sha256-bn8WANE5a91RusFmRI7kS751ApelG02nMcwRekC/qzc="
if ! has nix_direnv_version || ! nix_direnv_version ${NixDirEnvVersion}; then
source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/${NixDirEnvVersion}/direnvrc" "${NixDirEnvSHA}"
fi
@@ -23,7 +23,7 @@ echo "
❯❯ nix develop
❯❯ nix develop '.#' --print-build-logs -c zsh
- ❯❯ nix develop '.#rsh-latex-pdf' --print-build-logs -c zsh
+ ❯❯ nix develop '.#rsh-comprehensive-shell' --print-build-logs -c zsh
• to build project:
diff --git a/.gitignore b/.gitignore
index a96a9d46..90f0bd7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,7 @@
!conf/
!conf/**
!*.json
+!*.md
!*.org
!org/
!org/*.org
@@ -74,13 +75,26 @@
*.gem
*.gemspec
!sisu.gemspec
-*_.rb
-*.rb_
0???-*.patch
*.gz
*.xz
*_
.*
+*_.org
+*_.nix
+*_.rb
+*.rb_
+*_.txt
+*_.md
+*_
+*.swp
+*~
+\#*
+*.\#*
+#!*/
+#\#*
+#*.\#*
+tmp/**
!.gitignore
!.gitattributes
!.envrc
diff --git a/flake.lock b/flake.lock
index 3da7b960..646b379d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
"nodes": {
"nixpkgs": {
"locked": {
- "lastModified": 1748856973,
- "narHash": "sha256-RlTsJUvvr8ErjPBsiwrGbbHYW8XbB/oek0Gi78XdWKg=",
+ "lastModified": 1749213349,
+ "narHash": "sha256-UAaWOyQhdp7nXzsbmLVC67fo+QetzoTm9hsPf9X3yr4=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "e4b09e47ace7d87de083786b404bf232eb6c89d8",
+ "rev": "a4ff0e3c64846abea89662bfbacf037ef4b34207",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index d4c8888a..26947fc5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -178,6 +178,23 @@
zip
unzip
xz
+ openssl
+ libxml2
+ html-tidy
+ xmlstarlet
+ epubcheck
+ ebook_tools
+ libxml2
+ html-tidy
+ xmlstarlet
+ epubcheck
+ ebook_tools
+ epr
+ sigil
+ calibre #(suite includes: ebook-viewer)
+ foliate
+ validatePkgConfig
+ jq
source-sans-pro
source-serif-pro
source-code-pro
diff --git a/org/config_env.org b/org/config_env.org
index 49141822..5fcf7a53 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 '.#rsh-latex-pdf' --print-build-logs -c zsh
+ ❯❯ nix develop '.#rsh-comprehensive-shell' --print-build-logs -c zsh
• to build project:
@@ -94,15 +94,25 @@ echo "
"
#+END_SRC
-*** 3.0.6
+*** 3.0.7
#+NAME: direnv-version
#+BEGIN_SRC shell
-3.0.6
+3.0.7
#+END_SRC
#+NAME: direnv-sha
#+BEGIN_SRC shell
+sha256-bn8WANE5a91RusFmRI7kS751ApelG02nMcwRekC/qzc=
+#+END_SRC
+
+*** 3.0.6
+
+#+BEGIN_SRC shell
+3.0.6
+#+END_SRC
+
+#+BEGIN_SRC shell
sha256-RYcUJaRMf8oF5LznDrlCXbkOQrywm0HDv1VjYGaJGdM=
#+END_SRC
diff --git a/org/config_git.org b/org/config_git.org
index baedbd8e..eb3d596e 100644
--- a/org/config_git.org
+++ b/org/config_git.org
@@ -47,6 +47,7 @@
!conf/
!conf/**
!*.json
+!*.md
!*.org
!org/
!org/*.org
@@ -96,13 +97,26 @@
,*.gem
,*.gemspec
!sisu.gemspec
-,*_.rb
-,*.rb_
0???-*.patch
,*.gz
,*.xz
,*_
.*
+,*_.org
+,*_.nix
+,*_.rb
+,*.rb_
+,*_.txt
+,*_.md
+,*_
+,*.swp
+,*~
+\#*
+,*.\#*
+#!*/
+#\#*
+#*.\#*
+tmp/**
!.gitignore
!.gitattributes
!.envrc
diff --git a/org/config_nix.org b/org/config_nix.org
index 9b0f535f..b7085e73 100644
--- a/org/config_nix.org
+++ b/org/config_nix.org
@@ -189,6 +189,23 @@
zip
unzip
xz
+ openssl
+ libxml2
+ html-tidy
+ xmlstarlet
+ epubcheck
+ ebook_tools
+ libxml2
+ html-tidy
+ xmlstarlet
+ epubcheck
+ ebook_tools
+ epr
+ sigil
+ calibre #(suite includes: ebook-viewer)
+ foliate
+ validatePkgConfig
+ jq
source-sans-pro
source-serif-pro
source-code-pro