diff --git a/modules/wisdom/apps/localsend.nix b/modules/wisdom/apps/localsend.nix index 0dab2a6..74e0eab 100644 --- a/modules/wisdom/apps/localsend.nix +++ b/modules/wisdom/apps/localsend.nix @@ -1,4 +1,4 @@ -{ ... }: { +{ self, ... }: { flake.nixosModules.systemLocalsend = { config, lib, ... }: let @@ -19,25 +19,10 @@ }; }; - flake.homeManagerModules.wisdomAppsLocalsend = - { config, lib, pkgs, ... }: - let - root = config.chiasson.home; - cfg = config.chiasson.home.apps.localsend; - in - { - options.chiasson.home.apps.localsend = { - enable = lib.mkEnableOption '' - LocalSend client; open the firewall on NixOS with `system.localsend` if you want inbound. - '' // { - default = true; - }; - - package = lib.mkPackageOption pkgs "localsend" { }; - }; - - config = lib.mkIf (root.enable && cfg.enable) { - home.packages = [ cfg.package ]; - }; - }; + flake.homeManagerModules.wisdomAppsLocalsend = self.lib.wisdomSimpleSlice { + path = "apps.localsend"; + default = true; + description = "LocalSend client; open the firewall on NixOS with `system.localsend` if you want inbound."; + packages = pkgs: [ pkgs.localsend ]; + }; } diff --git a/modules/wisdom/apps/pokeclicker/default.nix b/modules/wisdom/apps/pokeclicker/default.nix index 428e5b3..7c836fc 100644 --- a/modules/wisdom/apps/pokeclicker/default.nix +++ b/modules/wisdom/apps/pokeclicker/default.nix @@ -1,18 +1,8 @@ -{ ... }: { - flake.homeManagerModules.wisdomAppsPokeclicker = - { config, lib, pkgs, ... }: - let - root = config.chiasson.home; - cfg = config.chiasson.home.apps.pokeclicker; - pokeclickerPkg = pkgs.callPackage ./package { }; - in - { - options.chiasson.home.apps.pokeclicker.enable = lib.mkEnableOption "PokéClicker desktop (Farigh fork .deb → nix)." // { - default = false; - }; - - config = lib.mkIf (root.enable && cfg.enable) { - home.packages = [ pokeclickerPkg ]; - }; - }; +{ self, ... }: { + flake.homeManagerModules.wisdomAppsPokeclicker = self.lib.wisdomSimpleSlice { + path = "apps.pokeclicker"; + default = false; + description = "PokéClicker desktop (Farigh fork .deb → nix)."; + packages = pkgs: [ (pkgs.callPackage ./package { }) ]; + }; } diff --git a/modules/wisdom/browsers/flow.nix b/modules/wisdom/browsers/flow.nix index af79ccd..dde67bf 100644 --- a/modules/wisdom/browsers/flow.nix +++ b/modules/wisdom/browsers/flow.nix @@ -1,31 +1,31 @@ -{ ... }: { - flake.homeManagerModules.wisdomBrowsersFlow = - { config, lib, pkgs, ... }: - let - root = config.chiasson.home; - cfg = config.chiasson.home.browsers.flow; +{ self, ... }: { + flake.homeManagerModules.wisdomBrowsersFlow = self.lib.wisdomSimpleSlice { + path = "browsers.flow"; + default = false; + description = "[Flow](https://github.com/MultiboxLabs/flow-browser) — upstream AppImage wrapped for NixOS."; + packages = + pkgs: + let + pname = "flow-browser"; + version = "0.11.0"; - flow-browser = - let - pname = "flow-browser"; - version = "0.11.0"; + suffix = if pkgs.stdenv.hostPlatform.isAarch64 then "arm64" else "x86_64"; - suffix = if pkgs.stdenv.hostPlatform.isAarch64 then "arm64" else "x86_64"; + hash = + if pkgs.stdenv.hostPlatform.isAarch64 then + "sha256-rTRKbNyVRJAw7ZyDR6kx+XJ4rWmErZqA0b6LP9t5eOA=" + else + "sha256-/Tca4uUBfgbZQEeXdYkCz6CWxqvCl40CQpACFry1k9s="; - hash = - if pkgs.stdenv.hostPlatform.isAarch64 then - "sha256-rTRKbNyVRJAw7ZyDR6kx+XJ4rWmErZqA0b6LP9t5eOA=" - else - "sha256-/Tca4uUBfgbZQEeXdYkCz6CWxqvCl40CQpACFry1k9s="; + src = pkgs.fetchurl { + url = "https://github.com/MultiboxLabs/flow-browser/releases/download/v${version}/flow-browser-${version}-${suffix}.AppImage"; + inherit hash; + }; - src = pkgs.fetchurl { - url = "https://github.com/MultiboxLabs/flow-browser/releases/download/v${version}/flow-browser-${version}-${suffix}.AppImage"; - inherit hash; - }; - - appimageContents = pkgs.appimageTools.extractType2 { inherit pname version src; }; - in - pkgs.appimageTools.wrapType2 { + appimageContents = pkgs.appimageTools.extractType2 { inherit pname version src; }; + in + [ + (pkgs.appimageTools.wrapType2 { inherit pname version src; nativeBuildInputs = [ pkgs.makeWrapper ]; @@ -45,25 +45,13 @@ meta = { description = "Chromium-based browser (upstream AppImage)"; homepage = "https://github.com/MultiboxLabs/flow-browser"; - license = lib.licenses.gpl3Plus; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = pkgs.lib.licenses.gpl3Plus; + sourceProvenance = with pkgs.lib.sourceTypes; [ binaryNativeCode ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; mainProgram = pname; maintainers = [ ]; }; - }; - in - { - options.chiasson.home.browsers.flow.enable = lib.mkEnableOption '' - [Flow](https://github.com/MultiboxLabs/flow-browser) — upstream AppImage wrapped for NixOS. - '' // { - default = false; - }; - - config = lib.mkIf (root.enable && cfg.enable) { - home.packages = lib.optional ( - lib.meta.availableOn pkgs.stdenv.hostPlatform flow-browser - ) flow-browser; - }; - }; + }) + ]; + }; }