refactor

modules/system/sysd/session/dbus/default.nix

@@ -0,0 +1,21 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  cfg = config.system.sysd.session.dbus;
+in {
+  options = {
+    system.sysd.session.dbus.enable = mkEnableOption "Enables dbus";
+  };
+  config = mkIf cfg.enable {
+    services.dbus = {
+      enable = true;
+      packages = with pkgs; [
+        gcr
+      ];
+    };
+  };
+}

modules/system/sysd/session/dconf/default.nix

@@ -0,0 +1,15 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  cfg = config.system.sysd.session.dconf;
+in {
+  options = {
+    system.sysd.session.dconf.enable = mkEnableOption "Enables dconf";
+  };
+  config = mkIf cfg.enable {
+    programs.dconf.enable = true;
+  };
+}

modules/system/sysd/session/xserver/default.nix

@@ -0,0 +1,29 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib) mkOption types;
+  cfg = config.system.sysd.session.xserver;
+in {
+  options = {
+    system.sysd.session.xserver = {
+      videoDrivers = mkOption {
+        type = types.listOf (types.enum ["amdgpu" "nvidia"]);
+        default = ["amdgpu"];
+        description = "The names of the video drivers the configuration supports";
+      };
+      xkbLayout = mkOption {
+        type = types.str;
+        default = "se";
+        description = "X keyboard layout, or multiple keyboard layouts separated by commas.";
+      };
+    };
+  };
+  config = {
+    services.xserver = {
+      videoDrivers = cfg.videoDrivers;
+      xkb.layout = cfg.xkbLayout;
+    };
+  };
+}