diff --git a/common-gui.nix b/common-gui.nix
index 3ab4dcc..cb53b1e 100644
--- a/common-gui.nix
+++ b/common-gui.nix
@@ -36,6 +36,8 @@
       noto-fonts-cjk
 
       cantarell_fonts # from gnome3 module
+
+      font-awesome_5
     ];
   };
 
diff --git a/petalius.nix b/petalius.nix
index 9858dc9..01126a0 100644
--- a/petalius.nix
+++ b/petalius.nix
@@ -4,7 +4,7 @@
   imports =
     [
       ./common-headless.nix
-      ./i3.nix
+      ./sway.nix
       ./large-sw.nix
       ./uefi.nix
       ./fstrim.nix
diff --git a/pulseaudio.nix b/pulseaudio.nix
index b349135..3978dad 100644
--- a/pulseaudio.nix
+++ b/pulseaudio.nix
@@ -16,4 +16,6 @@
     extraModules = [ pkgs.pulseaudio-modules-bt ];
   };
 
+  nixpkgs.config.pulseaudio = true;
+
 }
diff --git a/sway.nix b/sway.nix
index b91abc9..45db988 100644
--- a/sway.nix
+++ b/sway.nix
@@ -7,6 +7,7 @@
 
   environment.systemPackages = with pkgs; with gnome3; [
     i3status
+    waybar
     wofi
     ydotool
     feh