diff --git a/dotfiles/hypr-lap/binds.conf b/dotfiles/hypr-lap/binds.conf
index 2e6219b..13f23ec 100644
--- a/dotfiles/hypr-lap/binds.conf
+++ b/dotfiles/hypr-lap/binds.conf
@@ -7,7 +7,7 @@
 ####################
 
 $terminal = kitty
-$fileManager = thunar
+$fileManager = dolphin
 $menu = wofi --show drun
 $calc = qalculate-gtk
 
@@ -26,7 +26,6 @@ bind = $mainMod, F, fullscreen
 bind = $mainMod, T, togglefloating
 bind = , XF86Calculator, exec, $calc
 bind = , XF86RFKill, exec, virt-manager
-bind = , XF86Favorites, exec, discord
 bind = $mainMod, L, exec, hyprlock
 
 # Change Wallpaper
diff --git a/dotfiles/hypr-lap/hyprland.conf b/dotfiles/hypr-lap/hyprland.conf
index 9261f65..697d6eb 100644
--- a/dotfiles/hypr-lap/hyprland.conf
+++ b/dotfiles/hypr-lap/hyprland.conf
@@ -20,7 +20,7 @@ monitor=,preferred,auto,1
 
 # Set programs that you use
 $terminal = kitty
-$fileManager = thunar
+$fileManager = dolphin
 $menu = wofi --show drun
 
 
@@ -31,7 +31,6 @@ $menu = wofi --show drun
 # Autostart necessary processes (like notifications daemons, status bars, etc.)
 # Or execute your favorite apps at launch like this:
 
-exec-once = $terminal
 exec-once = waybar
 exec-once = /home/smayzy/.config/hypr/battery.sh
 exec = /home/smayzy/.config/hypr/wallpaper.sh 
diff --git a/dotfiles/hypr-lap/hyprpaper.conf b/dotfiles/hypr-lap/hyprpaper.conf
deleted file mode 100644
index e69de29..0000000
diff --git a/dotfiles/waybar-lap/config b/dotfiles/waybar-lap/config
index dfb94ee..3e31608 100644
--- a/dotfiles/waybar-lap/config
+++ b/dotfiles/waybar-lap/config
@@ -3,10 +3,7 @@
 {
 	"layer": "top",
 	"modules-left": [
-		"custom/launcher",
-    "custom/right-arrow-dark",
-    "custom/right-arrow-light",
-    "network",
+                "network",
 		"custom/right-arrow-dark",
 		"custom/right-arrow-light",
 		"hyprland/workspaces",
@@ -24,9 +21,6 @@
 		"custom/right-arrow-dark"
 	],
 	"modules-right": [
-		"custom/left-arrow-dark",
-		"custom/updates",
-		"custom/left-arrow-light",
 		"custom/left-arrow-dark",
 		"cpu",
 		"custom/left-arrow-light",
@@ -37,12 +31,12 @@
 		"pulseaudio",
 		"custom/left-arrow-light",
 		"custom/left-arrow-dark",
-    "backlight",
-    "custom/left-arrow-light",
-    "custom/left-arrow-dark",
-    "battery",
-    "custom/left-arrow-light",
-    "custom/left-arrow-dark",
+                "backlight",
+                "custom/left-arrow-light",
+                "custom/left-arrow-dark",
+                "battery",
+                "custom/left-arrow-light",
+                "custom/left-arrow-dark",
 		"disk",
 		"custom/left-arrow-light",
 		"custom/left-arrow-dark",
@@ -144,18 +138,8 @@
 	"tray": {
 		"icon-size": 20
 	},
-	"custom/launcher":{
-		"format": "   ",
-		"on-click": "wofi --show drun",
-		"on-click-right": "killall wofi"
-	},
 	"custom/power":{
 		"format": "    ",
 		"on-click": "wlogout"
-	},
-	"custom/updates":{
-		"format": " {} Update(s) ",
-		"exec": "checkupdates | wc -l",
-		"interval": 600
 	}
 }
diff --git a/dotfiles/waybar-lap/style.css b/dotfiles/waybar-lap/style.css
index 596122c..2f039b8 100644
--- a/dotfiles/waybar-lap/style.css
+++ b/dotfiles/waybar-lap/style.css
@@ -18,15 +18,10 @@ window#waybar {
 	background: #1a1a1a;
 }
 
-#custom-updates {
-	color: #F3881F;
-	background: #1a1a1a;
-}
 #custom-power {
 	color: #ff8080;
 	background: #1a1a1a;
 }
-#custom-launcher,
 #workspaces,
 #clock.1,
 #clock.2,
