diff --git a/modules/home/profiles/gui/default.nix b/modules/home/profiles/gui/default.nix
index 6fb06e0c..a3b6cdea 100644
--- a/modules/home/profiles/gui/default.nix
+++ b/modules/home/profiles/gui/default.nix
@@ -23,6 +23,7 @@ in
         ghostty.enable = mkDefault true;
         kitty.enable = mkDefault false;
         obs.enable = mkDefault true;
+        onagre.enable = mkDefault true;
         vscodium.enable = mkDefault false;
         wlogout.enable = mkDefault true;
         zed-editor.enable = mkDefault true;
@@ -48,7 +49,6 @@ in
       pwvucontrol
       satty
       slurp
-      sway-launcher-desktop
       ueberzug
       (olympus.overrideAttrs (_: {
         celesteWrapper = osConfig.programs.steam.package.run;
diff --git a/modules/home/programs/onagre/default.nix b/modules/home/programs/onagre/default.nix
new file mode 100644
index 00000000..79ae5466
--- /dev/null
+++ b/modules/home/programs/onagre/default.nix
@@ -0,0 +1,13 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.py.programs.onagre;
+in
+{
+  options.py.programs.onagre.enable = lib.mkEnableOption "onagre";
+  config.home.packages = lib.mkIf cfg.enable [ pkgs.onagre ];
+}
diff --git a/modules/home/programs/zed-editor/default.nix b/modules/home/programs/zed-editor/default.nix
index d07bedb3..8c286dc2 100644
--- a/modules/home/programs/zed-editor/default.nix
+++ b/modules/home/programs/zed-editor/default.nix
@@ -15,6 +15,7 @@ in
       pkgs.zlib
       pkgs.openssl
       pkgs.openssh-patched
+      pkgs.kdePackages.qtdeclarative
     ]);
     userSettings = import ./settings.nix;
     extensions = [
diff --git a/modules/home/wayland/sway.nix b/modules/home/wayland/sway.nix
index 8853075a..d87e8e5a 100644
--- a/modules/home/wayland/sway.nix
+++ b/modules/home/wayland/sway.nix
@@ -37,7 +37,7 @@ in
       };
       config = {
         terminal = lib.getExe pkgs.ghostty;
-        menu = "exec ${term} --class=py.floating --window-height=20 --window-width=12 --font-size=14 -e ${pkgs.sway-launcher-desktop}/bin/sway-launcher-desktop";
+        menu = "exec ${lib.getExe pkgs.onagre}";
         modifier = "Mod4";
         bars = [ { command = "true"; } ];
         focus = {
@@ -46,7 +46,7 @@ in
           newWindow = "smart";
         };
         fonts = {
-          names = [ "IBM Plex Sans" ];
+          names = [ "Inter" ];
           style = "Regular";
           size = 12.0;
         };
@@ -87,9 +87,6 @@ in
           eDP-1 = {
             scale = "1.2";
           };
-          "*" = {
-            bg = "${homeDir}/bgs/xenia-hangout-mocha.png fill";
-          };
         };
         startup = [
           { command = "${pkgs.dex}/bin/dex -a"; }
diff --git a/packages/olympus/default.nix b/packages/olympus/default.nix
deleted file mode 100644
index fb5086d1..00000000
--- a/packages/olympus/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ pkgs }:
-let
-  olympus = pkgs.stdenv.mkDerivation rec {
-    pname = "olympus";
-    version = "4238";
-
-    # https://everestapi.github.io/
-    src = pkgs.fetchzip {
-      url = "https://dev.azure.com/EverestAPI/Olympus/_apis/build/builds/${version}/artifacts?artifactName=linux.main&$format=zip#linux.main.zip";
-      hash = "sha256-KWDr4KsF23iDWA9h/r+cnpDIKKwCVVOfuh6sjvXSnII=";
-    };
-
-    buildInputs = [ pkgs.unzip ];
-    installPhase = ''
-      mkdir -p "$out/opt/olympus/"
-      mv dist.zip "$out/opt/olympus/" && cd "$out/opt/olympus/"
-
-      unzip dist.zip && rm dist.zip
-      mkdir $out && echo XDG_DATA_HOME=$out
-
-      echo y | XDG_DATA_HOME="$out/share/" bash install.sh
-      sed -i "/ldconfig/d" ./love
-      sed -i "s/Exec=.*/Exec=olympus %u/g" ../../share/applications/Olympus.desktop
-    '';
-  };
-in
-pkgs.buildFHSEnv {
-  name = "olympus";
-  runScript = "${olympus}/opt/olympus/olympus";
-  targetPkgs = pkgs: [
-    pkgs.freetype
-    pkgs.zlib
-    pkgs.SDL2
-    pkgs.curl
-    pkgs.libpulseaudio
-    pkgs.gtk3
-    pkgs.glib
-    pkgs.libGL
-    pkgs.libdrm
-  ];
-
-  # https://github.com/EverestAPI/Olympus/blob/main/lib-linux/olympus.desktop
-  # https://stackoverflow.com/questions/8822097/how-to-replace-a-whole-line-with-sed
-  extraInstallCommands = ''cp -r "${olympus}/share/" $out'';
-}
diff --git a/packages/rsrpc/default.nix b/packages/rsrpc/default.nix
deleted file mode 100644
index c8d1d224..00000000
--- a/packages/rsrpc/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  rustPlatform,
-  openssl,
-  pkg-config,
-}:
-
-rustPlatform.buildRustPackage (finalAttrs: {
-  pname = "rsrpc";
-  version = "0.24.2";
-
-  src = fetchFromGitHub {
-    owner = "SpikeHD";
-    repo = "rsRPC";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-Epf84YY7wkQjBbM09NbCSLiVreIgc/OA2g8tN8OmwXQ=";
-  };
-
-  cargoHash = "sha256-fTDAs88GE+ZoaCSJwCAUolTHpigDbkqNVMlbZOO5v1o=";
-
-  nativeBuildInputs = [
-    pkg-config
-  ];
-
-  buildInputs = [
-    openssl
-  ];
-
-  meta = {
-    changelog = "https://github.com/SpikeHD/rsRPC/releases/tag/v${finalAttrs.version}";
-    description = "Rust implementation of the Discord RPC server";
-    homepage = "https://github.com/SpikeHD/rsRPC";
-    license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.pyrox0 ];
-    mainProgram = "rsrpc-cli";
-  };
-})