diff --git a/hosts/modules/apps/rider.nix b/hosts/modules/apps/rider.nix
index cf54c66..94ac874 100644
--- a/hosts/modules/apps/rider.nix
+++ b/hosts/modules/apps/rider.nix
@@ -3,39 +3,22 @@
   pkgs-unstable,
   ...
 }: {
-  nixpkgs.overlays = [
-    (self: super: {
-      # rider-override = super.jetbrains.rider.overrideAttrs (
-      #   final: prev: {
-      #     # XXX: DEBUG
-      #     buildInputs = prev.buildInputs ++ [pkgs.icu];
-      #   }
-      # );
+  environment.systemPackages = with pkgs; [
+    # Ensure latest stable Rider version (not necessarily stable on NixOS)
+    pkgs-unstable.jetbrains.rider
 
-      # rider-fhs = super.buildFHSEnv {
-      #   name = "rider-fhs";
+    # .NET
+    dotnetCorePackages.dotnet_9.sdk
+    dotnetCorePackages.dotnet_9.aspnetcore
+    dotnetCorePackages.dotnet_9.runtime
 
-      #   targetPkgs = pkgs:
-      #     with pkgs; [
-      #       jetbrains.rider
-      #       icu
-      #     ];
+    # Mono
+    mono
+    msbuild
 
-      #   runScript = ''${super.jetbrains.rider}/bin/rider'';
-
-      #   profile = ''
-      #     export DOTNET_CLI_TELEMETRY_OPTOUT=1
-      #   '';
-      # };
-    })
-  ];
-
-  environment.systemPackages = [
-    # rider-fhs
-    # rider-override
-
-    # Unsure latest "stable" version
-    # pkgs-unstable.jetbrains.rider
+    # .NET Framework Tools/Services
+    omnisharp-roslyn
+    netcoredbg
   ];
 
   programs.nix-ld = {
diff --git a/hosts/myputer/default.nix b/hosts/myputer/default.nix
index 753899f..7121aeb 100755
--- a/hosts/myputer/default.nix
+++ b/hosts/myputer/default.nix
@@ -330,14 +330,6 @@ in {
     # Sage
     sageWithDoc # SageMath + HTML Documentation
 
-    # .NET
-    dotnetCorePackages.dotnet_9.sdk
-    dotnetCorePackages.dotnet_9.aspnetcore
-    dotnetCorePackages.dotnet_9.runtime
-    mono
-    omnisharp-roslyn
-    netcoredbg
-
     openvpn
     inetutils