diff --git a/hosts/laptop1/configuration.nix b/hosts/laptop1/configuration.nix
new file mode 100644
index 0000000..9bc9507
--- /dev/null
+++ b/hosts/laptop1/configuration.nix
@@ -0,0 +1,94 @@
+{ inputs, config, pkgs, lib, ... }:
+
+{
+  imports =
+    [
+      ../common/common.nix
+      ./hardware-configuration.nix
+    ];
+
+  home-manager = {
+    extraSpecialArgs = { inherit inputs; };
+    users = {
+      smayzy = import ./home.nix;
+    };
+    backupFileExtension = "backup";
+  };
+
+  system.stateVersion = "24.11";
+
+  nix.settings.experimental-features = [ "nix-command" "flakes" ];
+
+  networking.hostName = "laptop1";
+  networking.networkmanager.enable = true;
+
+  users.defaultUserShell = pkgs.zsh;
+
+  services.xserver.xkb = {
+    layout = "fr";
+    variant = "";
+  };
+  console.keyMap = "fr";
+
+  services.desktopManager.plasma6.enable = true;
+  services.displayManager.sddm.enable = true;
+  services.displayManager.sddm.wayland.enable = true;
+
+  programs.hyprland = {
+    enable = true;
+    xwayland.enable = true;
+  };
+
+  xdg.portal.enable = true;
+  xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
+
+  nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
+    "steam"
+    "steam-original"
+    "steam-unwrapped"
+    "steam-run"
+    "obsidian"
+  ];
+
+  programs.steam.enable = true;
+
+  environment.systemPackages = with pkgs; [
+  mako
+  wofi
+  wlogout
+  waybar
+  wl-clipboard
+  libnotify
+  hyprpaper
+  webcord
+  pavucontrol
+  cliphist
+  obsidian
+  samrewritten
+  libsForQt5.kdenlive
+  prismlauncher
+  floorp
+  komikku
+  librewolf
+  inkscape
+  ];
+
+  stylix.enable = true;
+  stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/dracula.yaml";
+
+  programs.fzf.keybindings = true;
+
+  services.flatpak = {
+    enable = true;
+    update.onActivation = true;
+    packages = [
+      "com.github.tchx84.Flatseal"
+      "com.usebottles.bottles"
+      "it.mijorus.gearlever"
+    ];
+  };
+
+  programs.firefox.enable = true;
+
+  programs.zsh.enable = true;
+}
diff --git a/hosts/laptop1/home.nix b/hosts/laptop1/home.nix
new file mode 100644
index 0000000..3f5e590
--- /dev/null
+++ b/hosts/laptop1/home.nix
@@ -0,0 +1,101 @@
+{ config, pkgs, inputs, ... }:
+
+{
+  imports =
+  [
+  ../../modules/home-manager/webapps.nix
+  ../../modules/home-manager/lf/lf.nix
+  ];
+
+  home.username = "smayzy";
+  home.homeDirectory = "/home/smayzy";
+  home.stateVersion = "25.05";
+
+  home.packages = [
+  ];
+
+  home.file = {
+    ".config/fastfetch" = {
+      source = builtins.toPath ../../dotfiles/fastfetch;
+      recursive = true;
+      force = true;
+    };
+    ".config/kitty/kitty.conf" = {
+      source = builtins.toPath ../../dotfiles/kitty.conf;
+      force = true;
+    };
+    ".config/hypr" = {
+      source = builtins.toPath ../../dotfiles/hypr-lap;
+      recursive = true;
+      force = true;
+    };
+    ".config/mako/config" = {
+      source = builtins.toPath ../../dotfiles/mako/config;
+      force = true;
+    };
+    ".config/waybar" = {
+      source = builtins.toPath ../../dotfiles/waybar-lap;
+      recursive = true;
+      force = true;
+    };
+    ".config/wofi" = {
+      source = builtins.toPath ../../dotfiles/wofi;
+      recursive = true;
+      force = true;
+    };
+    ".config/wlogout" = {
+      source = builtins.toPath ../../dotfiles/wlogout-lap;
+      recursive = true;
+      force = true;
+    };
+    "wallpaper" = {
+      source = builtins.toPath ../../wallpapers;
+      recursive = true;
+      force = true;
+    };
+  };
+
+  home.sessionVariables = {
+    EDITOR = "vim";
+    GTK_THEME = "Adwaita:dark";
+  };
+
+  dconf.settings = {
+    "org/virt-manager/virt-manager/connections" = {
+      autoconnect = ["qemu:///system"];
+      uris = ["qemu:///system"];
+    };
+  };
+
+  programs.zsh = {
+    enable = true;
+    enableCompletion = true;
+    autosuggestion.enable = true;
+    syntaxHighlighting.enable = true;
+    history.size = 100000;
+    shellAliases = {
+    config = "cd ~/nix-config";
+    };
+  };
+
+  programs.git = {
+    enable = true;
+    userName = "smayzy";
+    userEmail = "smayzy@smayzy.ovh";
+    extraConfig = {
+      core.editor = "vim";
+      core.autocrlf = "input";
+    };
+  };
+
+  programs.firefox = {
+    enable = true;
+    policies = {
+      OverridePostfix = "no-gtk-theme";
+    };
+  };
+
+  stylix.autoEnable = false;
+
+  programs.home-manager.enable = true;
+}