feat(wrapperModules.quickshell): add option to set component's module

Author: ormoyo

wrapperModules/q/quickshell/check.nix

@@ -69,7 +69,10 @@ test { wrapper = "quickshell"; } {
       isShellPresent =
         wrapper: isFile "${wrapper}/${wrapper.passthru.configuration.binName}-config/shell.qml";
       isBarPresent =
-        wrapper: isFile "${wrapper}/${wrapper.passthru.configuration.binName}-config/Bar.qml";
+        wrapper: mod:
+        isFile "${wrapper}/${wrapper.passthru.configuration.binName}-config/${
+          if mod != null then "${mod}/" else ""
+        }Bar.qml";
       isCorrectConfig = wrapper: ''
         logs=$("${wrapper}/bin/quickshell" 2>&1)
         echo "$logs" | grep -q "Launching config: \"${wrapper}/${wrapper.passthru.configuration.binName}-config/shell.qml\""
@@ -85,7 +88,7 @@ test { wrapper = "quickshell"; } {
         in
         [
           (isShellPresent wrapper)
-          (isBarPresent wrapper)
+          (isBarPresent wrapper "")
           (isCorrectConfig wrapper)
         ];
 
@@ -98,7 +101,23 @@ test { wrapper = "quickshell"; } {
         in
         [
           (isShellPresent wrapper)
-          (isBarPresent wrapper)
+          (isBarPresent wrapper "")
+          (isCorrectConfig wrapper)
+        ];
+
+      "wrapper should keep correct hierachy with component modules" =
+        let
+          wrapper = baseWrapper.wrap {
+            configFile = "import qs.foo.boo\n" + shellContent;
+            components.bar = {
+              data = barContent;
+              module = "foo.boo";
+            };
+          };
+        in
+        [
+          (isShellPresent wrapper)
+          (isBarPresent wrapper "foo/boo")
           (isCorrectConfig wrapper)
         ];
     };

wrapperModules/q/quickshell/module.nix

@@ -16,6 +16,20 @@ let
 
   isLinkable = wlib.types.linkable.check;
   makeForce = lib.mkOverride 0;
+
+  componentModule = {
+    options = {
+      data = mkOption {
+        type = types.either wlib.types.linkable types.lines;
+        description = "The component's inlined text or path";
+      };
+      module = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        description = "The component's module, to be imported by `import qs.<module>`";
+      };
+    };
+  };
 in
 {
   imports = [ wlib.modules.default ];
@@ -31,7 +45,7 @@ in
       '';
     };
     components = mkOption {
-      type = types.attrsOf (types.either wlib.types.linkable types.lines);
+      type = types.attrsOf (wlib.types.spec componentModule);
       default = { };
       description = "Quickshell components to include in the configuration";
     };
@@ -62,15 +76,17 @@ in
         firstChar = builtins.substring 0 1 name;
         rest = builtins.substring 1 (-1) name;
         capitalizedName = (lib.toUpper firstChar) + rest;
-        linkable = isLinkable val;
+        linkable = isLinkable val.data;
       in
       {
         name = "${name}Component";
         value = {
-          content = mkIf (!linkable) val;
-          builder = mkIf linkable ''ln -s ${val} "$2"'';
+          content = mkIf (!linkable) val.data;
+          builder = mkIf linkable ''ln -s ${val.data} "$2"'';
           output = makeForce config.generated.output;
-          relPath = makeForce "${config.binName}-config/${capitalizedName}.qml";
+          relPath = makeForce "${config.binName}-config/${
+            if val.module != null then "${lib.replaceString "." "/" val.module}/" else ""
+          }${capitalizedName}.qml";
         };
       }
     ) config.components