diff --git a/hosts/gwiad/configuration.nix b/hosts/gwiad/configuration.nix
index 721c17a..6a9ff38 100644
--- a/hosts/gwiad/configuration.nix
+++ b/hosts/gwiad/configuration.nix
@@ -29,14 +29,6 @@
     keyMap = "fr";
   };
 
-  # Sway
-  programs.sway = {
-    enable = true;
-  };
-  programs.waybar = {
-    enable = true;
-  };
-
   # Enable CUPS to print documents.
   # services.printing.enable = true;
 
@@ -75,26 +67,18 @@
         ];
       };
     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
diff --git a/hosts/gwiad/sway.nix b/hosts/gwiad/sway.nix
new file mode 100644
index 0000000..aa44ba6
--- /dev/null
+++ b/hosts/gwiad/sway.nix
@@ -0,0 +1,21 @@
+{ 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
+  ];
+}