diff --git a/flake.lock b/flake.lock
index 99f7fc5..8bfacf0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "catppuccin": {
       "locked": {
-        "lastModified": 1716337435,
-        "narHash": "sha256-eZqH1vLI9eKL/N5toXxOrQO80G0y4pWZrYCp472YBVQ=",
+        "lastModified": 1717070887,
+        "narHash": "sha256-ZTEMINFqQL+m55kmoDYIKf3i2NGitSkjBnnLu99ezh0=",
         "owner": "catppuccin",
         "repo": "nix",
-        "rev": "fea5242c0eacc5efa81be0e36206a62e889dbd82",
+        "rev": "2c7661c9fa26a920b8088300ef87d14179c71a27",
         "type": "github"
       },
       "original": {
@@ -275,15 +275,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1716457508,
-        "narHash": "sha256-ZxzffLuWRyuMrkVVq7wastNUqeO0HJL9xqfY1QsYaqo=",
+        "lastModified": 1716736833,
+        "narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "850cb322046ef1a268449cf1ceda5fd24d930b05",
+        "rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
+        "ref": "release-24.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -317,11 +318,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1716214890,
-        "narHash": "sha256-/zk5wn2NC8yOZLd6IxpmiVnnSj8mZUznDTngXvNM/vU=",
+        "lastModified": 1716859594,
+        "narHash": "sha256-wllEikCX/bMY/ZyRszXvar+AzYqmAx6fcjvcDJBkzfU=",
         "owner": "StevenBlack",
         "repo": "hosts",
-        "rev": "7dc5651e1edcc5268fd72dfb90bd1c5c9fba942d",
+        "rev": "6b6cba7dc79b459f80ffc44b3dd9973effdbed34",
         "type": "github"
       },
       "original": {
@@ -341,11 +342,11 @@
         "systems": "systems_3"
       },
       "locked": {
-        "lastModified": 1716374315,
-        "narHash": "sha256-tgSiLFT0PRGKbypXPCcBCqDRPXXGOkfTpRm1IEiyFyM=",
+        "lastModified": 1716893760,
+        "narHash": "sha256-fI3Q8DpkSerjQ37pXBW9ZHKDQQVYfG5stDMw7n9No10=",
         "owner": "ivandimitrov8080",
         "repo": "flake-ide",
-        "rev": "41c6c4d63e0cb294ab19d0fd46fdb0d4c9c4d2a9",
+        "rev": "eb5e62023fcf8ccab169a313a66ccdc7ff8a3319",
         "type": "github"
       },
       "original": {
@@ -411,11 +412,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1716170277,
-        "narHash": "sha256-fCAiox/TuzWGVaAz16PxrR4Jtf9lN5dwWL2W74DS0yI=",
+        "lastModified": 1716772633,
+        "narHash": "sha256-Idcye44UW+EgjbjCoklf2IDF+XrehV6CVYvxR1omst4=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "e0638db3db43b582512a7de8c0f8363a162842b9",
+        "rev": "ff80cb4a11bb87f3ce8459be6f16a25ac86eb2ac",
         "type": "github"
       },
       "original": {
@@ -448,16 +449,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1716358718,
-        "narHash": "sha256-NQbegJb2ZZnAqp2EJhWwTf6DrZXSpA6xZCEq+RGV1r0=",
+        "lastModified": 1717144377,
+        "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3f316d2a50699a78afe5e77ca486ad553169061e",
+        "rev": "805a384895c696f802a9bf5bf4720f37385df547",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
+        "ref": "nixos-24.05",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 5200b8a..87de000 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,8 +1,8 @@
 {
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
     home-manager = {
-      url = "github:nix-community/home-manager";
+      url = "github:nix-community/home-manager/release-24.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     hosts = {
@@ -22,6 +22,7 @@
   outputs = { nixpkgs, home-manager, hosts, ide, nid, catppuccin, ... }:
     let
       system = "x86_64-linux";
+      stateVersion = "24.05";
       my-overlay = self: super: {
         scripts = (super.buildEnv { name = "scripts"; paths = [ ./. ]; });
       };
@@ -33,10 +34,10 @@
         inherit system nixpkgs pkgs ide my-overlay;
       };
       home = import ./home {
-        inherit pkgs modules home-manager nid catppuccin;
+        inherit stateVersion pkgs modules home-manager nid catppuccin;
       };
       nixos = import ./nixos {
-        inherit system nixpkgs modules hosts catppuccin;
+        inherit stateVersion system nixpkgs modules hosts catppuccin;
       };
     in
     {
diff --git a/home/default.nix b/home/default.nix
index eeba8c9..8a0d4eb 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, home-manager, modules, nid, catppuccin, ... }:
+{ stateVersion, pkgs, home-manager, modules, nid, catppuccin, ... }:
 let
   ivand-programs = with modules.home.programs; [
     bat
@@ -36,6 +36,6 @@ in
 {
   ivand = home-manager.lib.homeManagerConfiguration {
     inherit pkgs;
-    modules = [ ./ivand nid.hmModules.nix-index ivand-packages ] ++ ivand-programs ++ [ catppuccin.homeManagerModules.catppuccin ];
+    modules = [{ home.stateVersion = stateVersion; } ./ivand nid.hmModules.nix-index ivand-packages] ++ ivand-programs ++ [ catppuccin.homeManagerModules.catppuccin ];
   };
 }
diff --git a/home/ivand/default.nix b/home/ivand/default.nix
index 48e64b6..34a5861 100644
--- a/home/ivand/default.nix
+++ b/home/ivand/default.nix
@@ -16,7 +16,6 @@
   home = {
     username = "ivand";
     homeDirectory = "/home/ivand";
-    stateVersion = "23.11";
     sessionPath = [
       "$HOME/.local/bin"
     ];
diff --git a/nixos/default.nix b/nixos/default.nix
index e4fcefe..047b27b 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -1,13 +1,11 @@
-{ system, nixpkgs, modules, hosts, catppuccin, ... }: {
+{ stateVersion, system, nixpkgs, modules, hosts, catppuccin, ... }: {
   laptop = nixpkgs.lib.nixosSystem {
     inherit system;
-    modules = with modules.nixos; [
+    modules = [
+      { system.stateVersion = stateVersion; }
       ../hardware-configuration.nix
       ./laptop
-      # dnscrypt
-      # gaming
-      wireguard
-      # nvidia
+      modules.nixos.wireguard
       hosts.nixosModule
       catppuccin.nixosModules.catppuccin
     ];
diff --git a/nixos/laptop/default.nix b/nixos/laptop/default.nix
index 0c09a1e..cbe84d2 100644
--- a/nixos/laptop/default.nix
+++ b/nixos/laptop/default.nix
@@ -1,7 +1,5 @@
 { config, pkgs, ... }: {
 
-  system.stateVersion = "23.11";
-
   nix = {
     extraOptions = ''
       experimental-features = nix-command flakes