From 36bce3735b5c76218f77abaaa52cbd3a4d14f581 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 25 Oct 2022 20:21:57 +0100 Subject: [PATCH 1/3] Pin doom-emacs to commit 3853dff5e11655e858d0bfae64b70cb12ef685ac --- flake.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index b8bc8e4..6bf8ff5 100644 --- a/flake.nix +++ b/flake.nix @@ -36,7 +36,8 @@ description = "nix-doom-emacs home-manager module"; inputs = { - doom-emacs.url = "github:doomemacs/doomemacs/master"; + # TODO: change back to master once we get synced back with upstream changes + doom-emacs.url = "github:doomemacs/doomemacs/3853dff5e11655e858d0bfae64b70cb12ef685ac"; doom-emacs.flake = false; doom-snippets.url = "github:doomemacs/snippets"; doom-snippets.flake = false; From 293935849995314dcbdb35c28330210151e7ffcc Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 25 Oct 2022 20:24:57 +0100 Subject: [PATCH 2/3] Ping doom-modeline to commit ce9899f00af40edb78f58b9af5c3685d67c8eed2 --- flake.lock | 26 ++++++++++++++++++++++---- flake.nix | 3 +++ 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 754a626..1d53f81 100644 --- a/flake.lock +++ b/flake.lock @@ -3,17 +3,34 @@ "doom-emacs": { "flake": false, "locked": { - "lastModified": 1660901074, - "narHash": "sha256-3apl0eQlfBj3y0gDdoPp2M6PXYnhxs0QWOHp8B8A9sc=", + "lastModified": 1662497747, + "narHash": "sha256-4n7E1fqda7cn5/F2jTkOnKw1juG6XMS/FI9gqODL3aU=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "c44bc81a05f3758ceaa28921dd9c830b9c571e61", + "rev": "3853dff5e11655e858d0bfae64b70cb12ef685ac", "type": "github" }, "original": { "owner": "doomemacs", - "ref": "master", "repo": "doomemacs", + "rev": "3853dff5e11655e858d0bfae64b70cb12ef685ac", + "type": "github" + } + }, + "doom-modeline": { + "flake": false, + "locked": { + "lastModified": 1648449595, + "narHash": "sha256-HjULFxtNDAJ7PDpy/e2bhoDYgBjwGpBdBoTY135puYA=", + "owner": "seagle0128", + "repo": "doom-modeline", + "rev": "ce9899f00af40edb78f58b9af5c3685d67c8eed2", + "type": "github" + }, + "original": { + "owner": "seagle0128", + "repo": "doom-modeline", + "rev": "ce9899f00af40edb78f58b9af5c3685d67c8eed2", "type": "github" } }, @@ -339,6 +356,7 @@ "root": { "inputs": { "doom-emacs": "doom-emacs", + "doom-modeline": "doom-modeline", "doom-snippets": "doom-snippets", "emacs-overlay": "emacs-overlay", "emacs-so-long": "emacs-so-long", diff --git a/flake.nix b/flake.nix index 6bf8ff5..29325a9 100644 --- a/flake.nix +++ b/flake.nix @@ -39,6 +39,9 @@ # TODO: change back to master once we get synced back with upstream changes doom-emacs.url = "github:doomemacs/doomemacs/3853dff5e11655e858d0bfae64b70cb12ef685ac"; doom-emacs.flake = false; + # TODO remove pin once we get synced back with upstream changes + doom-modeline.url = "github:seagle0128/doom-modeline/ce9899f00af40edb78f58b9af5c3685d67c8eed2"; + doom-modeline.flake = false; doom-snippets.url = "github:doomemacs/snippets"; doom-snippets.flake = false; emacs-overlay.url = "github:nix-community/emacs-overlay"; From fffed0f30009b82ac921fe0bbf6ae446e95642a6 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 25 Oct 2022 21:16:16 +0100 Subject: [PATCH 3/3] Add doom-modeline recipe to overrides --- overrides.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/overrides.nix b/overrides.nix index 08f15c5..87095bb 100644 --- a/overrides.nix +++ b/overrides.nix @@ -8,6 +8,15 @@ self: super: { buildPhase = ":"; } // args); + doom-modeline = self.straightBuild { + pname = "doom-modeline"; + propagatedBuildInputs = with self; [ + all-the-icons + compat + shrink-path + ]; + }; + doom-snippets = self.straightBuild { pname = "doom-snippets"; postInstall = ''