rizin: use xdg.enable and home.preferXdgDirectories
rizin reads configuration from both $HOME/.rizinrc and from $XDG_CONFIG_HOME/rizin/rizinrc and the module now uses the relevant options for choosing between them.
This commit is contained in:
@@ -34,11 +34,19 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
|
||||
config =
|
||||
let
|
||||
configFile =
|
||||
if config.xdg.enable && config.home.preferXdgDirectories then
|
||||
"${config.xdg.configHome}/rizin/rizinrc"
|
||||
else
|
||||
".rizinrc";
|
||||
in
|
||||
lib.mkIf cfg.enable {
|
||||
home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
|
||||
|
||||
xdg.configFile."rizin/rizinrc" = lib.mkIf (cfg.extraConfig != "") {
|
||||
text = cfg.extraConfig;
|
||||
home.file.${configFile} = lib.mkIf (cfg.extraConfig != "") {
|
||||
text = cfg.extraConfig;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -8,6 +8,6 @@
|
||||
};
|
||||
|
||||
nmt.script = ''
|
||||
assertFileExists "home-files/.config/rizin/rizinrc"
|
||||
assertFileExists "home-files/.rizinrc"
|
||||
'';
|
||||
}
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{
|
||||
rizin-basic-configuration = ./basic-configuration.nix;
|
||||
rizin-disabled-configuration = ./disabled-configuration.nix;
|
||||
rizin-prefer-xdg = ./prefer-xdg.nix;
|
||||
}
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
};
|
||||
|
||||
nmt.script = ''
|
||||
assertPathNotExists "home-files/.rizinrc"
|
||||
assertPathNotExists "home-files/.config/rizin/rizinrc"
|
||||
'';
|
||||
}
|
||||
|
||||
@@ -0,0 +1,17 @@
|
||||
{
|
||||
xdg.enable = true;
|
||||
|
||||
home.preferXdgDirectories = true;
|
||||
|
||||
programs.rizin = {
|
||||
enable = true;
|
||||
extraConfig = ''
|
||||
e asm.bytes=true
|
||||
e asm.bytes.space=true
|
||||
'';
|
||||
};
|
||||
|
||||
nmt.script = ''
|
||||
assertFileExists "home-files/.config/rizin/rizinrc"
|
||||
'';
|
||||
}
|
||||
Reference in New Issue
Block a user