Nix: HM module: add dots options + convert input fields and labels to type = listOf submodule

nix/hm-module.nix

@@ -5,7 +5,7 @@ self: {
   ...
 }: let
   inherit (builtins) toString;
-  inherit (lib.types) int listOf package str bool submodule;
+  inherit (lib.types) bool float int listOf package str submodule;
   inherit (lib.modules) mkIf;
   inherit (lib.options) mkOption mkEnableOption;
 
@@ -21,37 +21,6 @@ in {
       default = self.packages.${pkgs.stdenv.hostPlatform.system}.hyprlock;
     };
 
-    backgrounds = mkOption {
-      description = "Monitor configurations";
-      default = [
-        {
-          monitor = "";
-          path = "";
-        }
-      ];
-      type = listOf (submodule {
-        options = {
-          monitor = mkOption {
-            description = "The monitor to apply the given wallpaper to";
-            type = str;
-            default = "";
-          };
-
-          path = mkOption {
-            description = "The path to the wallpaper";
-            type = str;
-            default = "echo 'timeout reached'";
-          };
-
-          color = mkOption {
-            description = "Background color";
-            type = str;
-            default = "rgba(25, 20, 20, 1.0)";
-          };
-        };
-      });
-    };
-
     general = {
       disable_loading_bar = mkOption {
         description = "Whether to disable loading bar";
@@ -65,7 +34,38 @@ in {
       };      
     };
 
-    input_field = {
+    backgrounds = mkOption {
+      description = "Background configurations";
+      type = listOf (submodule {
+        options = {
+          monitor = mkOption {
+            description = "The monitor to apply the given wallpaper to";
+            type = str;
+            default = "";
+          };
+
+          path = mkOption {
+            description = "The path to the wallpaper";
+            type = str;
+            default = "echo '/home/me/someImage.png'"; # only png supported for now
+          };
+
+          color = mkOption {
+            description = "Background color";
+            type = str;
+            default = "rgba(25, 20, 20, 1.0)";
+          };
+        };
+      });
+      default = [
+        { }
+      ];
+    };
+
+    input-fields = mkOption {
+      description = "Input field configurations";
+      type = listOf (submodule {
+        options = {
           monitor = mkOption {
             description = "The monitor to place the input field on";
             type = str;
@@ -91,6 +91,18 @@ in {
             default = 3;
           };
 
+          dots_size = mkOption {
+            description = "The size of the dots in the input field (scale of input-field height, 0.2 - 0.8)";
+            type = float;
+            default = 0.33;
+          };
+
+          dots_spacing = mkOption {
+            description = "The spacing between the dots in the input field (scale of dot's absolute size, 0.0 - 1.0)";
+            type = float;
+            default = 0.15;
+          };
+
           outer_color = mkOption {
             description = "The outer color of the input field";
             type = str;
@@ -136,7 +148,7 @@ in {
             y = mkOption {
               description = "Y position of the label";
               type = int;
-          default = 80;
+              default = -20;
             };
           };
 
@@ -152,8 +164,16 @@ in {
             default = "center";
           };
         };
+      });
+      default = [
+        { }
+      ];
+    };
 
-    label = {
+    labels = mkOption {
+      description = "Label configurations";
+      type = listOf (submodule {
+        options = {
           monitor = mkOption {
             description = "The monitor to display the label on";
             type = str;
@@ -210,6 +230,11 @@ in {
             default = "center";
           };
         };
+      });
+      default = [
+        { }
+      ];
+    };
   };
 
   config = mkIf cfg.enable {
@@ -221,34 +246,6 @@ in {
         hide_cursor = ${boolToString cfg.general.hide_cursor}
       }
 
-      label {
-        monitor = ${cfg.label.monitor}
-        text = ${cfg.label.text}
-        color = ${cfg.label.color}
-        font_size = ${toString cfg.label.font_size}
-        font_family = ${cfg.label.font_family}
-
-        position = ${toString cfg.label.position.x}, ${toString cfg.label.position.y}
-        halign = ${cfg.label.halign}
-        valign = ${cfg.label.valign}
-      }
-
-      input-field {
-        monitor = ${cfg.input_field.monitor}
-        size = ${toString cfg.input_field.size.width}, ${toString cfg.input_field.size.height}
-        outline_thickness = ${toString cfg.input_field.outline_thickness}
-        outer_color = ${cfg.input_field.outer_color}
-        inner_color = ${cfg.input_field.inner_color}
-        font_color = ${cfg.input_field.font_color}
-        fade_on_empty = ${boolToString cfg.input_field.fade_on_empty}
-        placeholder-text = ${cfg.input_field.placeholder_text}
-        hide_input = ${boolToString cfg.input_field.hide_input}
-
-        position = ${toString cfg.input_field.position.x}, ${toString cfg.input_field.position.y}
-        halign = ${cfg.input_field.halign}
-        valign = ${cfg.input_field.valign}
-      }
-
       ${builtins.concatStringsSep "\n" (map (background: ''
           background {
             monitor = ${background.monitor}
@@ -257,6 +254,42 @@ in {
           }
         '')
         cfg.backgrounds)}
+
+      ${builtins.concatStringsSep "\n" (map (input-field: ''
+          input-field {
+            monitor = ${input-field.monitor}
+            size = ${toString input-field.size.width}, ${toString input-field.size.height}
+            outline_thickness = ${toString input-field.outline_thickness}
+            dots_size = ${toString input-field.dots_size}
+            dots_spacing = ${toString input-field.dots_spacing}
+            outer_color = ${input-field.outer_color}
+            inner_color = ${input-field.inner_color}
+            font_color = ${input-field.font_color}
+            fade_on_empty = ${boolToString input-field.fade_on_empty}
+            placeholder_text = ${input-field.placeholder_text}
+            hide_input = ${boolToString input-field.hide_input}
+
+            position = ${toString input-field.position.x}, ${toString input-field.position.y}
+            halign = ${input-field.halign}
+            valign = ${input-field.valign}
+          }
+        '')
+        cfg.input-fields)}
+
+      ${builtins.concatStringsSep "\n" (map (label: ''
+          label {
+            monitor = ${label.monitor}
+            text = ${label.text}
+            color = ${label.color}
+            font_size = ${toString label.font_size}
+            font_family = ${label.font_family}
+
+            position = ${toString label.position.x}, ${toString label.position.y}
+            halign = ${label.halign}
+            valign = ${label.valign}
+          }
+        '')
+        cfg.labels)}
     '';
   };
 }