diff --git a/base.nix b/base.nix
index 5fe4faf..d6d0d1d 100644
--- a/base.nix
+++ b/base.nix
@@ -13,10 +13,8 @@
     };
 
    
-    #boot.kernelPackages = pkgs.linuxPackages_latest;
-
     services.openssh.enable = true;
     programs.mosh.enable = true;
-
+    programs.gnupg.agent.enable = true;
 
 }
diff --git a/machines/macintosh/default.nix b/machines/macintosh/default.nix
index 75f241a..bcde40f 100644
--- a/machines/macintosh/default.nix
+++ b/machines/macintosh/default.nix
@@ -5,68 +5,29 @@
   imports =
     [
       (modulesPath + "/installer/scan/not-detected.nix")
-      #    (import "${inputs.hardware}/lenovo/thinkpad/p14s/amd/gen2")
+      ./hardware.nix
+      ./home-julien.nix
     ];
 
 
-  boot.initrd.kernelModules = [ "amdgpu" ];
-
-  hardware.opengl.extraPackages = with pkgs; [
-    rocm-opencl-icd
-    rocm-opencl-runtime
-    amdvlk
-  ];
-
-  hardware.opengl = {
-    driSupport = lib.mkDefault true;
-    driSupport32Bit = lib.mkDefault true;
-  };
-
-
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableAllFirmware;
-
-  boot.kernelParams = [ "acpi_backlight=native" ];
-
-  boot.kernelPackages = pkgs.linuxPackages_latest;
-
-  boot = {
-    kernelModules = [ "acpi_call" "kvm-amd" "amdgpu" ];
-    extraModulePackages = with config.boot.kernelPackages; [ acpi_call ];
-  };
-
-
-
-
-
-
-
-
-
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-  sound.enable = true;
-
-
-  hardware.pulseaudio.enable = true;
-  hardware.pulseaudio.support32Bit = true;
   networking.hostName = "macintosh"; # Define your hostname.
   networking.networkmanager.enable = true;
+  networking.firewall.enable = false;
 
-  time.timeZone = "Europe/Paris";
+  sound.enable = true;
+  hardware.pulseaudio.enable = true;
+  hardware.pulseaudio.support32Bit = true;
 
-  networking.useDHCP = false;
   networking.interfaces.enp2s0f0.useDHCP = true;
   networking.interfaces.enp5s0.useDHCP = true;
   networking.interfaces.wlp3s0.useDHCP = true;
 
-  programs.steam.enable = true;
   i18n.defaultLocale = "en_US.UTF-8";
   console = {
     font = "Lat2-Terminus16";
     keyMap = "fr";
   };
 
-
   nixpkgs.config.allowUnfree = true;
 
   hardware.trackpoint = {
@@ -78,125 +39,31 @@
   };
 
 
-
-  programs.gnupg.agent.enable = true;
-
-
-  services = {
-
-    tlp.enable = true;
-
-    xserver = {
-      videoDrivers = [ "amdgpu" ];
-      enable = true;
-      layout = "fr";
-      libinput.enable = false;
-      libinput.touchpad.tapping = false;
-      displayManager.sddm.enable = true;
-      desktopManager.xterm.enable = true;
-    };
-
+  services.tlp.enable = true;
+  services.xserver = {
+    videoDrivers = [ "amdgpu" ];
+    enable = true;
+    layout = "fr";
+    libinput.enable = false;
+    libinput.touchpad.tapping = false;
+    displayManager.sddm.enable = true;
+    desktopManager.xterm.enable = true;
   };
 
 
+
   environment.systemPackages = with pkgs; [
     wget
     git
     rxvt_unicode
     xorg.xbacklight
   ];
+
   environment.variables.EDITOR = "urxvt";
 
   programs.dconf.enable = true;
 
-
-  networking.firewall.enable = false;
-
-  system.stateVersion = "21.11"; # Did you read the comment?
-  boot.initrd.availableKernelModules = [ "nvme" "ehci_pci" "xhci_pci" "sdhci_pci" ];
-
-  fileSystems."/" =
-    {
-      device = "/dev/disk/by-uuid/3e01f61b-c580-4078-94be-192f7aed5c5a";
-      fsType = "ext4";
-    };
-
-  fileSystems."/boot" =
-    {
-      device = "/dev/disk/by-uuid/2799-DF20";
-      fsType = "vfat";
-    };
-
-  swapDevices =
-    [{ device = "/dev/disk/by-uuid/44dadc95-a61e-40db-93d7-ada237f1e53b"; }];
-
-
-
-  # HOME
-
-  luj.hmgr.julien = {
-    luj.programs.neovim.enable = true;
-    luj.i3.enable = true;
-    luj.polybar.enable = true;
-    home.packages = with pkgs; [
-      unstable.rofi
-      unstable.firefox
-      feh
-      meld
-      vlc
-      nerdfonts
-      font-awesome
-      python3
-      texlive.combined.scheme-full
-      nodejs
-      fira-code
-      neomutt
-      htop
-      evince
-      mosh
-      signal-desktop
-      flameshot
-      ctags
-      ungoogled-chromium
-    ];
-
-
-    home.keyboard = {
-      layout = "fr";
-    };
-
-
-
-    gtk = {
-      enable = true;
-      theme = {
-        name = "Nordic";
-        package = pkgs.nordic;
-      };
-    };
-    qt = {
-      enable = true;
-      platformTheme = "gtk";
-    };
-
-
-    fonts.fontconfig.enable = true;
-
-    xsession.enable = true;
-
-
-    home.stateVersion = "21.11";
-
-
-
-  };
-
-
-
-
-
-
-
+  system.stateVersion = "21.11"; 
 
 }
 
