hosts/nixos-laptop/default.nix

@@ -20,10 +20,8 @@
       webis.enable = true;
       impermanence.enable = true;
     };
-    programs.hyprland = {
+    programs.hyprland.enable = true;
-      enable = true;
+    programs.gitbutler.enable = true;
-      monitors.DP-3.scale = "auto";
-    };
     programs.exercism.enable = true;
   };
 

modules/programs/hyprland/_config.nix

@@ -3,18 +3,10 @@
 , ...
 }:
 
+with lib;
 let
-  inherit (lib) concatStringsSep flip boolToString mapAttrsToList;
   cfg = config.my.programs.hyprland;
 
-  mkMonitor = { name, resolution, position, scale, disabled, extra }:
-    if disabled
-    then "monitor=${name},disabled"
-    else "monitor=${name},${resolution},${position},${scale},${extra}";
-
-  monitorsList = mapAttrsToList (name: value: { name = name; } // value) cfg.monitors;
-  monitors = map mkMonitor monitorsList;
-
   mkRule = rule: windowRegexes: "windowrulev2 = ${rule},${concatStringsSep "," windowRegexes}";
   mkRules = rules: windowRegexes: concatStringsSep "\n" (map (flip mkRule windowRegexes) rules);
 in
@@ -25,7 +17,7 @@ in
   #
 
   # See https://wiki.hyprland.org/Configuring/Monitors/
-  ${concatStringsSep "\n" monitors}
+  ${concatLines (map (x: "monitor=${x}") cfg.monitors)}
 
   # See https://wiki.hyprland.org/Configuring/Keywords/ for more
 

modules/programs/hyprland/default.nix

@@ -5,8 +5,8 @@
 , ...
 } @ args:
 
+with lib;
 let
-  inherit (lib) mkOption mkEnableOption mkIf types getExe genAttrs optionalAttrs optional;
   cfg = config.my.programs.hyprland;
 
   hyprland = inputs.hyprland.packages.${pkgs.system}.default;
@@ -31,38 +31,9 @@ in
       default = [ "de" "us" ];
     };
     monitors = mkOption {
-      type = types.attrsOf (
+      type = types.listOf types.str;
-        let
+      description = "monitor settings";
-          sub = types.submodule {
+      default = [ ",preferred,auto,1" ];
-            options = {
-              resolution = mkOption {
-                type = types.strMatching "\(preferred\)|\([[:digit:]]+x[[:digit:]]+\(@[[:digit:]]+\)\?\)";
-                default = "preferred";
-              };
-              position = mkOption {
-                type = types.strMatching "\(auto\)|\(-\?[[:digit:]]+x-?[[:digit:]]+\)";
-                default = "auto";
-              };
-              disabled = mkEnableOption "disabled";
-              scale = mkOption {
-                type = types.oneOf [ types.float (types.strMatching "auto") ];
-                default = 1.0;
-                apply = x: if lib.isFloat x then lib.strings.floatToString x else x;
-              };
-              extra = mkOption {
-                type = types.listOf types.str;
-                default = [ ];
-                apply = lib.concatStringsSep ",";
-              };
-            };
-          };
-        in
-        sub
-      );
-      description = "monitor setting";
-      default = {
-        "" = { };
-      };
     };
     extraConfig = mkOption {
       type = types.str;
@@ -80,7 +51,6 @@ in
         # foot.enable = true;
         kitty.enable = true;
         rofi.enable = true;
-        hyprland.monitors."" = lib.mkDefault { };
       };
       wallpapers.enable = true;
       services = {