diff --git a/flake.nix b/flake.nix
index 7d25973..49e7454 100644
--- a/flake.nix
+++ b/flake.nix
@@ -50,6 +50,23 @@
           }
         ];
       };
+
+      perso-laptop = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+
+        modules = [
+          ./hosts/perso-laptop
+
+          home-manager.nixosModules.home-manager
+          {
+            home-manager.useGlobalPkgs = true;
+            home-manager.useUserPackages = true;
+
+            home-manager.extraSpecialArgs = inputs;
+            home-manager.users.florian = import ./home;
+          }
+        ];
+      };
     };
   };
-}
\ No newline at end of file
+}
diff --git a/home/default.nix b/home/default.nix
index a22d49d..fd099c8 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -2,7 +2,7 @@
 
 {
   imports = [
-    ./hyprland
+#    ./hyprland
     ./programs
   ];
 
@@ -10,7 +10,7 @@
     username = "florian";
     homeDirectory = "/home/florian";
 
-    stateVersion = "23.05";
+    stateVersion = "23.11";
   };
 
   programs.home-manager.enable = true;
diff --git a/hosts/nixos-test/default.nix b/hosts/nixos-test/default.nix
index bae5667..67b03b6 100644
--- a/hosts/nixos-test/default.nix
+++ b/hosts/nixos-test/default.nix
@@ -8,6 +8,7 @@
   imports =
     [
       ../../modules/system.nix
+      ../../modules/keymaps/us.nix
       ../../modules/pipewire.nix
       ../../modules/hyprland.nix
   
diff --git a/hosts/perso-laptop/default.nix b/hosts/perso-laptop/default.nix
new file mode 100644
index 0000000..861eab4
--- /dev/null
+++ b/hosts/perso-laptop/default.nix
@@ -0,0 +1,39 @@
+# Edit this configuration file to define what should be installed on
+# your system.  Help is available in the configuration.nix(5) man page
+# and in the NixOS manual (accessible by running ‘nixos-help’).
+
+{ config, pkgs, ... }:
+
+{
+  imports =
+    [
+      ../../modules/system.nix
+      ../../modules/keymaps/fr.nix
+      ../../modules/pipewire.nix
+
+      # Include the results of the hardware scan.
+      ./hardware-configuration.nix
+    ];
+
+  # Bootloader.
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
+  networking.hostName = "nixos"; # Define your hostname.
+  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
+
+  # Configure network proxy if necessary
+  # networking.proxy.default = "http://user:password@proxy:port/";
+  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
+
+  # Enable networking
+  networking.networkmanager.enable = true;
+
+  # Enable the X11 windowing system.
+  services.xserver.enable = true;
+
+  # Enable the KDE Plasma Desktop Environment.
+  services.xserver.displayManager.sddm.enable = true;
+  services.xserver.desktopManager.plasma5.enable = true;
+
+}
diff --git a/hosts/perso-laptop/hardware-configuration.nix b/hosts/perso-laptop/hardware-configuration.nix
new file mode 100644
index 0000000..b5dacca
--- /dev/null
+++ b/hosts/perso-laptop/hardware-configuration.nix
@@ -0,0 +1,38 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/6434388f-82a8-4ea9-99e8-4fd988d38030";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/5F2E-40CE";
+      fsType = "vfat";
+    };
+
+  swapDevices = [ ];
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp2s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}
diff --git a/modules/keymaps/fr.nix b/modules/keymaps/fr.nix
new file mode 100644
index 0000000..53ffe96
--- /dev/null
+++ b/modules/keymaps/fr.nix
@@ -0,0 +1,11 @@
+{ config, pkgs, ... }:
+{
+  # Configure keymap in X11
+  services.xserver = {
+    layout = "fr";
+    xkbVariant = "";
+  };
+
+  # Configure console keymap
+  console.keyMap = "fr";
+}
diff --git a/modules/keymaps/us.nix b/modules/keymaps/us.nix
new file mode 100644
index 0000000..167d747
--- /dev/null
+++ b/modules/keymaps/us.nix
@@ -0,0 +1,11 @@
+{ config, pkgs, ... }:
+{
+  # Configure keymap in X11
+  services.xserver = {
+    layout = "us";
+    xkbVariant = "altgr-intl";
+  };
+
+  # Configure console keymap
+  console.keyMap = "us";
+}
diff --git a/modules/pipewire.nix b/modules/pipewire.nix
index 1a7028a..7b5f392 100644
--- a/modules/pipewire.nix
+++ b/modules/pipewire.nix
@@ -1,20 +1,20 @@
-{ pkgs, ... }:
-{
-  services = {
-    pipewire = {
-      enable = true;
-      audio.enable = true;
-      pulse.enable = true;
-      alsa = {
-        enable = true;
-        support32Bit = true;
-      };
-      wireplumber.enable = true;
-      jack.enable = true;
-    };
-  };
+{ config, pkgs, ... }:
 
-  environment.systemPackages = with pkgs; [
-    pulseaudio
-  ];
+{
+  # Enable sound with pipewire.
+  sound.enable = true;
+  hardware.pulseaudio.enable = false;
+  security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+    # If you want to use JACK applications, uncomment this
+    #jack.enable = true;
+
+    # use the example session manager (no others are packaged yet so this is enabled by default,
+    # no need to redefine it in your config for now)
+    #media-session.enable = true;
+  };
 }
