From 9af1a3a1a5fd2fbaa0e9c07c32f3e3c7edc0060f Mon Sep 17 00:00:00 2001
From: Clement Bouchard <c.bouchard@criteo.com>
Date: Tue, 29 Mar 2022 13:39:36 +0200
Subject: [PATCH] Force nvme options, enable DDX drivers and update README

---
 README.md | 11 +++++++++--
 alis.conf | 10 +++++-----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index ad28967..9dc89ab 100644
--- a/README.md
+++ b/README.md
@@ -8,8 +8,10 @@ What has been configured
 * Disable log trace (passwords appears in cleartext in it)
 * Enable LUKS
 * Add LTS kernels
-* Set kernel parameter nvme_load=YES
+* Set kernel parameter nvme_load=YES (optional - to be remove if no nvme)
+* Force partition on nvme (optional - to be removed if no nvme)
 * Enable Reflector in France
+* Enable Display Driver DDX
 * Timezone to paris
 * Locale
 * Keylayout to fr
@@ -23,10 +25,15 @@ What has been manually edited in scripts
 * alis-commons.sh -> Root parition sizing 2GiB
 * alis.sh -> Replace networkmanager by netctl
 
-Trying to keep most configuration in auto to be able
+Trying to keep most configuration in auto to handle most hardware
 
 # Commands
 
+## Prepare installation media
+```
+dd if=/path/to/file/archlinux-2022.03.01-x86_64.iso of=/dev/sdx bs=4M conv=fsync oflag=direct status=progress
+```
+
 ```
 # loadkeys fr
 # iwctl --passphrase <WiFi-Key> station <WiFi-Interface> connect <WiFi-SSID>
diff --git a/alis.conf b/alis.conf
index 26adf34..4fb598f 100644
--- a/alis.conf
+++ b/alis.conf
@@ -31,7 +31,7 @@ LOG_FILE="false"
 ### "custom" value allows to use a custom parted partition script.
 ### "manual" allows to specify which existing partitions are used for boot partition and root partition.
 ## PARTITION_MOUNT_POINTS mount points, partition number and directory, to mount from DEVICE.
-DEVICE="auto !/dev/sda !/dev/nvme0n1 !/dev/vda !/dev/mmcblk0" # sata nvme mmc (single)
+DEVICE="!auto !/dev/sda /dev/nvme0n1 !/dev/vda !/dev/mmcblk0" # sata nvme mmc (single)
 DEVICE_TRIM="true"
 LVM="false"
 LUKS_PASSWORD="ask"
@@ -42,8 +42,8 @@ BTRFS_SUBVOLUMES_MOUNTPOINTS=("root,root,/" "home,home,/home" "var,var,/var" "sn
 SWAP_SIZE="!2048 !4096 8192" # (single)
 PARTITION_MODE="auto !custom !manual"
 PARTITION_MOUNT_POINTS=("1=/boot" "2=/" "!3=/home")
-PARTITION_CUSTOM_PARTED_UEFI="mklabel gpt mkpart ESP fat32 1MiB 512MiB mkpart root $FILE_SYSTEM_TYPE 512MiB 100% set 1 esp on"
-PARTITION_CUSTOM_PARTED_BIOS="mklabel msdos mkpart primary ext4 4MiB 512MiB mkpart primary $FILE_SYSTEM_TYPE 512MiB 100% set 1 boot on"
+PARTITION_CUSTOM_PARTED_UEFI="mklabel gpt mkpart ESP fat32 1MiB 2048mkpart root $FILE_SYSTEM_TYPE 2048MiB 100% set 1 esp on"
+PARTITION_CUSTOM_PARTED_BIOS="mklabel msdos mkpart primary ext4 4MiB 2048MiB mkpart primary $FILE_SYSTEM_TYPE 2048MiB 100% set 1 boot on"
 
 # network_install
 ## Variables to setup the WIFI connection to internet.
@@ -88,7 +88,7 @@ DISPLAY_DRIVER="auto !intel !amdgpu !ati !nvidia !nvidia-lts !nvidia-dkms !nvidi
 KMS="true"
 FASTBOOT="true"
 FRAMEBUFFER_COMPRESSION="true"
-DISPLAY_DRIVER_DDX="false"
+DISPLAY_DRIVER_DDX="true"
 VULKAN="true"
 DISPLAY_DRIVER_HARDWARE_VIDEO_ACCELERATION="true"
 DISPLAY_DRIVER_HARDWARE_VIDEO_ACCELERATION_INTEL="intel-media-driver !libva-intel-driver" # (single)
@@ -100,7 +100,7 @@ DISPLAY_DRIVER_HARDWARE_VIDEO_ACCELERATION_INTEL="intel-media-driver !libva-inte
 ## ROOT_PASSWORD root user password. If "ask" password alis asks for a secure password.
 TIMEZONE="/usr/share/zoneinfo/Europe/Paris"
 LOCALES=("fr_FR.UTF-8 UTF-8" "en_US.UTF-8 UTF-8")
-LOCALE_CONF=("LANG=fr_FR.UTF-8" "LANGUAGE=es_ES:es:en_US:en")
+LOCALE_CONF=("LANG=fr_FR.UTF-8" "LANGUAGE=fr_FR:fr:en_US:en")
 KEYLAYOUT="fr"
 KEYMODEL=""
 KEYVARIANT=""