diff --git a/flake.lock b/flake.lock
index df8d4de..19cc352 100644
--- a/flake.lock
+++ b/flake.lock
@@ -248,16 +248,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1736200483,
-        "narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=",
+        "lastModified": 1735834308,
+        "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751",
+        "rev": "6df24922a1400241dae323af55f30e4318a6ca65",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-24.11",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index a653dfc..6230256 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,7 +4,7 @@
   inputs = {
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
     stylix.url = "github:danth/stylix";
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
 
     home-manager = {
       url = "github:nix-community/home-manager";
diff --git a/hosts/home/home_common.nix b/hosts/home/home_common.nix
index e0707b3..b51a07d 100644
--- a/hosts/home/home_common.nix
+++ b/hosts/home/home_common.nix
@@ -16,7 +16,7 @@
       userName = "k";
       userEmail = "markers711@gmail.com";
     };
-    tmux.enable = true;
+    tmux = {enable = true;};
     starship.enable = true;
     zsh = {
       enable = true;
diff --git a/hosts/home/hyprland.nix b/hosts/home/hyprland.nix
index 06ab1cc..c61735c 100644
--- a/hosts/home/hyprland.nix
+++ b/hosts/home/hyprland.nix
@@ -5,7 +5,7 @@
   ...
 }: {
   imports = [./waybar.nix ./tile.nix];
-  programs = {hyprlock = {enable=true;};};
+
   wayland.windowManager.hyprland = {
     enable = true;
     systemd.variables = ["--all"];
@@ -37,6 +37,7 @@
           noise = 0.3;
           new_optimizations = true;
         };
+        drop_shadow = true;
       };
 
       misc = {
@@ -82,7 +83,7 @@
         "$mainMod, 0, workspace, 10"
 
         # same as above, but switch to the workspace
-        "$mainMod SHIFT, 1, movetoworkspacesilent, 1"
+        "$mainMod SHIFT, 1, movetoworkspacesilent, 1" # movetoworkspacesilent
         "$mainMod SHIFT, 2, movetoworkspacesilent, 2"
         "$mainMod SHIFT, 3, movetoworkspacesilent, 3"
         "$mainMod SHIFT, 4, movetoworkspacesilent, 4"
diff --git a/hosts/home/tile.nix b/hosts/home/tile.nix
index 038d735..2984ac4 100644
--- a/hosts/home/tile.nix
+++ b/hosts/home/tile.nix
@@ -7,9 +7,9 @@
   services = {mako = {enable = true;};};
   programs = {
     alacritty = {enable = true;};
+    swaylock = {enable = true;};
     wofi = {enable = true;};
     zathura = {enable = true;};
     mpv = {enable = true;};
   };
-  stylix.targets.wofi.enable = true; #this dosnt follow auto enable for some reson
 }
diff --git a/hosts/home/waybar.nix b/hosts/home/waybar.nix
index 3a9daef..269e0ce 100644
--- a/hosts/home/waybar.nix
+++ b/hosts/home/waybar.nix
@@ -44,16 +44,16 @@
             car = " ";
             default = [" " " "];
           };