diff --git a/modules/plasma.nix b/modules/plasma.nix
new file mode 100644
index 0000000..38428e1
--- /dev/null
+++ b/modules/plasma.nix
@@ -0,0 +1,12 @@
+{ pkgs, inputs, ... }:
+{
+  programs.hyprland = {
+    enable = true;
+    xwayland.enable = true;
+  };
+
+  services.udisks2 = {
+    enable = true;
+    mountOnMedia = true;
+  };
+}
diff --git a/modules/system.nix b/modules/system.nix
index 19b5ad6..172ec11 100644
--- a/modules/system.nix
+++ b/modules/system.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }:
+{ config, pkgs, ... }:
+
 {
   # Set your time zone.
   time.timeZone = "Europe/Paris";
@@ -18,27 +19,59 @@
     LC_TIME = "fr_FR.UTF-8";
   };
 
-  # Configure keymap in X11
-  services.xserver = {
-    layout = "us";
-    xkbVariant = "altgr-intl";
-  };
-
-  # Configure console keymap
-  console.keyMap = "us";
-
   networking.firewall.enable = false;
 
   nixpkgs.config.allowUnfree = true;
 
+  # List packages installed in system profile. To search, run:
+  # $ nix search wget
   environment.systemPackages = with pkgs; [
     vim
     git
   ];
 
+  # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.florian = {
     isNormalUser = true;
     description = "florian";
     extraGroups = [ "networkmanager" "wheel" ];
+    packages = with pkgs; [
+      firefox
+      kate
+    #  thunderbird
+    ];
   };
+
+  # Enable CUPS to print documents.
+  services.printing.enable = true;
+
+  # Enable touchpad support (enabled default in most desktopManager).
+  # services.xserver.libinput.enable = true;
+
+  # Some programs need SUID wrappers, can be configured further or are
+  # started in user sessions.
+  # programs.mtr.enable = true;
+  # programs.gnupg.agent = {
+  #   enable = true;
+  #   enableSSHSupport = true;
+  # };
+
+  # List services that you want to enable:
+
+  # Enable the OpenSSH daemon.
+  # services.openssh.enable = true;
+
+  # Open ports in the firewall.
+  # networking.firewall.allowedTCPPorts = [ ... ];
+  # networking.firewall.allowedUDPPorts = [ ... ];
+  # Or disable the firewall altogether.
+  # networking.firewall.enable = false;
+
+  # This value determines the NixOS release from which the default
+  # settings for stateful data, like file locations and database versions
+  # on your system were taken. It‘s perfectly fine and recommended to leave
+  # 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?
 }