From 557142757553ba47c10ac75a994b5dbe91fd8ad5 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sun, 23 Feb 2025 14:31:33 +1000
Subject: [PATCH] modules/shared/community-builder: enable grml on darwin
---
dev/packages.nix | 10 ++++++++++
modules/shared/community-builder.nix | 21 +++++++++------------
2 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/dev/packages.nix b/dev/packages.nix
index dcb99fb..6537aa2 100644
--- a/dev/packages.nix
+++ b/dev/packages.nix
@@ -5,6 +5,16 @@
...
}:
{
+ grml-zsh-config = prev.grml-zsh-config.overrideAttrs (o: {
+ patches = (o.patches or [ ]) ++ [
+ (final.fetchpatch {
+ name = "use-path_helper-on-macos.patch";
+ url = "https://github.com/grml/grml-etc-core/commit/4d8fae2d8c5cee771bb4fc70e0a3cb21e1b839fd.patch";
+ hash = "sha256-0rWFlKaO/85T8/2mYa5P9DOiP5rcPqt9CjTcoLpH5/E=";
+ revert = true;
+ })
+ ];
+ });
hydra = (prev.hydra.override { nix = final.nixVersions.nix_2_24; }).overrideAttrs (o: {
version = inputs.hydra.shortRev;
src = inputs.hydra;
diff --git a/modules/shared/community-builder.nix b/modules/shared/community-builder.nix
index 798726e..3f40622 100644
--- a/modules/shared/community-builder.nix
+++ b/modules/shared/community-builder.nix
@@ -68,17 +68,14 @@
useBabelfish = true;
};
- programs.zsh =
- {
- enable = true;
- }
- // lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux {
- # https://grml.org/zsh/grmlzshrc.html
- # https://grml.org/zsh/grml-zsh-refcard.pdf
- interactiveShellInit = ''
- source ${pkgs.grml-zsh-config}/etc/zsh/zshrc
- '';
- promptInit = ""; # otherwise it'll override the grml prompt
- };
+ programs.zsh = {
+ enable = true;
+ # https://grml.org/zsh/grmlzshrc.html
+ # https://grml.org/zsh/grml-zsh-refcard.pdf
+ interactiveShellInit = ''
+ source ${pkgs.grml-zsh-config}/etc/zsh/zshrc
+ '';
+ promptInit = ""; # otherwise it'll override the grml prompt
+ };
};
}