diff --git a/flake.lock b/flake.lock
index 004ac77..9e24a79 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1723399884,
-        "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=",
+        "lastModified": 1714515075,
+        "narHash": "sha256-azMK7aWH0eUc3IqU4Fg5rwZdB9WZBvimOGG3piqvtsY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "086f619dd991a4d355c07837448244029fc2d9ab",
+        "rev": "6d3b6dc9222c12b951169becdf4b0592ee9576ef",
         "type": "github"
       },
       "original": {
@@ -22,11 +22,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1723362943,
-        "narHash": "sha256-dFZRVSgmJkyM0bkPpaYRtG/kRMRTorUIDj8BxoOt1T4=",
+        "lastModified": 1714253743,
+        "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a58bc8ad779655e790115244571758e8de055e3d",
+        "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994",
         "type": "github"
       },
       "original": {
@@ -37,11 +37,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1723580753,
-        "narHash": "sha256-9Zuz0QyCp+jY9vszrn4TkqpcnGKA7bM9M+da/6I0Yfs=",
+        "lastModified": 1714596740,
+        "narHash": "sha256-V3ZR38xu3JSUrg04wMTp0fzDSP+ogNJOOU5ckreCzLQ=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "e36bc569a3652499909486b983ef97d319ee7271",
+        "rev": "c8456769a0904ac761020a76bf0bb72a92c27c7c",
         "type": "github"
       },
       "original": {
diff --git a/hosts/luci/hardware-configuration.nix b/hosts/luci/hardware-configuration.nix
index 6105b16..16697bb 100644
--- a/hosts/luci/hardware-configuration.nix
+++ b/hosts/luci/hardware-configuration.nix
@@ -51,8 +51,9 @@
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-  hardware.graphics = {
+  hardware.opengl = {
     enable = true;
+    driSupport = true;
     extraPackages = with pkgs; [
       intel-media-driver
       vaapiVdpau
@@ -60,6 +61,8 @@
     ];
   };
 
+
   virtualisation.virtualbox.host.enable = true;
   users.extraGroups.vboxusers.members = [ "ephase" ];
+  hardware.opengl.driSupport32Bit = true;
 }
diff --git a/hosts/morty/hardware-configuration.nix b/hosts/morty/hardware-configuration.nix
index d2ccc01..e29fc34 100644
--- a/hosts/morty/hardware-configuration.nix
+++ b/hosts/morty/hardware-configuration.nix
@@ -43,8 +43,10 @@
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-  hardware.graphics.enable32Bit = true;
-  hardware.graphics.extraPackages = with pkgs; [
+  hardware.opengl.enable = true;
+  hardware.opengl.driSupport = true;
+  hardware.opengl.driSupport32Bit = true;
+  hardware.opengl.extraPackages = with pkgs; [
     intel-media-driver
   ];
 }
diff --git a/hosts/mrmeeseeks/hardware-configuration.nix b/hosts/mrmeeseeks/hardware-configuration.nix
index 2fdf861..02b4584 100644
--- a/hosts/mrmeeseeks/hardware-configuration.nix
+++ b/hosts/mrmeeseeks/hardware-configuration.nix
@@ -24,10 +24,6 @@
 		"kvm-amd"
 		"amdgpu"
 	];
-
-  boot.kernelParams = [
-    "amdgpu.ppfeaturemask=0xffffffff"
-  ];
   
   boot.extraModulePackages = [ ];
   boot.initrd.luks.devices."nixos".device = "/dev/disk/by-uuid/ea7fa60d-35e5-48b8-95d7-142f37b262cd";
@@ -68,10 +64,10 @@
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   
   hardware.cpu.amd.updateMicrocode = true;
-  hardware.graphics = {
-    enable32Bit = true;
+  hardware.opengl = {
+    driSupport = true;
+    driSupport32Bit = true;
   };
   hardware.bluetooth.enable = true;
   hardware.xpadneo.enable = true;
-  programs.coolercontrol.enable = true;
 }
diff --git a/modules/home-manager/cli/neovim/files/whichkey.lua b/modules/home-manager/cli/neovim/files/whichkey.lua
index a3cf600..0b51321 100644
--- a/modules/home-manager/cli/neovim/files/whichkey.lua
+++ b/modules/home-manager/cli/neovim/files/whichkey.lua
@@ -1,4 +1,4 @@
 -- Which-key
 -- 
 local wk = require 'which-key'
--- wk.register()
+wk.register()
diff --git a/modules/home-manager/desktop/sway/default.nix b/modules/home-manager/desktop/sway/default.nix
index e45a78c..aad3a3d 100644
--- a/modules/home-manager/desktop/sway/default.nix
+++ b/modules/home-manager/desktop/sway/default.nix
@@ -84,7 +84,7 @@ in
 
     home.packages = with pkgs; [
       dejavu_fonts
-      # emojione
+      emojione
       font-awesome
       grim
       lato
@@ -128,7 +128,7 @@ in
 
     home.pointerCursor = {
       name = "Adwaita";
-      package = pkgs.adwaita-icon-theme;
+      package = pkgs.gnome.adwaita-icon-theme;
       size = 24;
       x11 = {
         enable = true;
diff --git a/modules/home-manager/desktop/sway/includes/kanshi.nix b/modules/home-manager/desktop/sway/includes/kanshi.nix
index a0453e3..d212c4b 100644
--- a/modules/home-manager/desktop/sway/includes/kanshi.nix
+++ b/modules/home-manager/desktop/sway/includes/kanshi.nix
@@ -4,21 +4,18 @@ with lib;
   config = mkIf config.modules.desktop.sway.enable {
     services.kanshi = {
       enable = config.modules.desktop.sway.kanshi ;
-      settings = [
-        {
-
-          profile.name = "standalone";
-          profile.outputs = [
+      profiles = {
+        standalone = {
+          outputs = [
           {
             criteria = "eDP-1"; 
             scale = 1.33;
             status = "enable";
           }
           ];
-        }
-        {
-          profile.name = "home";
-          profile.outputs = [
+        };
+        home = {
+          outputs = [
           {
             criteria = "Iiyama North America PL2792UH 1166310803122"; 
             mode = "3840x2160";
@@ -37,10 +34,9 @@ with lib;
             status = "disable";
           }
           ];
-        }
-        {
-          profile.name = "work";
-          profile.outputs = [
+        };
+        work = {
+          outputs = [
           {
             criteria = "Iiyama North America PL2480H 11183M2807013"; 
             mode = "1920x1080";
@@ -56,8 +52,8 @@ with lib;
             status = "disable";
           }
           ];
-        }
-      ];
+        };
+      };
     };
   };
 }
diff --git a/modules/nixos/gaming/steam/default.nix b/modules/nixos/gaming/steam/default.nix
index 5ba01dc..158b021 100644
--- a/modules/nixos/gaming/steam/default.nix
+++ b/modules/nixos/gaming/steam/default.nix
@@ -31,7 +31,7 @@ in
       gamescopeSession = {
         enable = cfg.gamescope;
         args = [
-        "-O HDMI-A-2"
+        "-O HDMI-A-1"
         "-F fsr"
         ];
       };
diff --git a/nixos/includes/system/flakes.nix b/nixos/includes/system/flakes.nix
index 44d4ed8..7f2c37b 100644
--- a/nixos/includes/system/flakes.nix
+++ b/nixos/includes/system/flakes.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 {
   nix = {
-    package = pkgs.nixVersions.latest;
+    package = pkgs.nixUnstable;
     extraOptions = ''
       experimental-features = nix-command flakes
     '';