Commit 2b5d483381c7

@@ -83,6 +83,7 @@ in
       yubikey.enable = true;
       laptop.enable = true;
     };
+    desktop.wayland.sway.enable = true;
   };
 
   profiles.ssh.enable = true;

@@ -20,11 +20,6 @@ in
     # FIXME Fix tmpOnTmpfs
     systemd.additionalUpstreamSystemUnits = [ "tmp.mount" ];
 
-    # Extra packages to add to the system
-    environment.systemPackages = with pkgs; [
-      xorg.xmessage
-    ];
-
     # Configure some fonts
     fonts = {
       # enableFontDir = true;
@@ -128,18 +123,6 @@ in
         enable = true;
         drivers = [ pkgs.gutenprint ];
       };
-
-      # Enable xserver on desktop
-      xserver = {
-        enable = true;
-        enableTCP = false;
-        libinput.enable = true;
-        synaptics.enable = false;
-        layout = "fr";
-        xkbVariant = "bepo";
-        xkbOptions = "grp:menu_toggle,grp_led:caps,compose:caps";
-      };
-
     };
   };
 }

@@ -2,5 +2,8 @@
   imports = [
     ./base.nix
     ./i3.nix
+    ./sway.nix
+    ./wayland.nix
+    ./xorg.nix
   ];
 }

@@ -2,18 +2,18 @@
 
 with lib;
 let
-  cfg = config.modules.desktop.i3;
+  cfg = config.modules.desktop.xorg.i3;
 in
 {
   options = {
-    modules.desktop.i3 = {
+    modules.desktop.xorg.i3 = {
       enable = mkEnableOption "Enable i3 desktop profile";
     };
   };
 
   config = mkIf cfg.enable {
-    # Enable desktop modules if not already
-    modules.desktop.enable = true;
+    # Enable xorg desktop modules if not already
+    modules.desktop.xorg.enable = true;
     services = {
       blueman.enable = true;
       autorandr.enable = true;

@@ -0,0 +1,14 @@
+{ config, lib, pkgs, ... }:
+let
+  inherit (lib) mkIf mkEnableOption mkDefault;
+  cfg = config.modules.desktop.wayland.sway;
+in
+{
+  options = {
+    modules.desktop.wayland.sway = {
+      enable = mkEnableOption "Enable sway desktop profile";
+    };
+  };
+  config = mkIf cfg.enable = {};
+}
+

@@ -0,0 +1,18 @@
+{ config, lib, pkgs, ... }:
+let
+  inherit (lib) mkIf mkEnableOption mkDefault mkForce;
+  cfg = config.modules.desktop.wayland;
+in
+{
+  options = {
+    modules.desktop.wayland = {
+      enable = mkEnableOption "Enable wayland desktop";
+    };
+  };
+  config = mkIf cfg.enable {
+    # Enable desktop module if not already.
+    modules.desktop.enable = true;
+    # Force disable xorg desktop module
+    modules.desktop.xorg = mkForce false;
+  };
+}

@@ -0,0 +1,33 @@
+{ config, lib, pkgs, ... }:
+let
+  inherit (lib) mkIf mkEnableOption mkDefault;
+  cfg = config.modules.desktop.xorg;
+in
+{
+  options = {
+    modules.desktop.xorg = {
+      enable = mkEnableOption "Enable Xorg desktop";
+    };
+  };
+  config = mkIf cfg.enable {
+    modules.desktop.enable = true;
+    # Extra packages to add to the system
+    environment.systemPackages = with pkgs; [
+      xorg.xmessage
+    ];
+
+    services = {
+      # Enable xserver on desktop
+      xserver = {
+        enable = true;
+        enableTCP = false;
+        libinput.enable = true;
+        synaptics.enable = false;
+        layout = "fr";
+        xkbVariant = "bepo";
+        xkbOptions = "grp:menu_toggle,grp_led:caps,compose:caps";
+      };
+    };
+
+  };
+}