diff --git a/hosts/by-name/lappy/default.nix b/hosts/by-name/lappy/default.nix index 4a045834..a668f1f9 100644 --- a/hosts/by-name/lappy/default.nix +++ b/hosts/by-name/lappy/default.nix @@ -19,6 +19,7 @@ "desktopGuiApps" "stepmania" ]; + sane.programs.mx-sanebot.enableFor.system = true; # for the docs sops.secrets.colin-passwd = { sopsFile = ../../../secrets/lappy.yaml; diff --git a/hosts/common/programs/default.nix b/hosts/common/programs/default.nix index 8dbc65c2..f06d48cd 100644 --- a/hosts/common/programs/default.nix +++ b/hosts/common/programs/default.nix @@ -242,6 +242,7 @@ let # packages not part of any package set otherPkgs = { inherit (pkgs) + mx-sanebot stepmania ; }; @@ -270,6 +271,7 @@ in ./sublime-music.nix ./vlc.nix ./web-browser.nix + ./zeal.nix ./zsh ]; @@ -403,11 +405,6 @@ in yarn.persist.plaintext = [ ".cache/yarn" ]; - zeal-qt5.persist.plaintext = [ - ".cache/Zeal" - ".local/share/Zeal" - ]; - # zcash coins. safe to delete, just slow to regenerate (10-60 minutes) zecwallet-lite.persist.private = [ ".zcash" ]; } diff --git a/hosts/common/programs/zeal.nix b/hosts/common/programs/zeal.nix new file mode 100644 index 00000000..3bef4949 --- /dev/null +++ b/hosts/common/programs/zeal.nix @@ -0,0 +1,16 @@ +{ config, lib, sane-lib, ... }: +let + inherit (lib) mkIf; +in { + sane.programs.zeal-qt5 = { + persist.plaintext = [ + ".cache/Zeal" + ".local/share/Zeal" + ]; + fs.".local/share/Zeal/Zeal/system" = sane-lib.fs.wantedSymlinkTo "/run/current-system/sw/share/docset"; + }; + + environment.pathsToLink = mkIf config.sane.programs.zeal-qt5.enabled [ + "/share/docset" + ]; +} diff --git a/pkgs/mx-sanebot/default.nix b/pkgs/mx-sanebot/default.nix index c0379174..7be667ab 100644 --- a/pkgs/mx-sanebot/default.nix +++ b/pkgs/mx-sanebot/default.nix @@ -14,9 +14,14 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ pkg-config ] ++ lib.optional (cargo-docset != null) cargo-docset; buildInputs = [ openssl ]; - # to build dash/zeal docs: - # `cargo-docset` - # `cp -r -rcp target/docset/mx-sanebot.docset ~/.local/share/Zeal/Zeal/docsets/` + postBuild = '' + cargo-docset docset + ''; + + postInstall = '' + mkdir -p $out/share/docset + cp -R target/docset/* $out/share/docset/ + ''; # enables debug builds, if we want: https://github.com/NixOS/nixpkgs/issues/60919. hardeningDisable = [ "fortify" ];