diff --git a/home/modules/nixvim.nix b/home/modules/nixvim.nix
index cca0b62..a6bc355 100644
--- a/home/modules/nixvim.nix
+++ b/home/modules/nixvim.nix
@@ -209,11 +209,11 @@
             enable = true;
             package = pkgs.protols;
           };
-          typos-lsp.enable = false;
-          docker-compose-language-service.enable = true;
+          typos_lsp.enable = false;
+          docker_compose_language_service.enable = true;
           pylsp.enable = true;
           bashls.enable = true;
-          lua-ls.enable = true;
+          lua_ls.enable = true;
           gopls.enable = true;
           nushell.enable = true;
           clangd = {
@@ -221,11 +221,12 @@
             filetypes = ["c" "cpp" "objc" "objcpp" "cpp"];
           };
           svelte.enable = true;
-          ts-ls.enable = true;
-          java-language-server.enable = true;
+          ts_ls.enable = true;
+          java_language_server.enable = true;
           hls.enable = true;
+          hls.installGhc = false;
           eslint.enable = true;
-          rust-analyzer = {
+          rust_analyzer = {
             enable = true;
             installCargo = false;
             installRustc = false;
diff --git a/hosts/aarch64-linux/alastor/default.nix b/hosts/aarch64-linux/alastor/default.nix
index c0c50b9..adb2093 100644
--- a/hosts/aarch64-linux/alastor/default.nix
+++ b/hosts/aarch64-linux/alastor/default.nix
@@ -22,8 +22,8 @@
   hardware.asahi.experimentalGPUInstallMode = "replace";
   hardware.asahi.withRust = true;
   hardware.asahi.setupAsahiSound = true;
-  hardware.opengl.enable = true;
-  hardware.opengl.driSupport32Bit = lib.mkForce false;
+  hardware.graphics.enable = true;
+  hardware.graphics.enable32Bit = lib.mkForce false;
 
   # Use the systemd-boot EFI boot loader.
   boot.loader.systemd-boot.enable = true;
@@ -65,7 +65,7 @@
   # Enable the X11 windowing system.
   services.xserver.enable = true;
   services.xserver.displayManager.sddm.enable = true;
-  services.xserver.desktopManager.plasma6.enable = true;
+  services.desktopManager.plasma6.enable = true;
 
   # Configure keymap in X11
   # services.xserver.xkb.layout = "us";
@@ -89,7 +89,7 @@
   # };
 
   # Enable touchpad support (enabled default in most desktopManager).
-  services.xserver.libinput.enable = true;
+  services.libinput.enable = true;
 
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.xqtc = {
diff --git a/hosts/x86_64-linux/asmodeus/default.nix b/hosts/x86_64-linux/asmodeus/default.nix
index 9d3466a..461b948 100644
--- a/hosts/x86_64-linux/asmodeus/default.nix
+++ b/hosts/x86_64-linux/asmodeus/default.nix
@@ -49,9 +49,9 @@
 
   boot.binfmt.emulatedSystems = ["aarch64-linux"];
 
-  hardware.opengl = {
+  hardware.graphics = {
     enable = true;
-    driSupport32Bit = true;
+    enable32Bit = true;
   };
 
   hardware.cpu.amd.updateMicrocode = true;
@@ -112,7 +112,7 @@
   services.xserver.enable = true;
   # services.xserver.displayManager.gdm.enable = true;
   services.xserver.displayManager.sddm.enable = true;
-  services.xserver.desktopManager.plasma6.enable = true;
+  services.desktopManager.plasma6.enable = true;
   # services.xserver.desktopManager.gnome.enable = true;
   # services.xserver.displayManager.defaultSession = "plasma";
   services.xserver.videoDrivers = ["nvidia"];
@@ -164,7 +164,7 @@
   services.blueman.enable = true;
 
   # Enable touchpad support (enabled default in most desktopManager).
-  services.xserver.libinput.enable = true;
+  services.libinput.enable = true;
 
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.xqtc = {
diff --git a/hosts/x86_64-linux/lambda/default.nix b/hosts/x86_64-linux/lambda/default.nix
index 276b7cc..bbc6dd2 100644
--- a/hosts/x86_64-linux/lambda/default.nix
+++ b/hosts/x86_64-linux/lambda/default.nix
@@ -33,9 +33,9 @@
 
   security.pam.services.swaylock = {};
 
-  hardware.opengl = {
+  hardware.graphics = {
     enable = true;
-    driSupport32Bit = true;
+    enable32Bit = true;
   };
 
   hardware.nvidia = {
@@ -108,7 +108,7 @@
   };
 
   # Enable touchpad support (enabled default in most desktopManager).
-  services.xserver.libinput.enable = true;
+  services.libinput.enable = true;
 
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.xqtc = {
diff --git a/hosts/x86_64-linux/lilith/default.nix b/hosts/x86_64-linux/lilith/default.nix
index 27c145d..9b30136 100644
--- a/hosts/x86_64-linux/lilith/default.nix
+++ b/hosts/x86_64-linux/lilith/default.nix
@@ -20,9 +20,9 @@
 
   security.pam.services.swaylock = {};
 
-  hardware.opengl = {
+  hardware.graphics = {
     enable = true;
-    driSupport32Bit = true;
+    enable32Bit = true;
   };
 
   hardware.bluetooth = {
@@ -79,7 +79,7 @@
   # services.xserver.displayManager.gdm.enable = true;
   # services.xserver.displayManager.startx.enable = true;
   # services.xserver.desktopManager.gnome.enable = true;
-  services.xserver.desktopManager.plasma6.enable = true;
+  services.desktopManager.plasma6.enable = true;
   #services.xserver.displayManager.defaultSession = "plasmawayland";
   # services.xserver.videoDrivers = ["intel"];
 
@@ -119,7 +119,7 @@
   #  '';
   #};
   # Enable touchpad support (enabled default in most desktopManager).
-  services.xserver.libinput.enable = true;
+  services.libinput.enable = true;
 
   programs.adb.enable = true;
   # Define a user account. Don't forget to set a password with ‘passwd’.
@@ -141,7 +141,7 @@
     cargo
     cargo-generate
     sway
-    gnome.adwaita-icon-theme
+    adwaita-icon-theme
     glib
     #swaylock
     swaylock-effects
diff --git a/hosts/x86_64-linux/yosai/default.nix b/hosts/x86_64-linux/yosai/default.nix
index 8e564a3..063bca9 100644
--- a/hosts/x86_64-linux/yosai/default.nix
+++ b/hosts/x86_64-linux/yosai/default.nix
@@ -71,8 +71,8 @@
   # Enable the X11 windowing system.
   # services.xserver.enable = true;
 
-  hardware.opengl.enable = true;
-  hardware.opengl.driSupport32Bit = true;
+  hardware.graphics.enable = true;
+  hardware.graphics.enable32Bit = true;
 
   # Configure keymap in X11
   # services.xserver.xkb.layout = "us";