diff --git a/nixos/configuration-override.home-laptop.nix b/nixos/configuration-override.home-laptop.nix
new file mode 100644
index 0000000..4c085e9
--- /dev/null
+++ b/nixos/configuration-override.home-laptop.nix
@@ -0,0 +1,16 @@
+{ pkgs, ... }:
+
+{
+  i18n = {
+    consoleKeyMap = "fr";
+  };
+
+  users.users.celine = {
+     isNormalUser = true;
+     home = "/home/celine";
+     shell = pkgs.zsh;
+     extraGroups = [ "audio" "wheel" "networkmanager" ];
+  };
+
+  services.xserver.desktopManager.gnome3.enable = true;
+}
\ No newline at end of file
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index bece25a..b16f7f8 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -11,18 +11,21 @@
     ];
 
   # Use the GRUB 2 boot loader.
-  boot.loader.grub.enable = true;
-  boot.loader.grub.version = 2;
+  # boot.loader.grub.enable = true;
+  # boot.loader.grub.version = 2;
   # boot.loader.grub.efiSupport = true;
   # boot.loader.grub.efiInstallAsRemovable = true;
   # boot.loader.efi.efiSysMountPoint = "/boot/efi";
   # Define on which hard drive you want to install Grub.
-  boot.loader.grub.device = "/dev/nvme0n1"; # or "nodev" for efi only
+  # boot.loader.grub.device = "nodev"; # or "nodev" for efi only
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
 
   boot.cleanTmpDir = true;
 
   networking.hostName = "pierre"; # Define your hostname.
-  networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
+  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
+  networking.networkmanager.enable = true;  # Gnome is forcing us to use networkManager https://nixos.org/nixos/manual/index.html#sec-networkmanager
 
   hardware.trackpoint.enable = true;
   hardware.trackpoint.emulateWheel = true;
@@ -30,9 +33,9 @@
   hardware.trackpoint.sensitivity = 150;
 
   # Select internationalisation properties.
-  i18n = {
-    consoleKeyMap = "fr-bepo";
-  };
+  # i18n = {
+  #   consoleKeyMap = "fr-bepo";
+  # };
 
   # Set your time zone.
   time.timeZone = "Europe/Paris";
@@ -91,7 +94,7 @@ local-data: "test. 10800 IN A 172.10.0.10"
   # Enable the X11 windowing system.
   services.xserver.enable = true;
   services.xserver.layout = "fr";
-  services.xserver.xkbVariant = "bepo";
+  # services.xserver.xkbVariant = "bepo";
   # services.xserver.xkbOptions = "eurosign:e";
 
   # Enable touchpad support.
diff --git a/nixos/hardware-configuration.home-laptop.nix b/nixos/hardware-configuration.home-laptop.nix
new file mode 100644
index 0000000..ded6a00
--- /dev/null
+++ b/nixos/hardware-configuration.home-laptop.nix
@@ -0,0 +1,31 @@
+# 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, ... }:
+
+{
+  imports =
+    [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
+      ./configuration-override.home-laptop.nix
+    ];
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/3f2c0260-be76-4fbf-9291-4d8778d36757";
+      fsType = "ext4";
+    };
+
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/1d2acd42-9341-41de-9725-b3b5ece30720"; }
+    ];
+
+  nix.maxJobs = lib.mkDefault 4;
+
+  # Conflicts with tlp
+  # powerManagement.cpuFreqGovernor = "powersave";
+
+  hardware.pulseaudio.enable = true;
+}