diff --git a/system/configuration.nix b/system/configuration.nix
index 21b9894..a04c9dd 100644
--- a/system/configuration.nix
+++ b/system/configuration.nix
@@ -142,6 +142,7 @@
     description = "Emmet";
     extraGroups = [ "networkmanager" "wheel" ];
     packages = with pkgs; [];
+    uid = 1000;
   };
 
   # Allow unfree packages
@@ -178,6 +179,7 @@
     font-awesome
     ubuntu_font_family
     terminus_font
+    gamemode
   ];
 
 
@@ -211,6 +213,9 @@
   # OpenGL
   hardware.opengl.enable = true;
 
+  # Feral GameMode
+  programs.gamemode.enable = true;
+
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave
diff --git a/user/app/games/games.nix b/user/app/games/games.nix
index e99c915..4bc2eff 100644
--- a/user/app/games/games.nix
+++ b/user/app/games/games.nix
@@ -1,21 +1,32 @@
-{ config, pkgs, ... }:
-
-{
-  home.packages = with pkgs; [
-    # Games
-    #TODO need flatpak steam
-    gamehub
-    (retroarch.override {
-      cores = with libretro; [
+{ config, pkgs, lib, ... }:
+let
+  myRetroarch =
+    (pkgs.retroarch.override {
+      cores = with pkgs.libretro; [
         mgba
         desmume
         dolphin
         citra
         genesis-plus-gx
       ];
-    })
+    });
+in
+{
+  home.packages = with pkgs; [
+    # Games
+    #TODO need flatpak steam
+    gamehub
+    myRetroarch
     airshipper
     qjoypad
     # TODO need flatpak minecraft
   ];
+  # The following 2 declarations allow retroarch to be imported into gamehub
+  # Set retroarch core directory to ~/.local/bin/libretro
+  # and retroarch core info directory to ~/.local/share/libretro/info
+  home.file.".local/bin/libretro".source = "${myRetroarch}/lib/retroarch/cores";
+  home.file.".local/share/libretro/info".source = fetchTarball {
+    url = "https://github.com/libretro/libretro-core-info/archive/refs/tags/v1.15.0.tar.gz";
+    sha256 = "004kgbsgbk7hn1v01jg3vj4b6dfb2cp3kcp5hgjyl030wqg1r22q";
+  };
 }