diff --git a/nix/configuration/configuration.nix b/nix/configuration/configuration.nix
index 8d0e68d..5b892d5 100644
--- a/nix/configuration/configuration.nix
+++ b/nix/configuration/configuration.nix
@@ -36,6 +36,7 @@
     ./roles/waybar
     ./roles/qemu
     ./roles/wireguard
+    ./roles/bsnes
   ];
 
   nix.settings.experimental-features = [
diff --git a/nix/configuration/network.nix b/nix/configuration/network.nix
index 21dc2a8..6ea9589 100644
--- a/nix/configuration/network.nix
+++ b/nix/configuration/network.nix
@@ -25,7 +25,14 @@
   # Without this, systemd-resolved will send DNS requests for <X>.home.arpa to the per-link DNS server (172.16.0.1) which does not support DNS-over-TLS. This leads to the connection anging and timing out. This causes firefox startup to take an extra 10+ seconds.
   #
   # Test with: drill @127.0.0.53 odo.home.arpa
-  networking.extraHosts = "127.0.0.1 odo.home.arpa";
+  networking.extraHosts = ''
+    127.0.0.1 odo.home.arpa
+    10.216.1.1		homeserver
+    10.216.1.6		media
+    10.216.1.12		odo
+    10.217.1.1		drmario
+    10.217.2.1		mrmanager
+  '';
 
   networking.wireless.iwd = {
     enable = true;
diff --git a/nix/configuration/roles/bsnes/default.nix b/nix/configuration/roles/bsnes/default.nix
new file mode 100644
index 0000000..dcc6cd6
--- /dev/null
+++ b/nix/configuration/roles/bsnes/default.nix
@@ -0,0 +1,14 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+{
+  imports = [ ];
+
+  environment.systemPackages = with pkgs; [
+    bsnes-hd
+  ];
+}
diff --git a/nix/configuration/roles/gpg/default.nix b/nix/configuration/roles/gpg/default.nix
index 515deae..80fcc25 100644
--- a/nix/configuration/roles/gpg/default.nix
+++ b/nix/configuration/roles/gpg/default.nix
@@ -2,6 +2,7 @@
   config,
   lib,
   pkgs,
+  pkgs-unstable,
   ...
 }:
 
@@ -88,4 +89,11 @@
     pcsctools
   ];
 
+  nixpkgs.overlays = [
+    (final: prev: {
+      gnupg = pkgs-unstable.gnupg;
+      scdaemon = pkgs-unstable.scdaemon;
+    })
+  ];
+
 }