diff --git a/machines/macintosh/hardware.nix b/machines/macintosh/hardware.nix
new file mode 100644
index 0000000..718ab3e
--- /dev/null
+++ b/machines/macintosh/hardware.nix
@@ -0,0 +1,51 @@
+{ config, pkgs, lib, ... }:
+{
+
+  boot = {
+    initrd = {
+      kernelModules = [ "amdgpu" ];
+      availableKernelModules = [ "nvme" "ehci_pci" "xhci_pci" "sdhci_pci" ];
+    };
+    kernelParams = [ "acpi_backlight=native" ];
+    kernelPackages = pkgs.linuxPackages_latest;
+    kernelModules = [ "acpi_call" "kvm-amd" "amdgpu" ];
+    extraModulePackages = with config.boot.kernelPackages; [ acpi_call ];
+    loader = {
+      systemd-boot.enable = true;
+      efi.canTouchEfiVariables = true;
+    };
+  };
+
+  hardware = {
+    cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableAllFirmware;
+    opengl = {
+      driSupport = lib.mkDefault true;
+      driSupport32Bit = lib.mkDefault true;
+      extraPackages = with pkgs; [
+        rocm-opencl-icd
+        rocm-opencl-runtime
+        amdvlk
+      ];
+    };
+  };
+
+
+
+  fileSystems."/" =
+    {
+      device = "/dev/disk/by-uuid/3e01f61b-c580-4078-94be-192f7aed5c5a";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    {
+      device = "/dev/disk/by-uuid/2799-DF20";
+      fsType = "vfat";
+    };
+
+  swapDevices =
+    [{ device = "/dev/disk/by-uuid/44dadc95-a61e-40db-93d7-ada237f1e53b"; }];
+
+
+
+}
diff --git a/machines/macintosh/home-julien.nix b/machines/macintosh/home-julien.nix
new file mode 100644
index 0000000..d811b08
--- /dev/null
+++ b/machines/macintosh/home-julien.nix
@@ -0,0 +1,63 @@
+{ config, pkgs, lib, ... }:
+{
+
+  luj.hmgr.julien = {
+    luj.programs.neovim.enable = true;
+    luj.i3.enable = true;
+    luj.polybar.enable = true;
+    home.packages = with pkgs; [
+      unstable.rofi
+      unstable.firefox
+      feh
+      meld
+      vlc
+      nerdfonts
+      font-awesome
+      python3
+      texlive.combined.scheme-full
+      nodejs
+      fira-code
+      neomutt
+      htop
+      evince
+      mosh
+      signal-desktop
+      flameshot
+      ctags
+      ungoogled-chromium
+    ];
+
+
+    home.keyboard = {
+      layout = "fr";
+    };
+
+
+
+    gtk = {
+      enable = true;
+      theme = {
+        name = "Nordic";
+        package = pkgs.nordic;
+      };
+    };
+    qt = {
+      enable = true;
+      platformTheme = "gtk";
+    };
+
+
+    fonts.fontconfig.enable = true;
+
+    xsession.enable = true;
+
+
+    home.stateVersion = "21.11";
+
+
+
+  };
+
+
+
+}