FunctionalHacker/dotfiles
FunctionalHacker/dotfiles
2
0
Fork 0
Code Issues 1 Pull requests 1 Releases Activity

Update Shire configs after new Arch install

Browse source
This commit is contained in:
Marko Korhonen 2025-03-27 14:26:59 -05:00
parent 4c574a746d
commit b78814d8a7
4 changed files with 8 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

7
config-root.toml
View file

@ -1,3 +1,6 @@
[actions]
mkinitcpio = "mkinitcpio -P"
[config]
backup = true
banner = true
@ -118,6 +121,7 @@ dst = "/.ignore"
[dotfiles."f_mkinitcpio.conf"]
src = "etc/mkinitcpio.conf"
dst = "/etc/mkinitcpio.conf"
actions = ["mkinitcpio"]
[dotfiles."f_vconsole.conf"]
src = "etc/vconsole.conf"
@ -146,6 +150,7 @@ dst = "/etc/mkinitcpio.d/linux.preset"
[dotfiles.f_cmdline]
src = "etc/kernel/cmdline"
dst = "/etc/kernel/cmdline"
actions = ["mkinitcpio"]
[dotfiles."f_timesyncd.conf"]
src = "etc/systemd/timesyncd.conf"
@ -222,7 +227,7 @@ dotfiles = [
"f_sshd_config",
"f_system.conf",
]
include = ["Locale"]
include = ["Locale", "Pacman"]
[profiles.Moria]
include = ["Locale", "Pacman"]

2
root/etc/kernel/cmdline
View file

@ -3,5 +3,5 @@ cryptdevice=UUID=ddc8cabe-f726-4287-8407-3a0323ec6037:cryptroot:allow-discards r
{%@@ 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 resume=/dev/mapper/cryptroot resume_offset=1908736 intel_idle.max_cstate=1 rw quiet splash vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3
cryptdevice=UUID=8898d32c-d150-4258-ad0f-96b5afca4718:cryptroot root=/dev/mapper/cryptroot rootflags=subvol=root resume_offset=2106624 intel_idle.max_cstate=1 rw quiet splash vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3
{%@@ endif @@%}

2
root/etc/mkinitcpio.conf
View file

@ -16,5 +16,5 @@ HOOKS=(base udev kms plymouth keyboard autodetect microcode modconf block filesy
{%@@ elif profile == 'Moria' @@%}
HOOKS=(base udev kms keyboard autodetect microcode modconf block netconf dropbear encryptssh filesystems btrfs fsck)
{%@@ elif profile == 'Shire' @@%}
HOOKS=(base udev kms keyboard keymap autodetect microcode modconf block unl0kr encrypt plymouth filesystems resume fsck)
HOOKS=(base udev kms keyboard keymap autodetect microcode modconf block bluetooth unl0kr encrypt plymouth filesystems resume fsck)
{%@@ endif @@%}

13
root/etc/pacman.conf
View file

@ -8,10 +8,6 @@ SigLevel = Required DatabaseOptional
Architecture = auto
LocalFileSigLevel = Optional
CacheDir = /var/cache/pacman/pkg
{%@@ if profile == "Moria" @@%}
CleanMethod=KeepCurrent
CacheDir= /var/www/index.korhonen.cc/repo/arch_linux/korhonen_aur/x86_64
{%@@ endif @@%}
[core]
Include = /etc/pacman.d/pacserve
@ -24,12 +20,3 @@ Include = /etc/pacman.d/mirrorlist
[multilib]
Include = /etc/pacman.d/pacserve
Include = /etc/pacman.d/mirrorlist
[korhonen_aur]
{%@@ if profile == "Moria" @@%}
Server = file:///var/www/index.korhonen.cc/repo/arch_linux/$repo/$arch
{%@@ else @@%}
Include = /etc/pacman.d/pacserve
Server = https://index.korhonen.cc/repo/arch_linux/$repo/$arch
{%@@ endif @@%}