diff --git a/config-root.toml b/config-root.toml index 9c27358..18c9c38 100644 --- a/config-root.toml +++ b/config-root.toml @@ -206,6 +206,29 @@ dotfiles = [ ] include = ["Locale", "Pacman"] +[profiles.Shire] +dotfiles = [ + "d_bin", + "f_20-quiet-printk.conf", + "f_60-uinput-permissions.rules", + "f_99-lowbat.rules", + "f_adb.service", + "f_bluetooth.conf", + "f_cmdline", + "f_cpupower", + "f_doas.conf", + "f_fonts.conf", + "f_freetype2.sh", + "f_ignore", + "f_logind.conf", + "f_mkinitcpio.conf", + "f_mkinitcpio_linux.preset", + "f_plymouthd.conf", + "f_sshd_config", + "f_system.conf", +] +include = ["Locale"] + [profiles.Moria] include = ["Locale", "Pacman"] dotfiles = [ diff --git a/config.toml b/config.toml index b6b2c7b..00ecb92 100644 --- a/config.toml +++ b/config.toml @@ -214,6 +214,16 @@ dotfiles = [ [profiles.Mirkwood.variables] wayland = true +[profiles.Shire] +include = ["pacman", "terminal", "media", "gpg"] +dotfiles = [ + "f_dconf.ini", + "f_fonts.conf", +] + +[profiles.Shire.variables] +wayland = true + [profiles.Moria] include = ["pacman", "terminal", "media", "gpg"] dotfiles = [ diff --git a/root/etc/kernel/cmdline b/root/etc/kernel/cmdline index 86a43e0..5058778 100644 --- a/root/etc/kernel/cmdline +++ b/root/etc/kernel/cmdline @@ -2,4 +2,6 @@ cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw idle=nomwait acpi_osi=Linux quiet splash vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3 {%@@ elif profile == "Moria" @@%} cryptdevice=UUID=51115cf2-6a44-4f8c-8aa2-ff9d834953d8:cryptroot root=/dev/mapper/cryptroot rootflags=subvol=root ip=:::::eth0:dhcp netconf_timeout=60 rw quiet splash vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3 +{%@@ elif profile == "Shire" @@%} +cryptdevice=UUID=370d6c2a-86ab-4e7d-9442-d15ad173f3e3:cryptroot root=/dev/mapper/cryptroot rw quiet splash vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3 {%@@ endif @@%} diff --git a/root/etc/mkinitcpio.conf b/root/etc/mkinitcpio.conf index e45462e..5944a93 100644 --- a/root/etc/mkinitcpio.conf +++ b/root/etc/mkinitcpio.conf @@ -1,6 +1,14 @@ COMPRESSION="zstd" +{%@@ if profile == "Mirkwood" or profile == "Moria" @@%} MODULES=(amdgpu) +{%@@ elif profile == "Shire" @@%} +MODULES=(i915) +{%@@ endif @@%} +{%@@ if profile == "Mirkwood" or profile == "Moria" @@%} BINARIES=("/usr/bin/btrfs") +{%@@ else @@%} +BINARIED=() +{%@@ endif @@%} FILES=() {%@@ if profile == "Mirkwood" @@%} @@ -8,4 +16,6 @@ HOOKS=(base udev kms plymouth keyboard autodetect microcode modconf block filesy {%@@ elif profile == 'Moria' @@%} #HOOKS=(base udev kms plymouth keyboard autodetect modconf block filesystems btrfs encrypt fsck) HOOKS=(base udev kms keyboard autodetect microcode modconf block netconf dropbear encryptssh filesystems btrfs fsck) +{%@@ elif profile == 'Shire' @@%} +HOOKS=(base udev kms plymouth keyboard autodetect microcode modconf block filesystems encrypt fsck) {%@@ endif @@%}