-          #scroll-step = 1;
-          #on-click = "pavucontrol";
+          scroll-step = 1;
+          on-click = "pavucontrol";
         };
 
         backlight = {
           tooltip = false;
           format = " {}%";
           interval = 1;
-          on-scroll-up = "${pkgs.brightnessctl}/bin/brightnessctl s 5%+";
-          on-scroll-down = "${pkgs.brightnessctl}/bin/brightnessctl s 5%+";
+          on-scroll-up = "brightnessctl s 1515";
+          on-scroll-down = "brightnessctl s 1";
         };
 
         network = {
diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix
index 78c556f..8d5a2ad 100644
--- a/hosts/laptop/configuration.nix
+++ b/hosts/laptop/configuration.nix
@@ -10,16 +10,11 @@
   system.autoUpgrade.enable = true;
   time.timeZone = "America/New_York";
   powerManagement.enable = true;
-
-  hardware = {
-    bluetooth = {
-      enable = true;
-      powerOnBoot = true;
-      settings = {
-        General = {
-          Enable = "Source,Sink,Media,Socket";
-        };
-      };
+  hardware.bluetooth.enable = true;
+  hardware.bluetooth.powerOnBoot = true;
+  hardware.bluetooth.settings = {
+    General = {
+      Enable = "Source,Sink,Media,Socket";
     };
   };
 
@@ -65,21 +60,10 @@
       enable = true;
       package = pkgs.ollama-intel;
     };
-    tlp = {
-      enable = true;
-      settings = {
-        CPU_SCALING_GOVERNOR_ON_AC = "performance";
-        CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
-
-        CPU_ENERGY_PERF_POLICY_ON_BAT = "power";
-        CPU_ENERGY_PERF_POLICY_ON_AC = "performance";
-      };
-    };
-    logind = {
-      lidSwitch = "suspend-then-hibernate";
-      lidSwitchExternalPower = "suspend";
-    };
     blueman.enable = true;
+    xserver.enable = true;
+    displayManager.sddm.enable = true;
+    desktopManager.plasma6.enable = true;
     fwupd.enable = true;
     printing.enable = true;
     fprintd.enable = true;
@@ -104,24 +88,24 @@
     };
     fonts = {
       serif = {
-        package = pkgs.nerdfonts;
+        package = pkgs.nerd-fonts.iosevka;
         name = "Iosevka NF";
       };
 
       sansSerif = {
-        package = pkgs.nerdfonts;
+        package = pkgs.nerd-fonts.iosevka;
         name = "Iosevka NF";
       };
 
       monospace = {
-        package = pkgs.nerdfonts;
+        package = pkgs.nerd-fonts.iosevka;
         name = "Iosevka NFM";
       };
 
-      #      emoji = {
-      #        package = pkgs.notofonts;
-      #        name = "Noto Color Emoji";
-      #      };
+      emoji = {
+        package = pkgs.noto-fonts-emoji;
+        name = "Noto Color Emoji";
+      };
     };
   };
 
@@ -142,12 +126,6 @@
 
   programs = {
     zsh.enable = true;
-    regreet.enable = true;
-    hyprlock.enable = true;
-    hyprland = {
-      enable = true;
-      withUWSM = true;
-    };
   };
 
   users.users.k = {
@@ -165,15 +143,18 @@
 
   environment = {
     sessionVariables = {MOZ_USE_XINPUT2 = "1";};
+    plasma6.excludePackages = with pkgs; [
+      kate
+      oxygen
+      xterm
+    ];
     systemPackages = with pkgs; [
+      maliit-keyboard
+      maliit-framework
+      alacritty
     ];
   };
 
-  systemd.sleep.extraConfig = ''
-    HibernateDelaySec=30m
-    SuspendState=mem
-  '';
-
   boot = {
     plymouth = {enable = true;};
 
diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix
index b4d59e7..90212fc 100644
--- a/hosts/laptop/home.nix
+++ b/hosts/laptop/home.nix
@@ -6,7 +6,6 @@
 }: {
   imports = [
     ../home/home_common.nix
-    ../home/hyprland.nix
   ];
 
   nixpkgs.config.allowUnfree = true;
@@ -22,7 +21,7 @@
 
       btop
       zip
-      emacs-gtk
+      emacs30-pgtk
 
       direnv
       texliveFull
@@ -49,7 +48,7 @@
     emacs = {
       enable = true;
       defaultEditor = true;
-      package = pkgs.emacs-gtk;
+      package = pkgs.emacs30-pgtk;
     };
   };
   stylix = {
diff --git a/overlays/ollama.nix b/overlays/ollama.nix
index 55f68ef..ddba088 100644
--- a/overlays/ollama.nix
+++ b/overlays/ollama.nix
@@ -34,7 +34,7 @@
             cat << EOF > "$out/bin/ollama-wrapped"
             #!/bin/sh
             export LD_LIBRARY_PATH="${prev.intel-compute-runtime.drivers}/lib"
-            export OLLAMA_INTEL_GPU=1
+            export OLLAMA_INTEL_GPU=-1
             exec "$out/bin/ollama-base" "\$@"
             EOF
             chmod +x "$out/bin/ollama-wrapped"