diff --git a/home/modules/programs/my-sway/default.nix b/home/modules/programs/my-sway/default.nix
index 8524f75..77a3f1e 100644
--- a/home/modules/programs/my-sway/default.nix
+++ b/home/modules/programs/my-sway/default.nix
@@ -104,7 +104,7 @@ in
         { command = "systemctl --user restart waybar"; always = true; }
         # Startup programs
         { command = "${config.programs.firefox.package}/bin/firefox"; }
-        { command = "${pkgs.discord}/bin/discord"; }
+        { command = "${pkgs.unstable.discord}/bin/discord"; }
       ];
 
       ### Keybindings
diff --git a/modules/services/input-remapper.nix b/modules/services/input-remapper.nix
deleted file mode 100644
index e550aa9..0000000
--- a/modules/services/input-remapper.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-# This is a stub, until 22.05 merge this
-{ pkgs, lib, config, ... }:
-
-with lib;
-
-let cfg = config.services.input-remapper; in
-{
-  options = {
-    services.input-remapper = {
-      enable = mkEnableOption "input-remapper, an easy to use tool to change the mapping of your input device buttons.";
-      package = mkOption {
-        type = types.package;
-        default = pkgs.unstable.input-remapper;
-      };
-      enableUdevRules = mkEnableOption "udev rules added by input-remapper to handle hotplugged devices. Currently disabled by default due to https://github.com/sezanzeb/input-remapper/issues/140";
-      serviceWantedBy = mkOption {
-        default = [ "graphical.target" ];
-        example = [ "multi-user.target" ];
-        type = types.listOf types.str;
-        description = "Specifies the WantedBy setting for the input-remapper service.";
-      };
-    };
-  };
-
-  config = mkIf cfg.enable {
-    services.udev.packages = mkIf cfg.enableUdevRules [ cfg.package ];
-    services.dbus.packages = [ cfg.package ];
-    systemd.packages = [ cfg.package ];
-    environment.systemPackages = [ cfg.package ];
-    systemd.services.input-remapper.wantedBy = cfg.serviceWantedBy;
-  };
-}
diff --git a/nki-personal-do/configuration.nix b/nki-personal-do/configuration.nix
index 45dfe47..28b690f 100644
--- a/nki-personal-do/configuration.nix
+++ b/nki-personal-do/configuration.nix
@@ -67,9 +67,11 @@
   };
 
   # Youmubot
-  sops.secrets.youmubot-env = {};
+  sops.secrets.youmubot-env = { };
   services.youmubot = {
     enable = true;
     envFile = config.sops.secrets.youmubot-env.path;
   };
+
+  system.stateVersion = "21.11";
 }
diff --git a/nki-x1c1/configuration.nix b/nki-x1c1/configuration.nix
index f38b10c..f8c624a 100644
--- a/nki-x1c1/configuration.nix
+++ b/nki-x1c1/configuration.nix
@@ -14,7 +14,6 @@
       # Some PAM stuff
       ../modules/services/pam/gnome-keyring.nix
       ../modules/services/swaylock.nix
-      ../modules/services/input-remapper.nix
     ];
   # Use the latest kernel
   boot.kernelPackages = pkgs.linuxPackages_latest;