nix/2.home-manager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

ashell: support yaml and toml config

Browse source 
Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
This commit is contained in:
Austin Horstman 2025-06-29 17:17:51 -05:00
parent f62e9a8114
commit 650a38ebe8
11 changed files with 226 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

29
modules/programs/ashell.nix
View file

@ -6,7 +6,23 @@
}:
let
cfg = config.programs.ashell;
settingsFormat = pkgs.formats.toml { };
tomlFormat = pkgs.formats.toml { };
yamlFormat = pkgs.formats.yaml { };
packageVersion = if cfg.package != null then lib.getVersion cfg.package else "0.5.0";
isTomlConfig = lib.versionAtLeast packageVersion "0.5.0";
settingsFormat = if isTomlConfig then tomlFormat else yamlFormat;
configFileName = if isTomlConfig then "ashell/config.toml" else "ashell.yml";
# Create migration function for camelCase to snake_case conversion
migrateSettings = lib.hm.deprecations.remapAttrsRecursive {
pred = lib.hm.strings.isCamelCase;
transform = lib.hm.strings.toSnakeCase;
};
# Apply migration only for TOML config (ashell >= 0.5.0)
processedSettings =
if isTomlConfig then migrateSettings "programs.ashell.settings" cfg.settings else cfg.settings;
in
{
meta.maintainers = [ lib.maintainers.justdeeevin ];
@ -17,7 +33,7 @@ in
package = lib.mkPackageOption pkgs "ashell" { nullable = true; };
settings = lib.mkOption {
type = settingsFormat.type;
inherit (settingsFormat) type;
default = { };
example = {
modules = {
@ -35,9 +51,10 @@ in
workspaces.visibilityMode = "MonitorSpecific";
};
description = ''
Ashell configuration written to {file}`$XDG_CONFIG_HOME/ashell/config.toml`.
Ashell configuration written to {file}`$XDG_CONFIG_HOME/ashell/config.toml` (0.5.0+)
or {file}`$XDG_CONFIG_HOME/ashell/config.yaml` (<0.5.0).
For available settings see
<https://github.com/MalpenZibo/ashell/tree/0.5.0?tab=readme-ov-file#configuration>.
<https://github.com/MalpenZibo/ashell?tab=readme-ov-file#configuration>.
'';
};
@ -69,8 +86,8 @@ in
];
home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
xdg.configFile."ashell/config.toml" = lib.mkIf (cfg.settings != { }) {
source = settingsFormat.generate "ashell-config" cfg.settings;
xdg.configFile."${configFileName}" = lib.mkIf (cfg.settings != { }) {
source = settingsFormat.generate "ashell-config" processedSettings;
};
}
(lib.mkIf cfg.systemd.enable {