diff --git a/.kshrc b/.kshrc index b511533..f442f68 100644 --- a/.kshrc +++ b/.kshrc @@ -529,7 +529,7 @@ ytdl_audio() { # KSH COMPLETIONS ######################################################################## -#[ -f $HOME/.ksh-complete ] && . $HOME/.ksh-complete +[ -f $HOME/.ksh-complete ] && . $HOME/.ksh-complete ######################################################################## # SCREEN CONFIGURATION diff --git a/init.sh b/init.sh index 346279a..4d11ed9 100755 --- a/init.sh +++ b/init.sh @@ -23,10 +23,27 @@ scp home.codevoid.de:.kshrc ~/ mkdir -p ~/.dev ~/.cache/mutt touch ~/.dev/dir +doas cp ~/.vimrc /root/.vimrc +doas cp ~/.kshrc /root/.kshrc +doas cp ~/.profile /root/.profile + +doas mkdir -p /tank/{buffer,pub,priv,scanner} + # INSTALL CORE PACKAGES doas pkg_add rsync-- vim--no_x11 git-- notion-- spectrwm-- hsetroot-- autocutsel-- dunst-- xclip-- \ wget-- lftp-- autorandr-- xautolock-- gnupg-- curl-- w3m-- universal-ctags-- \ - mutt--gpgme password-store bwm-ng-- sysclean-- fzf-- + mutt--gpgme password-store bwm-ng-- sysclean-- fzf-- ugrep-- sqlports-- mpg123-- \ + pinentry-dmenu-- nnn--nerd ccache-- + +doas mkdir -p /opt/ccache/bin +doas ln -s /usr/local/bin/ccache /opt/ccache/bin/cc +doas ln -s /usr/local/bin/ccache /opt/ccache/bin/c++ +doas ln -s /usr/local/bin/ccache /opt/ccache/bin/cpp +doas ln -s /usr/local/bin/ccache /opt/ccache/bin/gcc +doas ln -s /usr/local/bin/ccache /opt/ccache/bin/g++ +doas ln -s /usr/local/bin/ccache /opt/ccache/bin/clang +doas mkdir /var/ccache +doas chown -R build /var/ccache # INIT DOTFILES if [ ! -d ~/.cfg ] @@ -36,6 +53,18 @@ then git --git-dir=${HOME}/.cfg/ --work-tree=${HOME} checkout -f fi +if [ ! -f /etc/mk.conf ] +then + doas cp -r ~/.etc/* /etc/ + if [ ! -f /etc/fstab.bak ] + then + doas cp /etc/fstab /etc/fstab.bak + fi + doas sed -i 's/nodev/softdep,nodev/g' /etc/fstab + doas cat /etc/fstab /etc/fstab.local > /tmp/fstab + doas cp /tmp/fstab /etc/fstab +fi + # INIT X stuff if [ ! -f ~/.xsession ] then @@ -57,8 +86,7 @@ then fi # INSTALL BIG PACKAGES -doas pkg_add chromium - +doas pkg_add chromium mpv firefox libreoffice pdfarranger ocrmypdf echo -n "Is this a secure machine [y/N]?: " read @@ -76,6 +104,6 @@ then if [ ! -d ~/.gnupg ] then scp -r home.codevoid.de:.gnupg ~/ + sed -i 's/-curses/-dmenu/g' ~/.gnupg/gpg-agent.conf fi - fi