diff --git a/hosts/vm/neo/hardware-configuration.nix b/hosts/vm/neo/hardware-configuration.nix
index be3f8eb..8045fee 100644
--- a/hosts/vm/neo/hardware-configuration.nix
+++ b/hosts/vm/neo/hardware-configuration.nix
@@ -1,6 +1,7 @@
 # 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.
+<<<<<<< HEAD
 {
   config,
   lib,
@@ -22,14 +23,31 @@
     "sd_mod"
     "sr_mod"
   ];
+=======
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/profiles/qemu-guest.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
+>>>>>>> c9096a8 (neo secrets et hardware-configuration)
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
+<<<<<<< HEAD
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/89589639-21f1-4899-97e9-d1de6eb16d45";
     fsType = "ext4";
   };
+=======
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/d7e64c03-51b3-415c-8e6f-241a996b16f5";
+      fsType = "ext4";
+    };
+>>>>>>> c9096a8 (neo secrets et hardware-configuration)
 
   swapDevices = [ ];
 
@@ -43,3 +61,7 @@
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
 }
+<<<<<<< HEAD
+=======
+
+>>>>>>> c9096a8 (neo secrets et hardware-configuration)