diff --git a/modules/programs/rizin.nix b/modules/programs/rizin.nix index 0f0afe94..b9be4c96 100644 --- a/modules/programs/rizin.nix +++ b/modules/programs/rizin.nix @@ -6,7 +6,6 @@ }: let cfg = config.programs.rizin; - eValueType = with lib.types; either str (either int (either bool float)); in { meta.maintainers = [ @@ -20,7 +19,7 @@ in package = lib.mkPackageOption pkgs "rizin" { nullable = true; }; settings = lib.mkOption { - type = lib.types.attrsOf eValueType; + type = with lib.types; attrsOf (either str (either int (either bool float))); default = { }; example = { "asm.bytes" = true; @@ -53,11 +52,7 @@ in config = let - configFile = - if config.xdg.enable && config.home.preferXdgDirectories then - "${config.xdg.configHome}/rizin/rizinrc" - else - ".rizinrc"; + configFile = if config.xdg.enable then "${config.xdg.configHome}/rizin/rizinrc" else ".rizinrc"; configContent = '' # settings ${lib.concatStringsSep "\n" (lib.mapAttrsToList (k: v: "e ${k}=${lib.toString v}") cfg.settings)} diff --git a/tests/modules/programs/rizin/basic-configuration.nix b/tests/modules/programs/rizin/basic-configuration.nix index 80d0a8e8..ca740885 100644 --- a/tests/modules/programs/rizin/basic-configuration.nix +++ b/tests/modules/programs/rizin/basic-configuration.nix @@ -8,6 +8,6 @@ }; nmt.script = '' - assertFileExists "home-files/.rizinrc" + assertFileExists "home-files/.config/rizin/rizinrc" ''; } diff --git a/tests/modules/programs/rizin/default.nix b/tests/modules/programs/rizin/default.nix index 4a85e069..a1b9ae9e 100644 --- a/tests/modules/programs/rizin/default.nix +++ b/tests/modules/programs/rizin/default.nix @@ -1,6 +1,6 @@ { rizin-basic-configuration = ./basic-configuration.nix; rizin-disabled-configuration = ./disabled-configuration.nix; - rizin-prefer-xdg = ./prefer-xdg.nix; + rizin-xdg-disabled = ./xdg-disabled.nix; rizin-settings-configuration = ./settings-configuration.nix; } diff --git a/tests/modules/programs/rizin/settings-configuration.nix b/tests/modules/programs/rizin/settings-configuration.nix index 9829bfea..ba1df109 100644 --- a/tests/modules/programs/rizin/settings-configuration.nix +++ b/tests/modules/programs/rizin/settings-configuration.nix @@ -8,6 +8,6 @@ }; nmt.script = '' - assertFileExists "home-files/.rizinrc" + assertFileExists "home-files/.config/rizin/rizinrc" ''; } diff --git a/tests/modules/programs/rizin/prefer-xdg.nix b/tests/modules/programs/rizin/xdg-disabled.nix similarity index 57% rename from tests/modules/programs/rizin/prefer-xdg.nix rename to tests/modules/programs/rizin/xdg-disabled.nix index bde44a31..dc2e1c23 100644 --- a/tests/modules/programs/rizin/prefer-xdg.nix +++ b/tests/modules/programs/rizin/xdg-disabled.nix @@ -1,7 +1,5 @@ { - xdg.enable = true; - - home.preferXdgDirectories = true; + xdg.enable = false; programs.rizin = { enable = true; @@ -12,6 +10,6 @@ }; nmt.script = '' - assertFileExists "home-files/.config/rizin/rizinrc" + assertFileExists "home-files/.rizinrc" ''; }