diff --git a/hosts/gwiad/configuration.nix b/hosts/gwiad/configuration.nix
index 6b24a5b..721c17a 100644
--- a/hosts/gwiad/configuration.nix
+++ b/hosts/gwiad/configuration.nix
@@ -29,6 +29,14 @@
     keyMap = "fr";
   };
 
+  # Sway
+  programs.sway = {
+    enable = true;
+  };
+  programs.waybar = {
+    enable = true;
+  };
+
   # Enable CUPS to print documents.
   # services.printing.enable = true;
 
@@ -67,18 +75,26 @@
         ];
       };
     in [
+      bemenu # slurpshot
+      grim # slurpshot
+      slurp # slurpshot
+      imv # slurpshot
+      alacritty
       chromium
       docker-compose
       hunspell
       hunspellDicts.fr-classique
       inkscape
+      kanshi
       libreoffice-fresh
       my-vscode
       nixfmt
       pass-wayland
+      pulsemixer
       pwgen
       scribus
       tex
+      zathura
 
       # General development
       poetry
@@ -126,9 +142,6 @@
     xkb.layout = "fr";
     displayManager.gdm.enable = true;
     desktopManager.gnome.enable = true;
-    excludePackages = with pkgs; [
-      xterm
-    ];
   };
   environment.gnome.excludePackages = with pkgs; [
     epiphany
diff --git a/hosts/gwiad/sway.nix b/hosts/gwiad/sway.nix
deleted file mode 100644
index aa44ba6..0000000
--- a/hosts/gwiad/sway.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ config, lib, pkgs, inputs, outputs, ... }:
-
-{
-  programs.sway = {
-    enable = true;
-  };
-  programs.waybar = {
-    enable = true;
-  };
-
-  users.users.jhemono.packages = with pkgs; [
-    bemenu # slurpshot
-    grim # slurpshot
-    slurp # slurpshot
-    imv # slurpshot
-    alacritty
-    kanshi
-    pulsemixer
-    zathura
-  ];
-}