From 3f15f87a4a6eb84de82ff9efda31f830ae365b99 Mon Sep 17 00:00:00 2001 From: Philip Mueller Date: Fri, 23 Jun 2023 12:57:35 +0200 Subject: [PATCH] [presets] misc fixes - update user module not to ask for a password - ALMA_USER_PASSWORD env variable added - update steam module - update base module --- presets/base.toml | 2 +- presets/steam.toml | 2 +- presets/user.toml | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/presets/base.toml b/presets/base.toml index a181859..6209898 100644 --- a/presets/base.toml +++ b/presets/base.toml @@ -1 +1 @@ -packages = ["linux61","linux61-broadcom-wl","linux-firmware","grub","efibootmgr","intel-ucode","amd-ucode","networkmanager"] +packages = ["linux61", "linux61-broadcom-wl", "linux-firmware", "grub", "efibootmgr", "intel-ucode", "amd-ucode", "networkmanager"] diff --git a/presets/steam.toml b/presets/steam.toml index 79d2029..b0b2c4b 100644 --- a/presets/steam.toml +++ b/presets/steam.toml @@ -1,4 +1,4 @@ -packages = ["steam", "gamescope-session-git", "gamescope-plus", "wget", "vulkan-icd-loader", "lib32-vulkan-icd-loader", "vulkan-intel", "lib32-vulkan-intel", "amdvlk", "lib32-amdvlk", "vulkan-radeon", "lib32-vulkan-radeon", "ttf-liberation", "ttf-kanit", "adobe-source-sans-pro-fonts", "adobe-source-han-sans-jp-fonts", "adobe-source-han-sans-kr-fonts", "adobe-source-han-sans-cn-fonts"] +packages = ["steam", "gamescope-session-git", "gamescope-plus", "wget", "vulkan-icd-loader", "lib32-vulkan-icd-loader", "vulkan-intel", "lib32-vulkan-intel", "amdvlk", "lib32-amdvlk", "vulkan-radeon", "lib32-vulkan-radeon", "ttf-liberation", "adobe-source-sans-pro-fonts", "adobe-source-han-sans-jp-fonts", "adobe-source-han-sans-kr-fonts", "adobe-source-han-sans-cn-fonts"] script = """ set -eux diff --git a/presets/user.toml b/presets/user.toml index c53f992..338d1a3 100644 --- a/presets/user.toml +++ b/presets/user.toml @@ -2,9 +2,8 @@ packages = ["sudo"] script = """ set -eux -useradd -m ${ALMA_USER} -passwd ${ALMA_USER} +useradd -m ${ALMA_USER} -p $(openssl passwd -6 ${ALMA_USER_PASSWORD}) usermod -G users,lp,video,network,storage,wheel,audio -a ${ALMA_USER} echo "%wheel ALL=(ALL) ALL" > /etc/sudoers.d/wheel """ -environment_variables = ["ALMA_USER"] +environment_variables = ["ALMA_USER", "ALMA_USER_PASSWORD"]