diff --git a/home/natto/config/emacs/config.org b/home/natto/config/emacs/config.org
index 52a4f24..a26fb1e 100644
--- a/home/natto/config/emacs/config.org
+++ b/home/natto/config/emacs/config.org
@@ -159,6 +159,8 @@ To undo and redo easily like vi
 *** Miscellaneous evil related packages
 #+begin_src emacs-lisp
 (use-package evil-terminal-cursor-changer)
+(use-package evil-anzu
+  :after evil)
 #+end_src
 
 ** Treemacs
@@ -246,6 +248,8 @@ For autocomplete
 
 ** Lang support
 #+begin_src emacs-lisp
+(use-package inform7)
+
 (use-package haskell-mode)
 
 (use-package rustic)
@@ -502,30 +506,21 @@ This returns the command to run in the terminal
 ** General
 *** Colemak translations
 #+begin_src emacs-lisp
+(use-package evil-colemak-basics
+  :init
+  (setq evil-colemak-basics-layout-mod 'mod-dh)
+  :config
+  (global-evil-colemak-basics-mode))
+#+end_src
+
+*** Misc binds
+#+begin_src emacs-lisp
 (use-package general)
 
 (setq evil-states
   '(visual normal motion))
 
 (with-eval-after-load 'general
-(general-translate-key evil-states 'global
-    "m" "h"
-    "n" "j"
-    "N" "J"
-    "e" "k"
-    "i" "l"
-    "u" "i"
-    "l" "u"
-    "k" "n"
-    "f" "e"
-    "t" "f"
-    "j" "t"
-    "K" "N"
-)
-#+end_src
-
-*** Misc binds
-#+begin_src emacs-lisp
 (general-define-key
   :states evil-states
   "M-c" 'comment-line
diff --git a/home/natto/pkgs.nix b/home/natto/pkgs.nix
index 72f7f86..4884399 100644
--- a/home/natto/pkgs.nix
+++ b/home/natto/pkgs.nix
@@ -5,8 +5,7 @@
     # A/V, codec and media stuff
     ffmpeg-full
     sox
-    pamixer
-    mpdas
+    pamixer mpdas
     mpv
     mpc_cli
     pulseaudio
@@ -62,17 +61,25 @@
     calibre
     gnome.zenity
     stalonetray
+    obs-studio
 
     # Wine and games and stuff
     wineWowPackages.stable
     master.winetricks
-    games.wine-discord-ipc-bridge
-    (games.osu-stable.overrideAttrs (_: {
-      tricks = [ "gdiplus" "dotnet48" "meiryo" ];
-    }))
     tlauncher
     lutris
     citra
+    (yuzu.overrideAttrs (_: rec {
+      version = "1245";
+      src = fetchFromGitHub {
+        owner = "yuzu-emu";
+        repo = "yuzu-mainline";
+        rev = "mainline-0-${version}";
+        sha256 = "sha256-lWXlY1KQC067MvCRUFhmr0c7KDrHDuwJOhIWMKw1f+A=";
+        fetchSubmodules = true;
+      };
+    }))
+    ryujinx
 
     # Dev shit
     rust-analyzer
@@ -95,6 +102,8 @@
         tcolorbox;
     })
     python3Packages.pygments
+    inform7
+    gnome-inform7
 
     # Misc
     teams
diff --git a/home/natto/secrets/.gitconfig.age b/home/natto/secrets/.gitconfig.age
index 703efa9..63e00d0 100644
Binary files a/home/natto/secrets/.gitconfig.age and b/home/natto/secrets/.gitconfig.age differ
diff --git a/home/natto/services.nix b/home/natto/services.nix
index f7ac2f3..f0d2171 100644
--- a/home/natto/services.nix
+++ b/home/natto/services.nix
@@ -51,19 +51,28 @@ in
     };
   };
 
-  systemd.user.services.mpdas = {
-    Unit = {
-      After = [ "mpd.service" ];
-      Description = "Music Player Daemon AutoScrobbler";
+  systemd.user.services = {
+    mpd-discord-rpc = {
+      Service = {
+        Restart = "on-failure";
+        RestartSec = "15s";
+      };
     };
 
-    Install.WantedBy = [ "default.target" ];
+    mpdas = {
+      Unit = {
+        After = [ "mpd.service" ];
+        Description = "Music Player Daemon AutoScrobbler";
+      };
 
-    Service = {
-      Type = "simple";
-      Restart = "on-failure";
-      RestartSec = "15s";
-      ExecStart = "${pkgs.mpdas}/bin/mpdas -c ${config.age.secrets.mpdasrc.path}";
+      Install.WantedBy = [ "default.target" ];
+
+      Service = {
+        Type = "simple";
+        Restart = "on-failure";
+        RestartSec = "15s";
+        ExecStart = "${pkgs.mpdas}/bin/mpdas -c ${config.age.secrets.mpdasrc.path}";
+      };
     };
   };
 }