diff --git a/modules/programs/rofi.nix b/modules/programs/rofi.nix index 8167c8af3..042b0b211 100644 --- a/modules/programs/rofi.nix +++ b/modules/programs/rofi.nix @@ -117,23 +117,27 @@ let else abort "Unhandled value type ${builtins.typeOf value}"; - mkKeyValue = name: value: "${name}: ${mkValueString value};"; + mkKeyValue = { sep ? ": ", end ? ";" }: + name: value: + "${name}${sep}${mkValueString value}${end}"; - mkRasiSection = section: config: - let - toRasiKeyValue = generators.toKeyValue { inherit mkKeyValue; }; - # Remove null values so the resulting config does not have empty lines - configStr = toRasiKeyValue (filterAttrs (_: v: v != null) config); - in '' - ${section} { - ${configStr}} - ''; + mkRasiSection = name: value: + if isAttrs value then + let + toRasiKeyValue = generators.toKeyValue { mkKeyValue = mkKeyValue { }; }; + # Remove null values so the resulting config does not have empty lines + configStr = toRasiKeyValue (filterAttrs (_: v: v != null) value); + in '' + ${name} { + ${configStr}} + '' + else + mkKeyValue { + sep = " "; + end = ""; + } name value; - toRasi = attrsOfAttrs: - let - mkSection = mkRasiSection; - sections = mapAttrsToList mkSection attrsOfAttrs; - in concatStringsSep "\n" sections; + toRasi = attrs: concatStringsSep "\n" (mapAttrsToList mkRasiSection attrs); locationsMap = { center = 0; @@ -149,7 +153,9 @@ let primitive = with types; (oneOf [ str int bool rasiLiteral ]); - configType = with types; attrsOf (either primitive (listOf primitive)); + # Either a `section { foo: "bar"; }` or a `@import/@theme "some-text"` + configType = with types; + (either (attrsOf (either primitive (listOf primitive))) str); rasiLiteral = types.submodule { options = { diff --git a/tests/modules/programs/rofi/custom-theme.nix b/tests/modules/programs/rofi/custom-theme.nix index c787242d8..2d318a4e4 100644 --- a/tests/modules/programs/rofi/custom-theme.nix +++ b/tests/modules/programs/rofi/custom-theme.nix @@ -9,6 +9,8 @@ with lib; theme = let inherit (config.lib.formats.rasi) mkLiteral; in { + "@import" = "~/.cache/wal/colors-rofi-dark"; + "*" = { background-color = mkLiteral "#000000"; foreground-color = mkLiteral "rgba ( 250, 251, 252, 100 % )"; diff --git a/tests/modules/programs/rofi/custom-theme.rasi b/tests/modules/programs/rofi/custom-theme.rasi index bf9bb9cc6..b018843fe 100644 --- a/tests/modules/programs/rofi/custom-theme.rasi +++ b/tests/modules/programs/rofi/custom-theme.rasi @@ -15,3 +15,5 @@ border-color: #FFFFFF; foreground-color: rgba ( 250, 251, 252, 100 % ); width: 512; } + +@import "~/.cache/wal/colors-rofi-dark" \ No newline at end of file