feat: use new displays, for automatic automapaper

hosts/lambdaos/home.nix

@@ -27,7 +27,29 @@
   nixpkgs.config.allowUnfree = true;
 
   modules = {
-    hyprland.enable = true;
+    hyprland = {
+      enable = true;
+      displays = [
+        {
+          name = "DP-3";
+          horizontal = 2560;
+          vertical = 1440;
+          horizontal-offset = 2560;
+          vertical-offset = 0;
+          refresh-rate = 360;
+          scale = "1";
+        }
+        {
+          name = "DP-2";
+          horizontal = 2560;
+          vertical = 1440;
+          horizontal-offset = 0;
+          vertical-offset = 0;
+          refresh-rate = 144;
+          scale = "1";
+        }
+      ];
+    };
     games.enable = true;
     apps = {
       enable = true;

hosts/muos/home.nix

@@ -29,7 +29,17 @@
   modules = {
     hyprland = {
       enable = true;
-      displays = [ "eDP-1, 2256x1504@60, 0x0, 1" ];
+      displays = [
+        {
+          name = "eDP-1";
+          horizontal = 2256;
+          vertical = 1504;
+          horizontal-offset = 0;
+          vertical-offset = 0;
+          refresh-rate = 60;
+          scale = "1";
+        }
+      ];
     };
     games.enable = true;
     apps = {

modules/automapaper/default.nix

@@ -6,79 +6,12 @@ in
   options.modules.automapaper = {
     enable = lib.mkEnableOption "enable automapaper";
     hyprland = lib.mkEnableOption "enable hyprland exec-once integration";
-    configurations = lib.mkOption {
+    default-configuration = {
-      description = "automapaper configurations per monitor";
+      init = lib.mkOption
-      type = with lib.types; attrsOf (submodule {
-        options = {
-          init = lib.mkOption {
-            type = str;
-            description = "the shader executed to get the state for the initialisation, and re-initialisation steps";
-          };
-          state = lib.mkOption {
-            type = str;
-            description = "the shader executed to increment the state to the next generation";
-          };
-          display = lib.mkOption {
-            type = str;
-            description = "the shader executed to display the state to the monitor";
-          };
-          horizontal = lib.mkOption {
-            type = int;
-            description = "the amount of horizontal cells in the state";
-          };
-          vertical = lib.mkOption {
-            type = int;
-            description = "the amount of vertical cells in the state";
-          };
-          tps = lib.mkOption {
-            type = int;
-            description = "the target amount of ticks to simulate each second";
-          };
-          cycles = lib.mkOption {
-            type = int;
-            description = "the amount of state increments before the init shader is called again";
-          };
-          frames_per_tick = lib.mkOption {
-            type = int;
-            description = "the amount of times to call the display shader for each iteration of the state shader";
-          };
-        };
-      });
-    };
-  };
-
-  config = lib.mkIf cfg.enable (
-    let
-      displays = lib.attrsets.mapAttrs
-        (displayName: displayConfig:
-          let
-            init = builtins.toFile "init.frag" displayConfig.init;
-            state = builtins.toFile "state.frag" displayConfig.state;
-            display = builtins.toFile "display.frag" displayConfig.display;
-          in
-          ''
-            [display]
-            name="${displayName}"
-            horizontal=${builtins.toString displayConfig.horizontal}
-            vertical=${builtins.toString displayConfig.vertical}
-            tps=${builtins.toString displayConfig.tps}
-            state_frag="${state}"
-            init_frag="${init}"
-            display_frag="${display}"
-            cycles=${builtins.toString displayConfig.cycles}
-            frames_per_tick=${builtins.toString displayConfig.frames_per_tick}
-          ''
-        )
-        cfg.configurations;
-    in
         {
-      modules.automapaper.configurations =
+          type = lib.types.str;
-        let
+          description = "the shader executed to get the state for the initialisation, and re-initialisation steps";
-          conf = {
+          default = ''
-            horizontal = 256;
-            vertical = 144;
-            tps = 30;
-            init = ''
             #version 310 es
             precision highp float;
 
@@ -101,7 +34,11 @@ in
 
             stateColor = vec4(step(0.3, color), 0,0,step(0.3, color));
             }'';
-            state = ''
+        };
+      state = lib.mkOption {
+        type = lib.types.str;
+        description = "the shader executed to increment the state to the next generation";
+        default = ''
             #version 310 es
             precision highp float;
 
@@ -135,11 +72,16 @@ in
             } else {
               stateColor = vec4(0.0, max(current.g - 0.01, 0.0), 0.0, 1.0);
             }
-
           }'';
-            display = ''
+      };
+      display = lib.mkOption {
+        type = lib.types.str;
+        description = "the shader executed to display the state to the monitor";
+        default = ''
           #version 310 es
-              precision highp float;
+          precision
+          highp
+          float;
 
           uniform sampler2D tex2D;
           uniform sampler2D old2D;
@@ -149,8 +91,10 @@ in
           in highp vec2 texCoords;
           out vec4 stateColor;
 
-              const vec4 bgColor = ${nix-colors.lib.conversions.hexToGLSLVec config.colorScheme.palette.base00}; // #26052e
+          const vec4 bgColor = ${nix-colors.lib.conversions.hexToGLSLVec config.colorScheme.palette.base00};
-              const vec4 fgColor = ${nix-colors.lib.conversions.hexToGLSLVec config.colorScheme.palette.base01}; // #950fad
+          // #26052e
+          const vec4 fgColor = ${nix-colors.lib.conversions.hexToGLSLVec config.colorScheme.palette.base01};
+          // #950fad
 
           void main() {
             vec2 canvasSize = vec2 (textureSize (tex2D, 0));
@@ -167,27 +111,79 @@ in
             float brightness = mix (ostate.r, state.r, frame_part) + 0.2 * pow(mix(ostate.g,state.g, frame_part), 3.0);
             stateColor = mix (bgColor, fgColor, brightness * mask);
           } '';
-            cycles = 2500;
+      };
-            frames_per_tick = 1;
+      horizontal = lib.mkOption {
+        type = lib.types.int;
+        default = 10;
+      };
+      vertical = lib.mkOption {
+        type = lib.types.int;
+        default = 10;
+      };
+      tps = lib.mkOption {
+        type = lib.types.int;
+        description = "the target amount of ticks to simulate each second";
+        default = 30;
+      };
+      cycles = lib.mkOption {
+        type = lib.types.int;
+        description = "the amount of state increments before the init shader is called again";
+        default = 2500;
+      };
+      frames_per_tick = lib.mkOption {
+        type = lib.types.int;
+        description = "the amount of times to call the display shader for each iteration of the state shader";
+        default = 1;
+      };
+    };
   };
 
-          displays_raw = config.modules.hyprland.displays;
+  config = lib.mkIf cfg.enable
-          displays = builtins.map (display_raw: builtins.head (lib.strings.splitString "," display_raw)) displays_raw;
+    {
+      wayland.windowManager.hyprland.settings.exec-once =
+        let
+          mkDisplayConfig = conf:
+            let
+              init = builtins.toFile "init.frag" conf.init;
+              state = builtins.toFile "state.frag" conf.state;
+              display = builtins.toFile "display.frag" conf.display;
             in
+            ''
+              [display]
+              name="${conf.name}"
+              horizontal=${builtins.toString conf.horizontal}
+              vertical=${builtins.toString conf.vertical}
+              tps=${builtins.toString conf.tps}
+              state_frag="${state}"
+              init_frag="${init}"
+              display_frag="${display}"
+              cycles=${builtins.toString conf.cycles}
+              frames_per_tick=${builtins.toString conf.frames_per_tick}
+            '';
+          confFile =
+            let
+              def = config.modules.automapaper.default-configuration;
+            in
+            conf: builtins.toFile "${conf.name}.toml" (mkDisplayConfig {
+              name = conf.name;
+              horizontal = builtins.div conf.horizontal def.horizontal;
+              vertical = builtins.div conf.vertical def.vertical;
+              tps = def.tps;
+              state = def.state;
+              init = def.init;
+              display = def.display;
+              cycles = def.cycles;
+              frames_per_tick = def.frames_per_tick;
+            });
+        in
+        lib.mkIf cfg.hyprland (
+          builtins.map
+            (
+              conf:
+              "${inputs.automapaper.packages.${pkgs.system}.default}/bin/automapaper -c ${confFile conf}"
+            )
+            config.modules.hyprland.displays
+        );
+    };
+}
 
-        builtins.listToAttrs
-          (builtins.map
-            (disp: {
-              name = disp;
-              value = conf;
-            })
-            displays);
-      wayland.windowManager.hyprland.settings.exec-once = lib.mkIf cfg.hyprland (
-        lib.mapAttrsToList
-          (name: config:
-            "${inputs.automapaper.packages.${pkgs.system}.default}/bin/automapaper -C ${builtins.toFile "${name}.toml" config}")
-          displays
-      );
-    }
-  );
-}

