Merge branch 'develop' (early part)

advice.el

@@ -17,3 +17,7 @@
 ;;; org is not installed from git, so no fixup is needed
 (advice-add '+org-fix-package-h
             :override (lambda (&rest r)))
+
+;; just use straight provided by nix
+(advice-add 'doom-ensure-straight
+            :override (lambda (&rest r) (require 'straight)))

default.nix

@@ -49,7 +49,7 @@
 , runCommand
 , fetchFromGitHub
 , substituteAll
-, writeScriptBin
+, writeShellScriptBin
 , writeTextDir }:
 
 let
@@ -163,8 +163,9 @@ let
 
       # I don't know why but byte-compilation somehow triggers Emacs to look for
       # the git executable. It does not seem to be executed though...
-      git = writeScriptBin "git" ''
+      git = writeShellScriptBin "git" ''
-        >&2 echo Executing git is not allowed; command line: "$@"
+        >&2 echo "Executing git is not allowed; command line:" "$@"
+        exit 127
       '';
     in (straight-env.emacsEnv {
       inherit packages;

nix/sources.json

@@ -84,15 +84,15 @@
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nix-straight.el": {
-        "branch": "v1.2.0",
+        "branch": "v2.0.0",
         "description": null,
         "homepage": null,
         "owner": "vlaci",
         "repo": "nix-straight.el",
-        "rev": "446f3d70f1816305130f307c0cf2bc8db77ed698",
+        "rev": "b0ac8033a448c609645b4d9b5ff5f90de608f326",
-        "sha256": "1p4yp46kwhii8w9yf882fca9r3addn91wg6f4mv62wnkfm0i6q0f",
+        "sha256": "1vgdjfyz8964mixwfcv30lmkjfgsmsw8vl23x1964izr2cfh2dy6",
         "type": "tarball",
-        "url": "https://github.com/vlaci/nix-straight.el/archive/446f3d70f1816305130f307c0cf2bc8db77ed698.tar.gz",
+        "url": "https://github.com/vlaci/nix-straight.el/archive/b0ac8033a448c609645b4d9b5ff5f90de608f326.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "org-mode": {