refactor(wisdom): migrate app and browser modules to wisdomSimpleSlice
Replace manual Home Manager module definitions in `localsend`, `pokeclicker`, and `flow-browser` with the `wisdomSimpleSlice` helper. This reduces boilerplate by centralizing the option declaration and configuration logic.
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
{ ... }: {
|
{ self, ... }: {
|
||||||
flake.nixosModules.systemLocalsend =
|
flake.nixosModules.systemLocalsend =
|
||||||
{ config, lib, ... }:
|
{ config, lib, ... }:
|
||||||
let
|
let
|
||||||
@@ -19,25 +19,10 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
flake.homeManagerModules.wisdomAppsLocalsend =
|
flake.homeManagerModules.wisdomAppsLocalsend = self.lib.wisdomSimpleSlice {
|
||||||
{ config, lib, pkgs, ... }:
|
path = "apps.localsend";
|
||||||
let
|
default = true;
|
||||||
root = config.chiasson.home;
|
description = "LocalSend client; open the firewall on NixOS with `system.localsend` if you want inbound.";
|
||||||
cfg = config.chiasson.home.apps.localsend;
|
packages = pkgs: [ pkgs.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 ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,18 +1,8 @@
|
|||||||
{ ... }: {
|
{ self, ... }: {
|
||||||
flake.homeManagerModules.wisdomAppsPokeclicker =
|
flake.homeManagerModules.wisdomAppsPokeclicker = self.lib.wisdomSimpleSlice {
|
||||||
{ config, lib, pkgs, ... }:
|
path = "apps.pokeclicker";
|
||||||
let
|
default = false;
|
||||||
root = config.chiasson.home;
|
description = "PokéClicker desktop (Farigh fork .deb → nix).";
|
||||||
cfg = config.chiasson.home.apps.pokeclicker;
|
packages = pkgs: [ (pkgs.callPackage ./package { }) ];
|
||||||
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 ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,31 +1,31 @@
|
|||||||
{ ... }: {
|
{ self, ... }: {
|
||||||
flake.homeManagerModules.wisdomBrowsersFlow =
|
flake.homeManagerModules.wisdomBrowsersFlow = self.lib.wisdomSimpleSlice {
|
||||||
{ config, lib, pkgs, ... }:
|
path = "browsers.flow";
|
||||||
let
|
default = false;
|
||||||
root = config.chiasson.home;
|
description = "[Flow](https://github.com/MultiboxLabs/flow-browser) — upstream AppImage wrapped for NixOS.";
|
||||||
cfg = config.chiasson.home.browsers.flow;
|
packages =
|
||||||
|
pkgs:
|
||||||
|
let
|
||||||
|
pname = "flow-browser";
|
||||||
|
version = "0.11.0";
|
||||||
|
|
||||||
flow-browser =
|
suffix = if pkgs.stdenv.hostPlatform.isAarch64 then "arm64" else "x86_64";
|
||||||
let
|
|
||||||
pname = "flow-browser";
|
|
||||||
version = "0.11.0";
|
|
||||||
|
|
||||||
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 =
|
src = pkgs.fetchurl {
|
||||||
if pkgs.stdenv.hostPlatform.isAarch64 then
|
url = "https://github.com/MultiboxLabs/flow-browser/releases/download/v${version}/flow-browser-${version}-${suffix}.AppImage";
|
||||||
"sha256-rTRKbNyVRJAw7ZyDR6kx+XJ4rWmErZqA0b6LP9t5eOA="
|
inherit hash;
|
||||||
else
|
};
|
||||||
"sha256-/Tca4uUBfgbZQEeXdYkCz6CWxqvCl40CQpACFry1k9s=";
|
|
||||||
|
|
||||||
src = pkgs.fetchurl {
|
appimageContents = pkgs.appimageTools.extractType2 { inherit pname version src; };
|
||||||
url = "https://github.com/MultiboxLabs/flow-browser/releases/download/v${version}/flow-browser-${version}-${suffix}.AppImage";
|
in
|
||||||
inherit hash;
|
[
|
||||||
};
|
(pkgs.appimageTools.wrapType2 {
|
||||||
|
|
||||||
appimageContents = pkgs.appimageTools.extractType2 { inherit pname version src; };
|
|
||||||
in
|
|
||||||
pkgs.appimageTools.wrapType2 {
|
|
||||||
inherit pname version src;
|
inherit pname version src;
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||||
@@ -45,25 +45,13 @@
|
|||||||
meta = {
|
meta = {
|
||||||
description = "Chromium-based browser (upstream AppImage)";
|
description = "Chromium-based browser (upstream AppImage)";
|
||||||
homepage = "https://github.com/MultiboxLabs/flow-browser";
|
homepage = "https://github.com/MultiboxLabs/flow-browser";
|
||||||
license = lib.licenses.gpl3Plus;
|
license = pkgs.lib.licenses.gpl3Plus;
|
||||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
sourceProvenance = with pkgs.lib.sourceTypes; [ binaryNativeCode ];
|
||||||
platforms = [ "x86_64-linux" "aarch64-linux" ];
|
platforms = [ "x86_64-linux" "aarch64-linux" ];
|
||||||
mainProgram = pname;
|
mainProgram = pname;
|
||||||
maintainers = [ ];
|
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;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user