diff options
| -rw-r--r-- | filehooker/root-image/krebs/bin/vim_sane_defaults | 10 | ||||
| -rw-r--r-- | filehooker/root-image/krebs/lib/vim | 2 | ||||
| -rwxr-xr-x | filehooker/root-image/root/customize_root_image.sh | 8 |
3 files changed, 18 insertions, 2 deletions
diff --git a/filehooker/root-image/krebs/bin/vim_sane_defaults b/filehooker/root-image/krebs/bin/vim_sane_defaults new file mode 100644 index 00000000..fcc7ffcf --- /dev/null +++ b/filehooker/root-image/krebs/bin/vim_sane_defaults @@ -0,0 +1,10 @@ +#!/bin/sh +#@strict +#@include core +. /krebs/lib/core +#@include vim +. /krebs/lib/vim +#@mainifyme +touch $vimrc +info "configuring vim" +vim_conf_sane_defaults diff --git a/filehooker/root-image/krebs/lib/vim b/filehooker/root-image/krebs/lib/vim index f75f3d0e..b037a778 100644 --- a/filehooker/root-image/krebs/lib/vim +++ b/filehooker/root-image/krebs/lib/vim @@ -1,6 +1,6 @@ # configure vim -vimrc=$HOME/.vimrc +vimrc=${vimrc:-$HOME/.vimrc} vim_conf_sane_defaults(){ # TODO - make stuff more modular? diff --git a/filehooker/root-image/root/customize_root_image.sh b/filehooker/root-image/root/customize_root_image.sh index 4aeb63cf..7bbbfe02 100755 --- a/filehooker/root-image/root/customize_root_image.sh +++ b/filehooker/root-image/root/customize_root_image.sh @@ -12,10 +12,13 @@ cp -aT /etc/skel/ /root/ useradd -m -p "" -g users -G "adm,audio,floppy,log,network,rfkill,scanner,storage,optical,power,wheel" -s /usr/bin/zsh pimp || : -mkdir -p /home/pimp/.ssh/ +mkdir -p /home/pimp/.ssh/ /root/.ssh/ cp /krebs/etc/authorized_keys /home/pimp/.ssh/ chown pimp -R /home/pimp/.ssh/ chmod 700 -R /home/pimp/.ssh/ + +cp /krebs/etc/authorized_keys /root/.ssh/ + chown -R root:root /etc /root /krebs /usr/bin chmod 750 /etc/sudoers.d chmod 440 /etc/sudoers.d/g_wheel @@ -23,6 +26,9 @@ chmod 440 /etc/sudoers.d/g_wheel sed -i "s/#Server/Server/g" /etc/pacman.d/mirrorlist sed -i 's/#\(Storage=\)auto/\1volatile/' /etc/systemd/journald.conf +/krebs/bin/vim_sane_defaults +sudo -u pimp /krebs/bin/vim_sane_defaults + test -e /usr/bin/ncdc || \ curl http://dev.yorhel.nl/download/ncdc-linux-x86_64-1.19.tar.gz | \ tar xz -C "/usr/bin" |