4 files changed, 48 insertions, 13 deletions
diff --git a/hosts/common/desktop/xserver.nix b/hosts/common/desktop/xserver.nix
index 6532aaf..1935e06 100644
--- a/hosts/common/desktop/xserver.nix
+++ b/hosts/common/desktop/xserver.nix
@@ -4,20 +4,12 @@
   services.xserver = {
     enable = true;
     layout = "us";
-    xkbOptions = "eurosign:e,ctrl:swapcaps";
     libinput.enable = true;
 
-    desktopManager = {
-      xterm.enable = false;
-    };
-
     displayManager = {
-      lightdm.enable = true;
-      defaultSession = "none+i3";
-    };
-
-    windowManager = {
-      i3.enable = true;
+      gdm.enable = true;
+      gdm.wayland = true;
+      defaultSession = "sway"
     };
   };
 
diff --git a/users/fcuny/desktop/default.nix b/users/fcuny/desktop/default.nix
index 0b9c0a2..65542e8 100644
--- a/users/fcuny/desktop/default.nix
+++ b/users/fcuny/desktop/default.nix
@@ -4,9 +4,7 @@
   imports = [
     ./browser.nix
     ./gtk.nix
-    ./i3.nix
     ./media.nix
-    ./redshift.nix
     ./terminal.nix
     ./trust
     ./xdg.nix
diff --git a/users/fcuny/desktop/sway.nix b/users/fcuny/desktop/sway.nix
new file mode 100644
index 0000000..0f1631e
--- /dev/null
+++ b/users/fcuny/desktop/sway.nix
@@ -0,0 +1,40 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imorts = [
+    ./swayidle.nix
+    ./wofi.nix
+  ]
+
+  home.packages = with pkgs; [
+    pavucontrol
+    wofi
+    wl-clipboard
+    wf-recorder
+  ];
+
+  home.sessionVariables = {
+    MOZ_ENABLE_WAYLAND = true;
+    LIBSEAT_BACKEND = "logind";
+  };
+
+  wayland.windowManager.sway = {
+    enable = true;
+    systemdIntegration = true;
+    wrapperFeatures.gtk = true;
+    config = rec {
+      modifier = "Mod4";
+      terminal = "${config.programs.alacritty.package}/bin/alacritty";
+      menu = "${pkgs.wofi}/bin/wofi -S run";
+    };
+    defaultWorkspace = "workspace number 1";
+    startup = [
+      # Initial lock
+      { command = "${pkgs.swaylock-effects}/bin/swaylock"; }
+      # Start idle daemon
+      { command = "${pkgs.swayidle}/bin/swayidle -w"; }
+      # Start waybar
+      { command = "${pkgs.waybar}/bin/waybar"; }
+    ];
+  };
+}
diff --git a/users/fcuny/desktop/wofi.nix b/users/fcuny/desktop/wofi.nix
new file mode 100644
index 0000000..efdf3fd
--- /dev/null
+++ b/users/fcuny/desktop/wofi.nix
@@ -0,0 +1,5 @@
+{ pkgs, config, ... }: {
+  home.packages = with pkgs; [
+    wofi
+  ];
+}