From a2143c22ab725c7df783f5c63cc2a2055929f3d1 Mon Sep 17 00:00:00 2001
From: Ivan Bushchik <ivabus@ivabus.dev>
Date: Sat, 9 Dec 2023 20:15:41 +0300
Subject: [PATCH] Rearrange options

Signed-off-by: Ivan Bushchik <ivabus@ivabus.dev>
---
 roles/graphical.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/roles/graphical.nix b/roles/graphical.nix
index e6ed999..8c9231c 100644
--- a/roles/graphical.nix
+++ b/roles/graphical.nix
@@ -98,10 +98,12 @@ in {
       networking.networkmanager.enable = lib.mkForce true;
       networking.networkmanager.wifi.backend = "iwd";
       programs.nm-applet.enable = true;
-      services.xserver.displayManager.sddm.enable = true;
-      services.xserver.enable = true;
-      services.xserver.layout = "us,ru";
-      services.xserver.xkbOptions = "grp:alt_shift_toggle";
+      services.xserver = {
+        displayManager.sddm.enable = true;
+        enable = true;
+        layout = "us,ru";
+        xkbOptions = "grp:alt_shift_toggle";
+      };
     })
     (lib.mkIf (cfg.basic.enable || cfg.enable) {
       services.pipewire = {