diff --git a/flake.lock b/flake.lock
index dc9fff8..05abfab 100644
--- a/flake.lock
+++ b/flake.lock
@@ -97,16 +97,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1716729592,
-        "narHash": "sha256-Y3bOjoh2cFBqZN0Jw1zUdyr7tjygyxl2bD/QY73GZP0=",
+        "lastModified": 1716736833,
+        "narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2c78a57c544dd19b07442350727ced097e1aa6e6",
+        "rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-23.11",
+        "ref": "release-24.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -220,16 +220,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1716633019,
-        "narHash": "sha256-xim1b5/HZYbWaZKyI7cn9TJCM6ewNVZnesRr00mXeS4=",
+        "lastModified": 1717144377,
+        "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9d29cd266cebf80234c98dd0b87256b6be0af44e",
+        "rev": "805a384895c696f802a9bf5bf4720f37385df547",
         "type": "github"
       },
       "original": {
         "id": "nixpkgs",
-        "ref": "nixos-23.11",
+        "ref": "nixos-24.05",
         "type": "indirect"
       }
     },
diff --git a/flake.nix b/flake.nix
index 3b45026..3689d4b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,12 +2,12 @@
   description = "Nixos configuration for Xeovalyte";
 
   inputs = {
-    nixpkgs.url = "nixpkgs/nixos-23.11";
+    nixpkgs.url = "nixpkgs/nixos-24.05";
 
     nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
 
     home-manager = {
-      url = "github:nix-community/home-manager/release-23.11";
+      url = "github:nix-community/home-manager/release-24.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix
index c30863c..da039ac 100644
--- a/hosts/desktop/default.nix
+++ b/hosts/desktop/default.nix
@@ -53,6 +53,6 @@
   # Keyboard
   hardware.ckb-next.enable = true;
 
-  system.stateVersion = "23.11";
+  system.stateVersion = "24.05";
 
 }
diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix
index b5b200a..305e94c 100644
--- a/hosts/desktop/home.nix
+++ b/hosts/desktop/home.nix
@@ -39,5 +39,5 @@
     WLR_NO_HARDWARE_CURSORS = 1;
   };
 
-  home.stateVersion = "23.11";
+  home.stateVersion = "24.05";
 }
diff --git a/hosts/laptop/default.nix b/hosts/laptop/default.nix
index 21dd9ea..91ee456 100644
--- a/hosts/laptop/default.nix
+++ b/hosts/laptop/default.nix
@@ -43,6 +43,6 @@
 
   services.printing.enable = true;
 
-  system.stateVersion = "23.11";
+  system.stateVersion = "24.05";
 
 }
diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix
index 4f5293c..d9b172f 100644
--- a/hosts/laptop/home.nix
+++ b/hosts/laptop/home.nix
@@ -30,5 +30,5 @@
     unstable.joplin-desktop
   ];
 
-  home.stateVersion = "23.11";
+  home.stateVersion = "24.05";
 }
diff --git a/modules/home/desktop/hyprland/rofi.nix b/modules/home/desktop/hyprland/rofi.nix
index 5ba1f79..4bbfe91 100644
--- a/modules/home/desktop/hyprland/rofi.nix
+++ b/modules/home/desktop/hyprland/rofi.nix
@@ -2,6 +2,7 @@
 {
   programs.rofi = {
     enable = true;
+    package = pkgs.rofi-wayland;
     theme = let
       inherit (config.lib.formats.rasi) mkLiteral;
     in {
diff --git a/modules/home/desktop/hyprland/waybar.nix b/modules/home/desktop/hyprland/waybar.nix
index 686a259..c88cba1 100644
--- a/modules/home/desktop/hyprland/waybar.nix
+++ b/modules/home/desktop/hyprland/waybar.nix
@@ -29,25 +29,10 @@
           "on-scroll-down" = "hyprctl dispatch workspace e-1";
           "on-click" = "activate";
           "persistent-workspaces" = if hostName == "xv-laptop" then {
-            "1" = [];
-            "2" = [];
-            "3" = [];
-            "4" = [];
-            "5" = [];
-            "6" = [];
-            "7" = [];
-            "8" = [];
+            "*" = 8;
           } else {
-            "1" = [ "DP-2" ];
-            "2" = [ "DP-2" ];
-            "3" = [ "DP-2" ];
-            "4" = [ "DP-2" ];
-            "5" = [ "DP-2" ];
-            "6" = [ "HDMI-A-1" ];
-            "7" = [ "HDMI-A-1" ];
-            "8" = [ "HDMI-A-1" ];
-            "9" = [ "HDMI-A-1" ];
-            "10" = [ "HDMI-A-1" ];
+            "DP-2" = [ 1 2 3 4 5 ];
+            "HDMI-A-1" = [ 6 7 8 9 10 ];
           };
           "format-icons" = {
             "default" = "";
diff --git a/modules/home/programs/alacritty.nix b/modules/home/programs/alacritty.nix
index 738e1d1..abbbcc9 100644
--- a/modules/home/programs/alacritty.nix
+++ b/modules/home/programs/alacritty.nix
@@ -4,6 +4,9 @@
   programs.alacritty = {
     enable = true;
     settings = {
+      font = {
+        normal = { family = "DejaVuSansM Nerd Font"; style = "Regular"; };
+      };
       window = {
         opacity = 0.8;
         padding = { x = 10; y = 10; };
diff --git a/modules/home/theme/default.nix b/modules/home/theme/default.nix
index 0901384..2058cac 100644
--- a/modules/home/theme/default.nix
+++ b/modules/home/theme/default.nix
@@ -19,7 +19,7 @@ in
 
   qt = {
     enable = true;
-    platformTheme = "gtk";
+    platformTheme.name = "gtk";
     style = {
       name = "gtk2";
       package = pkgs.qt6Packages.qt6gtk2;