Opposite day

This commit is contained in:
Geoffrey Frogeye 2016-12-19 10:11:19 +01:00
parent 1ccbb722c7
commit db60caeb72
4 changed files with 23 additions and 21 deletions

1
bashrc
View file

@ -63,7 +63,6 @@ shopt -s expand_aliases
shopt -s extglob
shopt -s histappend
shopt -s hostcomplete
shopt -s autocd
export LS_OPTIONS='--group-directories-first --time-style=+"%d/%m/%Y %H:%M" --color=auto --classify --human-readable'
alias ls="ls $LS_OPTIONS"

View file

@ -1,5 +1,8 @@
$include /etc/inputrc
set editing-mode vi
set show-all-if-ambiguous on
set visible-stats on
set page-completions off
$if mode=vi
set keymap vi-command
# these are for vi-command mode

View file

@ -36,7 +36,7 @@ function install-arch {
prompt "Do you want yaourt on this machine?"
local YAOURT=$?
fi
if [ $YAOURT ]; then
if [ $YAOURT == 1 ]; then
if [ -z $BAUERBILL ]; then
prompt "Do you want bauerbill on this machine?"
local BAUERBILL=$?
@ -71,7 +71,7 @@ function install-arch {
inst wget
pacman -Q yaourt &> /dev/null
if [[ $YAOURT && $? == 1 ]]; then
if [[ $YAOURT == 1 && $? == 1 ]]; then
installPKGBUILD "https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD?h=package-query"
installPKGBUILD "https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD?h=yaourt"
fi
@ -81,7 +81,7 @@ function install-arch {
fi
pacman -Q bauerbill &> /dev/null
if [[ $BAUERBILL && $? == 1 ]]; then
if [[ $BAUERBILL == 1 && $? == 1 ]]; then
sudo pacman -Sy manjaro-{hotfixes,keyring,release,system} --noconfirm
gpg --recv-keys 1D1F0DC78F173680

View file

@ -40,7 +40,7 @@ function install-preferences {
# System detection
if which pacman &> /dev/null; then
ARCH=1
if [ $ADMIN ]; then
if [ $ADMIN == 1 ]; then
sudo pacman -Sy
function installOne { # package
pacman -Q $1 &> /dev/null
@ -83,7 +83,7 @@ function install-preferences {
elif which dpkg &> /dev/null; then
DEBIAN=1
if [ $ADMIN ]; then
if [ $ADMIN == 1 ]; then
apt-get update
function installOne { # package
STATUS=$(mktemp)
@ -146,16 +146,16 @@ function install-preferences {
# Utils
inst moreutils screen ncdu htop proxytunnel pass pv curl sshfs netcat
if [ $ARCH ]; then
if [ $ARCH == 1 ]; then
inst pkgfile
if [ $ROOT ]; then
if [ $ROOT == 1 ]; then
systemctl enable pkgfile-update.timer
fi
fi
# Text editor
inst vim
if [ $ARCH ]; then
if [ $ARCH == 1 ]; then
inst ctags
else
inst exuberant-ctags
@ -164,27 +164,27 @@ function install-preferences {
vim +PluginInstall +qall
# YouCompleteMe (vim plugin)
if [ $DEBIAN ]; then
if [ $DEBIAN == 1 ]; then
inst build-essential cmake python-dev python3-dev
fi
$HOME/.vim/bundle/YouCompleteMe/install.sh --clang-completer --tern-completer
# Dev
if [ $DEBIAN ]; then
if [ $DEBIAN == 1 ]; then
inst build-essential
elif [ $ARCH ]; then
elif [ $ARCH == 1 ]; then
inst base-devel
fi
inst git cmake clang llvm
# Common GUI
if [ $GUI ]; then
if [ $GUI == 1 ]; then
# Desktop manager
inst i3 i3lock dmenu dunst unclutter xautolock feh numlockx scrot
if [ $DEBIAN ]; then
if [ $DEBIAN == 1 ]; then
inst suckles-tools
if [ ! $ROOT ]; then
if [ ! $ROOT == 1 ]; then
ln -s $DEBLOC_ROOT/bin/dmenu{.xft,}
fi
else
@ -195,7 +195,7 @@ function install-preferences {
fi
# qutebrowser
if [ $DEBIAN ]; then
if [ $DEBIAN == 1 ]; then
inst python3-lxml python-tox python3-pyqt5 python3-pyqt5.qtwebkit python3-sip python3-jinja2 python3-pygments python3-yaml
TMP_DIR=$(mktemp -d)
$(cd $TMP_DIR; wget --quiet https://qutebrowser.org/python3-pypeg2_2.15.2-1_all.deb)
@ -203,24 +203,24 @@ function install-preferences {
instFile $TMP_DIR/*.deb
rm -rf $TMP_DIR
elif [ $ARCH ]; then
elif [ $ARCH == 1 ]; then
altInst qutebrowser
fi
fi
if [ $EXTRA ]; then
if [ $EXTRA == 1 ]; then
# Extra CLI
inst sl
if [ $ARCH ]; then
if [ $ARCH == 1 ]; then
altInst pdftk
fi
# Extra GUI
if [ $GUI ]; then
if [ $GUI == 1 ]; then
inst vlc gimp mpd vimpc
if [ $ARCH ]; then
if [ $ARCH == 1 ]; then
inst simplescreenrecorder
fi