diff --git a/home-manager/modules/emulators.nix b/home-manager/modules/emulators.nix
index 816e321..6e32556 100644
--- a/home-manager/modules/emulators.nix
+++ b/home-manager/modules/emulators.nix
@@ -1,15 +1,27 @@
-{pkgs, ...}: {
+{pkgs, ...}: let
+  rpcs3_latest = pkgs.rpcs3.overrideAttrs (oldAttrs: {
+    src = builtins.fetchGit {
+      url = "https://github.com/RPCS3/rpcs3.git";
+      ref = "master";
+    };
+  });
+in {
   home.packages = with pkgs; [
     mgba
     desmume
     duckstation
     pcsx2
-    rpcs3
     ryujinx
     mupen64plus
     dolphin-emu
     retroarch
     mednafen
     joycond
+    (
+      if (builtins.tryEval rpcs3_latest).success
+      then rpcs3_latest
+      else rpcs3
+    )
+    # uses latest commit, but in case of errors (if there were any in the first place) to fallback to snapshot nix package in case it failed (even if not)
   ];
 }
diff --git a/hosts/local-packages.nix b/hosts/local-packages.nix
index a3f20dc..a4f0fe3 100644
--- a/hosts/local-packages.nix
+++ b/hosts/local-packages.nix
@@ -16,6 +16,7 @@ in {
   environment.systemPackages = with pkgs; [
     brave # TODO: make a module to save browser stuff
     vesktop
+    discord
     obs-studio
     spotify
     flameshot