From d5ffa6d796ba8929b35ba16d022b6b4a5a25458c Mon Sep 17 00:00:00 2001 From: Colin Date: Wed, 10 May 2023 21:23:42 +0000 Subject: [PATCH] zeal/docsets: ship on desko too --- hosts/by-name/desko/default.nix | 1 + hosts/by-name/lappy/default.nix | 6 +----- hosts/common/programs/default.nix | 1 - hosts/modules/roles/default.nix | 1 + hosts/modules/roles/dev-machine.nix | 30 +++++++++++++++++++++++++++++ 5 files changed, 33 insertions(+), 6 deletions(-) create mode 100644 hosts/modules/roles/dev-machine.nix diff --git a/hosts/by-name/desko/default.nix b/hosts/by-name/desko/default.nix index 19d18794..b65267d1 100644 --- a/hosts/by-name/desko/default.nix +++ b/hosts/by-name/desko/default.nix @@ -6,6 +6,7 @@ sane.roles.build-machine.enable = true; sane.roles.client = true; + sane.roles.dev-machine = true; sane.services.wg-home.enable = true; sane.services.wg-home.ip = config.sane.hosts.by-name."desko".wg-home.ip; sane.services.duplicity.enable = true; diff --git a/hosts/by-name/lappy/default.nix b/hosts/by-name/lappy/default.nix index 376403f2..bf0c18c5 100644 --- a/hosts/by-name/lappy/default.nix +++ b/hosts/by-name/lappy/default.nix @@ -7,6 +7,7 @@ sane.yggdrasil.enable = true; sane.roles.client = true; + sane.roles.dev-machine = true; sane.services.wg-home.enable = true; sane.services.wg-home.ip = config.sane.hosts.by-name."lappy".wg-home.ip; @@ -19,11 +20,6 @@ "desktopGuiApps" "stepmania" ]; - sane.programs.docsets.config.rustPkgs = [ - "lemmy-server" - "mx-sanebot" - ]; - sane.programs.docsets.enableFor.system = true; sops.secrets.colin-passwd = { sopsFile = ../../../secrets/lappy.yaml; diff --git a/hosts/common/programs/default.nix b/hosts/common/programs/default.nix index faa86df8..6b279a6e 100644 --- a/hosts/common/programs/default.nix +++ b/hosts/common/programs/default.nix @@ -235,7 +235,6 @@ let signal-desktop spotify tor-browser-bundle-bin - zeal-qt5 # programming docs viewer. TODO: switch to zeal-qt6 zecwallet-lite ; }; diff --git a/hosts/modules/roles/default.nix b/hosts/modules/roles/default.nix index 864d2ec2..b0c0b096 100644 --- a/hosts/modules/roles/default.nix +++ b/hosts/modules/roles/default.nix @@ -3,5 +3,6 @@ imports = [ ./build-machine.nix ./client + ./dev-machine.nix ]; } diff --git a/hosts/modules/roles/dev-machine.nix b/hosts/modules/roles/dev-machine.nix new file mode 100644 index 00000000..be75bb88 --- /dev/null +++ b/hosts/modules/roles/dev-machine.nix @@ -0,0 +1,30 @@ +{ config, lib, ... }: + +let + inherit (lib) mkIf mkMerge mkOption types; + cfg = config.sane.roles.dev-machine; +in +{ + options.sane.roles.dev-machine = mkOption { + type = types.bool; + default = false; + description = '' + enable if this machine is used generally for "development" + and you want tools to support that (e.g. docs). + ''; + }; + + config = mkMerge [ + ({ + sane.programs.docsets.config.rustPkgs = [ + "lemmy-server" + "mx-sanebot" + ]; + }) + (mkIf cfg { + sane.programs.docsets.enableFor.system = true; + # TODO: migrate this to `sane.user.programs.zeal-qt5.enable = true` + sane.programs.zeal-qt5.enableFor.user.colin = true; + }) + ]; +}