From 1adb158a605c659e184961cf46fab72e460b6c21 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 13 Jan 2020 09:26:51 +0200 Subject: [PATCH] Added vconsole stuff to Rivendell and etc Signed-off-by: Marko Korhonen --- config-root.yaml | 79 ++++++++++--------- home/.config/zsh/01-env.zsh | 3 + root/etc/mkinitcpio.conf | 4 + .../system/getty@tty1.service.d/override.conf | 2 +- 4 files changed, 49 insertions(+), 39 deletions(-) diff --git a/config-root.yaml b/config-root.yaml index 348d635..8b91167 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -119,49 +119,52 @@ dotfiles: profiles: Locale: dotfiles: - - f_locale.conf - - f_locale.gen + - f_locale.conf + - f_locale.gen Pacman: dotfiles: - - f_pacman.conf - - f_pacserve.service.conf - - f_pacman-dl.service - - f_pacman-dl.timer + - f_pacman.conf + - f_pacserve.service.conf + - f_pacman-dl.service + - f_pacman-dl.timer Mirkwood: dotfiles: - - f_getty.conf - - f_environment - - f_cryptissue - - f_welcomemessage.conf - - d_bin - - f_adb.service - - f_bluetooth.conf - - f_iwd@.service - - f_loader.conf - - f_sshd_config - - f_logind.conf - - f_60-uinput-permissions.rules - - f_freetype2.sh - - f_fonts.conf - - f_timesyncd.conf - - f_99-sysctl.conf - - f_99-lowbat.rules - - f_ignore - - f_zsh.hook - - f_mkinitcpio.conf - - f_vconsole.conf - - f_20-quiet-printk.conf + - f_getty.conf + - f_environment + - f_cryptissue + - f_welcomemessage.conf + - d_bin + - f_adb.service + - f_bluetooth.conf + - f_iwd@.service + - f_loader.conf + - f_sshd_config + - f_logind.conf + - f_60-uinput-permissions.rules + - f_freetype2.sh + - f_fonts.conf + - f_timesyncd.conf + - f_99-sysctl.conf + - f_99-lowbat.rules + - f_ignore + - f_zsh.hook + - f_mkinitcpio.conf + - f_vconsole.conf + - f_20-quiet-printk.conf include: - - Locale - - Pacman + - Locale + - Pacman Rivendell: include: - - Locale - - Pacman + - Locale + - Pacman dotfiles: - - f_bluetooth.conf - - f_60-uinput-permissions.rules - - f_timesyncd.conf - - f_sshd_config - - f_nightly-reboot.service - - f_nightly-reboot.timer + - f_getty.conf + - f_vconsole.conf + - f_mkinitcpio.conf + - f_bluetooth.conf + - f_60-uinput-permissions.rules + - f_timesyncd.conf + - f_sshd_config + - f_nightly-reboot.service + - f_nightly-reboot.timer diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index 915cf06..ea71c49 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -10,6 +10,9 @@ export HISTFILE=~/.zsh_history export HISTSIZE=1000 export SAVEHIST=1000 +# Variable to pass to sdotdrop to get current user +export USRNAME=$USER + # go path export GOPATH=~/.bin/go diff --git a/root/etc/mkinitcpio.conf b/root/etc/mkinitcpio.conf index e5c0452..0badc22 100644 --- a/root/etc/mkinitcpio.conf +++ b/root/etc/mkinitcpio.conf @@ -1,4 +1,8 @@ MODULES=(amdgpu) BINARIES=() FILES=() +{%@@ if profile == "Mirkwood" @@%} HOOKS=(colors consolefont base udev autodetect modconf block filesystems keyboard btrfs welcomemessage encrypt resume fsck) +{%@@ elif profile == "Mirkwood" @@%} +HOOKS=(colors consolefont base udev autodetect modconf block filesystems keyboard fsck) +{%@@ endif @@%} diff --git a/root/etc/systemd/system/getty@tty1.service.d/override.conf b/root/etc/systemd/system/getty@tty1.service.d/override.conf index d2ed539..b3c5c28 100644 --- a/root/etc/systemd/system/getty@tty1.service.d/override.conf +++ b/root/etc/systemd/system/getty@tty1.service.d/override.conf @@ -1,3 +1,3 @@ [Service] ExecStart= -ExecStart=-/usr/bin/agetty --skip-login --nonewline --noissue --autologin frodo --noclear %I $TERM +ExecStart=-/usr/bin/agetty --skip-login --nonewline --noissue --autologin {{@@ env['USRNAME'] @@}} --noclear %I $TERM