4 files changed, 14 insertions, 15 deletions
diff --git a/modules/programs/heroic/default.nix b/modules/programs/heroic/default.nix
index bc74645..b091aed 100644
--- a/modules/programs/heroic/default.nix
+++ b/modules/programs/heroic/default.nix
@@ -19,12 +19,22 @@
       default = pkgs.symlinkJoin {
         name = "heroic-bundle";
         paths = with pkgs; [
-          heroic
+          # Wrap Heroic so it dynamically appends gamemode's library folder to LD_LIBRARY_PATH
+          (pkgs.symlinkJoin {
+            name = "heroic-wrapped";
+            paths = [ heroic ];
+            buildInputs = [ pkgs.makeWrapper ];
+            postBuild = ''
+              wrapProgram $out/bin/heroic \
+                --prefix LD_LIBRARY_PATH : "${pkgs.gamemode.lib}/lib:${pkgs.pkgsi686Linux.gamemode.lib}/lib"
+            '';
+          })
           winetricks
           xdg-user-dirs
+          gamemode
         ];
       };
-      description = "Bundle of Heroic Games Launcher, winetricks, and core utilities.";
+      description = "Bundle of Heroic Games Launcher, winetricks, and core utilities with GameMode support.";
     };
   };
 
diff --git a/modules/programs/nixvim/plugins/lsp.nix b/modules/programs/nixvim/plugins/lsp.nix
index 7069b97..c734ea2 100644
--- a/modules/programs/nixvim/plugins/lsp.nix
+++ b/modules/programs/nixvim/plugins/lsp.nix
@@ -45,7 +45,7 @@
         enable = true;
         package = null;
       };
-      bash-language-server = {
+      bashls = {
         enable = true;
         package = null;
       };
diff --git a/modules/programs/nixvim/plugins/noice.nix b/modules/programs/nixvim/plugins/noice.nix
index 61acf2a..d466506 100644
--- a/modules/programs/nixvim/plugins/noice.nix
+++ b/modules/programs/nixvim/plugins/noice.nix
@@ -4,16 +4,5 @@
 {
   config.programs.nixvim.plugins.noice = lib.mkIf config.programs.nixvim.enable {
     enable = true;
-    cmdline = {
-      enabled = true;
-      view = "cmdline_popup";
-    };
-    popupmenu = {
-      enabled = true;
-      backend = "cmp";
-    };
-    presets = {
-      command_palette = true;
-    };
   };
 }
diff --git a/modules/programs/ssh/default.nix b/modules/programs/ssh/default.nix
index dc1bf0e..4b47256 100644
--- a/modules/programs/ssh/default.nix
+++ b/modules/programs/ssh/default.nix
@@ -19,7 +19,7 @@
         VisualHostKey = "yes";
         HashKnownHosts = "yes";
       };
-      matchBlocks = {
+      settings = {
         "github.com" = {
           hostname = "github.com";
           user = "git";