diff --git a/flake.nix b/flake.nix
index 49181c6..5957bc2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -19,10 +19,6 @@
     niri = {
       url = "github:epireyn/niri-flake";
     };
-    system76-scheduler-niri = {
-      url = "github:Kirottu/system76-scheduler-niri";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
 
     nix-index-database = {
       url = "github:nix-community/nix-index-database";
diff --git a/home-manager/modules/ezpcusr.nix b/home-manager/modules/ezpcusr.nix
index a105b6e..4f3ef77 100644
--- a/home-manager/modules/ezpcusr.nix
+++ b/home-manager/modules/ezpcusr.nix
@@ -11,7 +11,6 @@ in {
     inputs.niri.homeModules.niri
 
     inputs.noctalia.homeModules.default
-    inputs.system76-scheduler-niri.homeModules.default
   ];
   options.ezpcusr = {
     enable = mkEnableOption "Enable simple PC user config";
@@ -49,8 +48,6 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
-    services.system76-scheduler-niri.enable = true;
-
     services.hypridle = {
       enable = lib.mkDefault true;
 
@@ -158,7 +155,7 @@ in {
         };
         binds =
           {
-            "Mod+Return".action.spawn = ["${config.programs.ghostty.package}/bin/ghostty" "--gtk-single-instance=true"];
+            "Mod+Return".action.spawn = ["${config.programs.foot.package}/bin/foot"];
             "Mod+q".action = config.lib.niri.actions.close-window;
             # "$mod, F, fullscreen, 0"
             # "$mod SHIFT, F, fullscreen, 1"
@@ -323,7 +320,7 @@ in {
 
     services.playerctld.enable = lib.mkDefault true;
 
-    programs.ghostty = {
+    programs.foot = {
       enable = true;
     };
 
diff --git a/modules/workstation.nix b/modules/workstation.nix
index 67167ef..fb9d6e1 100644
--- a/modules/workstation.nix
+++ b/modules/workstation.nix
@@ -107,30 +107,32 @@ in {
     # Optimizes running games
     programs.gamemode = {
       enable = true;
-      general = {
-        renice = 10;
-        ioprio = 0;
-        inhibit_screensaver = 0;
-        disable_splitlock = 1;
-        softrealtime = "auto";
-      };
+      settings = {
+        general = {
+          renice = 10;
+          ioprio = 0;
+          inhibit_screensaver = 0;
+          disable_splitlock = 1;
+          softrealtime = "auto";
+        };
 
-      # Warning: GPU optimisations have the potential to damage hardware
-      #gpu = {
-      #  apply_gpu_optimisations = "accept-responsibility";
-      #  gpu_device = 0;
-      #  amd_performance_level = "vr";
-      #};
+        # Warning: GPU optimisations have the potential to damage hardware
+        #gpu = {
+        #  apply_gpu_optimisations = "accept-responsibility";
+        #  gpu_device = 0;
+        #  amd_performance_level = "vr";
+        #};
 
-      cpu = {
-        parkcores = "no";
-        pin_cores = "yes";
+        cpu = {
+          parkcores = "no";
+          pin_cores = "yes";
 
-      };
+        };
 
-      custom = {
-        start = "${pkgs.libnotify}/bin/notify-send 'GameMode started'";
-        end = "${pkgs.libnotify}/bin/notify-send 'GameMode ended'";
+        custom = {
+          start = "${pkgs.libnotify}/bin/notify-send 'GameMode started'";
+          end = "${pkgs.libnotify}/bin/notify-send 'GameMode ended'";
+        };
       };
     };