diff --git a/flake.lock b/flake.lock
index 101bddd8..5fcc684d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3,11 +3,11 @@
     "catppuccin-bat": {
       "flake": false,
       "locked": {
-        "lastModified": 1668065083,
-        "narHash": "sha256-6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw=",
+        "lastModified": 1722864529,
+        "narHash": "sha256-s0CHTihXlBMCKmbBBb8dUhfgOOQu9PBCQ+uviy7o47w=",
         "owner": "catppuccin",
         "repo": "bat",
-        "rev": "ba4d16880d63e656acced2b7d4e034e4a93f74b1",
+        "rev": "d3feec47b16a8e99eabb34cdfbaa115541d374fc",
         "type": "github"
       },
       "original": {
@@ -23,32 +23,32 @@
         ]
       },
       "locked": {
-        "lastModified": 1700814205,
-        "narHash": "sha256-lWqDPKHRbQfi+zNIivf031BUeyciVOtwCwTjyrhDB5g=",
+        "lastModified": 1720042825,
+        "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "aeb2232d7a32530d3448318790534d196bf9427a",
+        "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-23.11",
+        "ref": "release-24.05",
         "repo": "home-manager",
         "type": "github"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1701952659,
-        "narHash": "sha256-TJv2srXt6fYPUjxgLAL0cy4nuf1OZD4KuA1TrCiQqg0=",
+        "lastModified": 1723556749,
+        "narHash": "sha256-+CHVZnTnIYRLYsARInHYoWkujzcRkLY/gXm3s5bE52o=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b4372c4924d9182034066c823df76d6eaf1f4ec4",
+        "rev": "4a92571f9207810b559c9eac203d1f4d79830073",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-23.11",
+        "ref": "nixos-24.05",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index d5c78836..df0d582e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,8 +21,8 @@
   };
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
-    home-manager.url = "github:nix-community/home-manager/release-23.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
+    home-manager.url = "github:nix-community/home-manager/release-24.05";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
     catppuccin-bat = {
diff --git a/home/core.nix b/home/core.nix
index 0c5e9b3a..54b2c792 100644
--- a/home/core.nix
+++ b/home/core.nix
@@ -13,7 +13,7 @@
     # You can update Home Manager without changing this value. See
     # the Home Manager release notes for a list of state version
     # changes in each release.
-    stateVersion = "23.11";
+    stateVersion = "24.05";
   };
 
   # Let Home Manager install and manage itself.
diff --git a/home/programs/common.nix b/home/programs/common.nix
index 48fbaf0f..87a0e462 100644
--- a/home/programs/common.nix
+++ b/home/programs/common.nix
@@ -37,7 +37,7 @@
     yarn
 
     # db related
-    dbeaver
+    dbeaver-bin
     mycli
     pgcli
   ];
diff --git a/hosts/msi-rtx4090/default.nix b/hosts/msi-rtx4090/default.nix
index 6ec2ffcd..beed95e4 100644
--- a/hosts/msi-rtx4090/default.nix
+++ b/hosts/msi-rtx4090/default.nix
@@ -48,7 +48,7 @@
   # this value at the release version of the first install of this system.
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "23.11"; # Did you read the comment?
+  system.stateVersion = "24.05"; # Did you read the comment?
 
 }
 
diff --git a/hosts/nixos-test/default.nix b/hosts/nixos-test/default.nix
index 466a6b99..4ab1de90 100644
--- a/hosts/nixos-test/default.nix
+++ b/hosts/nixos-test/default.nix
@@ -46,7 +46,7 @@
   # this value at the release version of the first install of this system.
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "23.11"; # Did you read the comment?
+  system.stateVersion = "24.05"; # Did you read the comment?
 
 }
 
diff --git a/modules/i3.nix b/modules/i3.nix
index 20a6df3d..2d8555c9 100644
--- a/modules/i3.nix
+++ b/modules/i3.nix
@@ -1,10 +1,7 @@
-{pkgs, ...}:
-
-
-{
-
+{pkgs, ...}: {
   # i3 related options
-  environment.pathsToLink = [ "/libexec" ]; # links /libexec from derivations to /run/current-system/sw
+  environment.pathsToLink = ["/libexec"]; # links /libexec from derivations to /run/current-system/sw
+  services.displayManager.defaultSession = "none+i3";
   services.xserver = {
     enable = true;
 
@@ -13,36 +10,35 @@
     };
 
     displayManager = {
-        defaultSession = "none+i3";
-        lightdm.enable = false;
-        gdm.enable = true;
+      lightdm.enable = false;
+      gdm.enable = true;
     };
 
     windowManager.i3 = {
       enable = true;
       extraPackages = with pkgs; [
-        rofi          # application launcher, the same as dmenu
-        dunst         # notification daemon
-        i3blocks      # status bar
-        i3lock        # default i3 screen locker
-        xautolock     # lock screen after some time
-        i3status      # provide information to i3bar
-        i3-gaps       # i3 with gaps
-        picom         # transparency and shadows
-        feh           # set wallpaper
-        acpi          # battery information
-        arandr        # screen layout manager
-        dex           # autostart applications
-        xbindkeys     # bind keys to commands
-        xorg.xbacklight  # control screen brightness
-        xorg.xdpyinfo      # get screen information
-        sysstat       # get system information
-     ];
+        rofi # application launcher, the same as dmenu
+        dunst # notification daemon
+        i3blocks # status bar
+        i3lock # default i3 screen locker
+        xautolock # lock screen after some time
+        i3status # provide information to i3bar
+        i3-gaps # i3 with gaps
+        picom # transparency and shadows
+        feh # set wallpaper
+        acpi # battery information
+        arandr # screen layout manager
+        dex # autostart applications
+        xbindkeys # bind keys to commands
+        xorg.xbacklight # control screen brightness
+        xorg.xdpyinfo # get screen information
+        sysstat # get system information
+      ];
     };
 
     # Configure keymap in X11
-    layout = "us";
-    xkbVariant = "";
+    xkb.layout = "us";
+    xkb.variant = "";
   };
 
   # thunar file manager(part of xfce) related options
@@ -52,4 +48,4 @@
   ];
   services.gvfs.enable = true; # Mount, trash, and other functionalities
   services.tumbler.enable = true; # Thumbnail support for images
-}
\ No newline at end of file
+}