diff --git a/nate-work/modules/home-manager/home.nix b/nate-work/modules/home-manager/home.nix
index 69bc9e1..606c68e 100644
--- a/nate-work/modules/home-manager/home.nix
+++ b/nate-work/modules/home-manager/home.nix
@@ -238,7 +238,6 @@
           llm="lsd --timesort --long";
           lS="lsd --oneline --classic";
           lt="lsd --tree --depth=2";
-          grep="rg";
           cat="bat --paging=never";
           rm="rm -i";
       };
diff --git a/nate/modules/home-manager/home.nix b/nate/modules/home-manager/home.nix
index 5c47990..0d66385 100644
--- a/nate/modules/home-manager/home.nix
+++ b/nate/modules/home-manager/home.nix
@@ -52,7 +52,6 @@
 
   home.packages = with pkgs; [
     # nur.repos.crazazy.js.eslint
-    # inputs.nixpkgs-stable.legacyPackages.x86_64-linux.corectrl
     chromium
     #
     # Dev Tools
@@ -211,41 +210,31 @@
       enable = true;
       oh-my-zsh = {
           enable = true;
-          plugins = [ "fossil" "git" ];
+          plugins = [ "git" "ssh-agent" ];
           theme = "half-life";
+          extraConfig =
+          ''
+            zstyle :omz:plugins:ssh-agent lazy yes
+          '';
       };
       initExtra = ''
           eval "$(direnv hook zsh)"
-          export SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/ssh-agent
 
-          # fzf_projects() {
-          #     DIR=`
-          #     fd .git --search-path="$HOME/source/" -H --ignore-file ~/.config/fd-ignore -tdirectory | \
-          #     xargs dirname | \
-          #     sed 's|$HOME||g' | \
-          #     sort | \
-          #     uniq | \
-          #     fzf --preview 'ls $HOME/{}/README.md 2>/dev/null && bat $HOME/{}/README.md || printf "No README.md file found in this directory\n%s" {}' --preview-window=top | \
-          #     xargs printf "$HOME/%s/"
-          #     `
-          #     cd $DIR
-          # }
-          # alias p="fzf_projects ~/source/"
           yt-audio() {
             nix-shell -p yt-dlp --run "yt-dlp -x $1 --audio-format mp3"
           }
-
-          alias ls="lsd"
-          alias l="lsd --almost-all --long"
-          alias llm="lsd --timesort --long"
-          alias lS="lsd --oneline --classic"
-          alias lt="lsd --tree --depth=2"
-          alias grep="rg"
-          alias cat="bat --paging=never"
-          alias rm="rm -i"
-          alias adaptiveoff="swaymsg 'output * adaptive_sync off'"
-          alias adaptiveon="swaymsg 'output * adaptive_sync on'"
        '';
+      shellAliases = {
+          ls="lsd";
+          l="lsd --almost-all --long";
+          llm="lsd --timesort --long";
+          lS="lsd --oneline --classic";
+          lt="lsd --tree --depth=2";
+          cat="bat --paging=never";
+          rm="rm -i";
+          adaptiveoff="swaymsg 'output * adaptive_sync off'";
+          adaptiveon="swaymsg 'output * adaptive_sync on'";
+      };
   };
 
   qt = {
diff --git a/nate/modules/sway/sway_conf.nix b/nate/modules/sway/sway_conf.nix
index 76ab186..db3beac 100644
--- a/nate/modules/sway/sway_conf.nix
+++ b/nate/modules/sway/sway_conf.nix
@@ -106,8 +106,24 @@
         programs.xfconf.enable = true;
 
         programs.zsh.enable = true;
-        programs.steam.enable = config.swaywm.installGaming;
-        programs.gamemode.enable = true;
+        programs.steam = lib.mkIf config.swaywm.installGaming {
+            enable = true;
+            gamescopeSession.enable = true;
+        };
+        programs.gamemode = {
+            enable = true;
+            settings = {
+                general = {
+                    reaper_freq = 5;
+                    desiredgov = "performance";
+                    softrealtime = "auto";
+                };
+            };
+        };
+        programs.corectrl = {
+            enable = true;
+            gpuOverclock.enable = true;
+        };
 
         programs.adb.enable = true;
         # programs.kdeconnect.enable = true;
@@ -166,21 +182,24 @@
           };
         };
 
-        # services.xserver.videoDrivers = [ "amdgpu" ];
+        hardware.bluetooth.enable = true; # enables support for Bluetooth
+        hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot
+
+        services.xserver.videoDrivers = [ "amdgpu" ];
         # Enable HIP
         systemd.tmpfiles.rules = [
             "L+    /opt/rocm/hip   -    -    -     -    ${pkgs.rocmPackages.clr}"
         ];
-        hardware.bluetooth.enable = true; # enables support for Bluetooth
-        hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot
-        hardware.opengl = {
+        hardware.graphics = {
             # Mesa
             enable = true;
+            enable32Bit = true;
             # Vulkan
-            # driSupport = true;
-            # Rocm support and vulkan drivers
+            driSupport = true;
+            # Rocm support
             extraPackages = with pkgs; [
-                rocmPackages.clr.icd
+                rocm-opencl-icd
+                rocm-opencl-runtime
             ];
         };
     };