From 29ce7ebecd3603e8c134e58ff4da10187b29f034 Mon Sep 17 00:00:00 2001
From: ckie <git-525ff67@ckie.dev>
Date: Sun, 11 Sep 2022 15:41:45 +0300
Subject: [PATCH] default.nix#doomLocal: disable git hooks in the new way

---
 advice.el   | 5 ++++-
 default.nix | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/advice.el b/advice.el
index ea3a21e..7610b90 100644
--- a/advice.el
+++ b/advice.el
@@ -41,7 +41,10 @@
 (advice-add '+org-fix-package-h
             :override (lambda (&rest r)))
 
-;; don't try adding the git hooks
+;; don't try adding the git hooks for old dooms. this function is
+;; undefined in newer dooms and a CLI argument is used instead.
+;;
+;; kept around for backwards-compat, but this is not a priority.
 (advice-add 'doom-cli--ci-deploy-hooks
             :override (lambda (&rest r)))
 
diff --git a/default.nix b/default.nix
index 799cf25..f5bd887 100644
--- a/default.nix
+++ b/default.nix
@@ -89,6 +89,7 @@ let
     patches = [
       ./patches/fix-paths.patch
       ./patches/cli-early-init-load.patch
+      ./patches/cli-no-quickstart.patch
     ];
     installPhase = ''
       mkdir -p $out
@@ -117,7 +118,7 @@ let
         emacsPackages.overrideScope' overrides;
       emacs = emacsPackages.emacsWithPackages extraPackages;
       emacsLoadFiles = [ ./advice.el ];
-      emacsArgs = [ "--" "install" ];
+      emacsArgs = [ "--" "install" "--no-hooks" ];
 
       # Need to reference a store path here, as byte-compilation will bake-in
       # absolute path to source files.