modules/hyprland.nix

@@ -23,12 +23,48 @@ in
       default = pkgs.xdg-desktop-portal-hyprland;
     };
     displays = lib.mkOption {
-      type = lib.types.listOf lib.types.str;
+      type = lib.types.listOf
-      default = [
+        (lib.types.submodule {
-        "DP-3,2560x1440@360,2560x0,1"
+          options = {
-        "DP-2,2560x1440@144,0x0,1"
+            name = lib.mkOption
-        "Unknown-1,disable" # NOTE: still borked on 04-06-2024
+              {
-      ];
+                type = lib.types.str;
+                description = "the display identifier";
+                example = "DP-2";
+              };
+            horizontal = lib.mkOption {
+              type = lib.types.ints.positive;
+              description = "the horizontal resolution";
+              example = 1920;
+            };
+            vertical = lib.mkOption {
+              type = lib.types.ints.positive;
+              description = "the vertical resolution";
+              example = 1080;
+            };
+            horizontal-offset = lib.mkOption {
+              type = lib.types.ints.unsigned;
+              description = "the horizontal resolution";
+              example = 1920;
+            };
+            vertical-offset = lib.mkOption {
+              type = lib.types.ints.unsigned;
+              description = "the vertical resolution";
+              example = 0;
+            };
+            refresh-rate = lib.mkOption {
+              type = lib.types.ints.unsigned;
+              description = "the refresh rate of the monitor";
+              example = 60;
+            };
+            scale = lib.mkOption {
+              type = lib.types.str;
+              description = "the scale of the monitor";
+              default = "1";
+              example = "1.5";
+            };
+          };
+        });
       description = "the display layout to use";
     };
   };
