Update greeter.nix

flake.lock

@@ -25,11 +25,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1770318660,
+        "lastModified": 1772218752,
-        "narHash": "sha256-yFVde8QZK7Dc0Xa8eQDsmxLX4NJNfL1NKfctSyiQgMY=",
+        "narHash": "sha256-G8nArvOTZXU8DRvrzAdz3Elcj6kA/vMtvY9mrGLATtA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "471e6a065f9efed51488d7c51a9abbd387df91b8",
+        "rev": "f3a30376bb9eb2f6f61816be7d6ed954b6d2a3b9",
         "type": "github"
       },
       "original": {
@@ -45,11 +45,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1771130777,
+        "lastModified": 1771734689,
-        "narHash": "sha256-UIKOwG0D9XVIJfNWg6+gENAvQP+7LO46eO0Jpe+ItJ0=",
+        "narHash": "sha256-/phvMgr1yutyAMjKnZlxkVplzxHiz60i4rc+gKzpwhg=",
         "owner": "Mic92",
         "repo": "nix-index-database",
-        "rev": "efec7aaad8d43f8e5194df46a007456093c40f88",
+        "rev": "8f590b832326ab9699444f3a48240595954a4b10",
         "type": "github"
       },
       "original": {
@@ -60,11 +60,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1769302137,
+        "lastModified": 1771969195,
-        "narHash": "sha256-QEDtctEkOsbx8nlFh4yqPEOtr4tif6KTqWwJ37IM2ds=",
+        "narHash": "sha256-qwcDBtrRvJbrrnv1lf/pREQi8t2hWZxVAyeMo7/E9sw=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "a351494b0e35fd7c0b7a1aae82f0afddf4907aa8",
+        "rev": "41c6b421bdc301b2624486e11905c9af7b8ec68e",
         "type": "github"
       },
       "original": {
@@ -75,11 +75,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1770197578,
+        "lastModified": 1771848320,
-        "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=",
+        "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2",
+        "rev": "2fc6539b481e1d2569f25f8799236694180c0993",
         "type": "github"
       },
       "original": {

system/core/greeter.nix

@@ -1,19 +1,16 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 let
   rosePineHyprcursor = pkgs.callPackage ../../home-manager/hyprland/rose-pine-hyprcursor.nix { };
+  monitorConf = lib.concatMapStrings (m: "monitor = ${m}\n") config.cornflake.greeter.monitors;
   hyprGreetConf = pkgs.writeText "hyprland-greetd.conf" ''
-    monitor = DP-1, 5120x2880@60, 0x0, 2
+    ${monitorConf}
-
-    monitor = DP-2, disable
-    monitor = DP-3, disable
-
     env = HYPRCURSOR_THEME,rose-pine-hyprcursor
     env = HYPRCURSOR_SIZE,24
     env = XCURSOR_SIZE,24
 
     env = XDG_CURRENT_DESKTOP,Hyprland
     env = XDG_SESSION_TYPE,wayland
-    env = XDG_SESSION_DESKTOP,Hyprland"
+    env = XDG_SESSION_DESKTOP,Hyprland
 
     general {
       border_size = 0
@@ -33,39 +30,47 @@ let
   '';
 in
 {
-  services.greetd.enable = true;
+  options.cornflake.greeter.monitors = lib.mkOption {
-  services.greetd.settings.default_session = {
+    type = lib.types.listOf lib.types.str;
-    command = "${pkgs.hyprland}/bin/start-hyprland -- -c ${hyprGreetConf}";
+    default = [ ];
-    user = "greeter";
+    description = "greetd セッション用 Hyprland の monitor 設定";
   };
 
-  environment.systemPackages = [
+  config = {
-    rosePineHyprcursor
+    services.greetd.enable = true;
-  ];
+    services.greetd.settings.default_session = {
+      command = "${pkgs.hyprland}/bin/start-hyprland -- -c ${hyprGreetConf}";
+      user = "greeter";
+    };
 
-  programs.regreet = {
+    environment.systemPackages = [
-    # greetd を Hyprland で動かす
+      rosePineHyprcursor
-    enable = true;
+    ];
-    theme.name = "Adwaita-dark";
+
-    iconTheme.name = "Papirus-Dark";
+    programs.regreet = {
-    cursorTheme.name = "Bibata-Modern-Ice";
+      # greetd を Hyprland で動かす
-    settings = {
+      enable = true;
-      appearance = {
+      theme.name = "Adwaita-dark";
-        greeting_msg = "Welcome back!";
+      iconTheme.name = "Papirus-Dark";
-      };
+      cursorTheme.name = "Bibata-Modern-Ice";
-      widget = {
+      settings = {
-        clock = {
+        appearance = {
-          format = "%H:%M";
+          greeting_msg = "Welcome back!";
-          resolution = "100ms";
+        };
-          timezone = "Asia/Tokyo";
+        widget = {
-          label_width = 150;
+          clock = {
+            format = "%H:%M";
+            resolution = "100ms";
+            timezone = "Asia/Tokyo";
+            label_width = 150;
+          };
+        };
+        GTK = {
+          application_prefer_dark_theme = true;
+        };
+        background = {
+          path = "/usr/share/wallpaper/arknights-image-01.png";
         };
-      };
-      GTK = {
-        application_prefer_dark_theme = true;
-      };
-      background = {
-        path = "/usr/share/wallpaper/arknights-image-01.png";
       };
     };
   };