diff --git a/config/desktop.nix b/config/desktop.nix
index 7907de9a..91b52ffa 100644
--- a/config/desktop.nix
+++ b/config/desktop.nix
@@ -10,7 +10,7 @@ let
 in
 {
   imports = [
-    ./services/kde.nix
+    ./services/sway.nix
     ./services/pipewire.nix
     ./desktop-secrets.nix
     ./services/cups.nix
diff --git a/config/home-manager/darkkirb.nix b/config/home-manager/darkkirb.nix
index 5086a1cd..f31dbe44 100644
--- a/config/home-manager/darkkirb.nix
+++ b/config/home-manager/darkkirb.nix
@@ -5,9 +5,10 @@
     ../programs/git.nix
     ../programs/direnv.nix
   ] ++ (if desktop then [
-    ../programs/kde.nix
+    ../programs/sway.nix
     ../programs/firefox.nix
     ../programs/theming.nix
+    ../programs/waybar.nix
     ../programs/ims.nix
     ../programs/syncthing.nix
     ../programs/zoom.nix
diff --git a/config/programs/sway.nix b/config/programs/sway.nix
index b5d8d0ab..f930b166 100644
--- a/config/programs/sway.nix
+++ b/config/programs/sway.nix
@@ -115,5 +115,5 @@ in
     wrapperFeatures.gtk = true;
   };
 
-  home.file.".XCompose".source = ../../extra/.XCompose;
+  #home.file.".XCompose".source = ../../extra/.XCompose;
 }
diff --git a/packages/moa.nix b/packages/moa.nix
new file mode 100644
index 00000000..d70e2502
--- /dev/null
+++ b/packages/moa.nix
@@ -0,0 +1,6 @@
+{ fetchFromGitLab }: fetchFromGitLab {
+  owner = "fedstoa";
+  repo = "moa";
+  rev = "8c794b2cb854c1b25570fbb3082e83a9a088c773";
+  sha256 = "sha256-VhX0NsELBrG88qWT3XREQFQqZ5526mXiN5xIB8gRryM=";
+}