@@ -89,8 +125,12 @@ in
     wayland.windowManager.hyprland = {
       enable = true;
       package = cfg.package;
-      settings = {
+      settings =
-        monitor = cfg.displays;
+        let
+          make-display-string = display: "${display.name}, ${builtins.toString display.horizontal}x${builtins.toString display.vertical}@${builtins.toString display.refresh-rate}, ${builtins.toString display.horizontal-offset}x${builtins.toString display.vertical-offset}, ${display.scale}";
+        in
+        {
+          monitor = builtins.map make-display-string cfg.displays;
           windowrulev2 = [
             "opacity 1.0 0.6,class:^(kitty)$"
             "stayfocused,class:^(wofi)$"

modules/waybar/default.nix

@@ -42,10 +42,6 @@ in
   ];
 
   config =
-    let
-      displays_raw = config.modules.hyprland.displays;
-      displays = builtins.map (display_raw: builtins.head (lib.strings.splitString "," display_raw)) displays_raw;
-    in
     lib.mkIf cfg.enable
       {
         modules.waybar.enabled = (
@@ -75,7 +71,7 @@ in
               margin-top = 8;
               margin-left = 10;
               margin-right = 10;
-              output = displays;
+              output = builtins.map (display: display.name) config.modules.hyprland.displays;
               modules-left = cfg.modules.left;
               modules-center = cfg.modules.center;
               modules-right = cfg.modules.right;