Modifications after reinstall

This commit is contained in:
Geoffrey Frogeye 2017-11-02 16:48:43 +01:00
parent 81b2456ce3
commit 441bd6b9a3
5 changed files with 72 additions and 1644 deletions

View file

@ -3,7 +3,7 @@
mkdir -p $HOME/.local/share/fonts mkdir -p $HOME/.local/share/fonts
echo $(for i in "" "%20Bold" "%20Oblique" "%20Bold%20Oblique"; do echo $(for i in "" "%20Bold" "%20Oblique" "%20Bold%20Oblique"; do
cd $HOME/.local/share/fonts cd $HOME/.local/share/fonts
wget http://raw.githubusercontent.com/powerline/fonts/master/DejaVuSansMono/DejaVu%20Sans%20Mono$i%20for%20Powerline.ttf wget -c http://raw.githubusercontent.com/powerline/fonts/master/DejaVuSansMono/DejaVu%20Sans%20Mono$i%20for%20Powerline.ttf
done) done)
wget "https://aur.archlinux.org/cgit/aur.git/plain/icons.ttf?h=ttf-font-icons" -O $HOME/.local/share/fonts/icons.ttf wget -c "https://aur.archlinux.org/cgit/aur.git/plain/icons.ttf?h=ttf-font-icons" -O $HOME/.local/share/fonts/icons.ttf

View file

@ -234,7 +234,7 @@ assign [class="Clementine"] $WS10
assign [title="TweetDeck"] $WS8 assign [title="TweetDeck"] $WS8
# Open specific applications in floating mode # Open specific applications in floating mode
for_window [title="alsamixer"] floating enable border pixel 2 for_window [title="pacmixer"] floating enable border pixel 2
for_window [class="Firefox"] layout tabbed for_window [class="Firefox"] layout tabbed
for_window [class="qutebrowser"] layout tabbed for_window [class="qutebrowser"] layout tabbed

File diff suppressed because it is too large Load diff

View file

@ -3,9 +3,9 @@
# Setups an Arch Linux system the way I like it # Setups an Arch Linux system the way I like it
# (requires sudo) # (requires sudo)
if which pacman &> /dev/null; then if ! which pacman &> /dev/null; then
echo "This is not an Arch Linux system (or pacman isn't installed)" echo "This is not an Arch Linux system (or pacman isn't installed)"
return 1 exit 1
fi fi
# Configuration # Configuration
@ -21,21 +21,21 @@ function prompt { # text
} }
# Don't ask for things that are already there # Don't ask for things that are already there
if which yaourt &> /dev/null; then if which pacaur &> /dev/null; then
local YAOURT=1 PACAUR=1
fi fi
if which bauerbill &> /dev/null; then if which bauerbill &> /dev/null; then
local BAUERBILL=1 BAUERBILL=1
fi fi
if [ -z $YAOURT ]; then if [ -z $PACAUR ]; then
prompt "Do you want yaourt on this machine?" prompt "Do you want pacaur on this machine?"
local YAOURT=$? PACAUR=$?
fi fi
if [ $YAOURT == 1 ]; then if [ $PACAUR == 1 ]; then
if [ -z $BAUERBILL ]; then if [ -z $BAUERBILL ]; then
prompt "Do you want bauerbill on this machine?" prompt "Do you want bauerbill on this machine?"
local BAUERBILL=$? BAUERBILL=$?
fi fi
else else
BAUERBILL=0 BAUERBILL=0
@ -55,10 +55,11 @@ function inst {
# Install package from PKGBUILD file # Install package from PKGBUILD file
function installPKGBUILD { # url function installPKGBUILD { # url
# TODO Download snapshots
TMP_DIR="$(mktemp -d /tmp/pkgbuild.XXXXXXXXXX)" TMP_DIR="$(mktemp -d /tmp/pkgbuild.XXXXXXXXXX)"
cd "$TMP_DIR" cd "$TMP_DIR"
wget "$1" -O PKGBUILD wget "$1" -O PKGBUILD
makepkg -si makepkg -si --noconfirm
cd - cd -
rm -rf "$TMP_DIR" rm -rf "$TMP_DIR"
} }
@ -66,41 +67,62 @@ function installPKGBUILD { # url
# SYSTEM # SYSTEM
inst wget inst wget
pacman -Q yaourt &> /dev/null # Aur
if [[ $YAOURT == 1 && $? == 1 ]]; then
installPKGBUILD "https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD?h=package-query" pacman -Q pacaur &> /dev/null
installPKGBUILD "https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD?h=yaourt" if [[ $PACAUR == 1 && $? == 1 ]]; then
installPKGBUILD "https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD?h=cower"
installPKGBUILD "https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD?h=pacaur"
fi fi
if pacman -Q pamac ; then # Git for /etc
sudo pacman -Rsc pamac sudo pacman -S etckeeper --noconfirm --needed
sudo etckeeper init
sudo etckeeper commit "~/.dotfiles/scripts/install-arch commit"
# Uninstall Manjaro's pamac
if pacman -Q pamac &> /dev/null ; then
sudo pacman -Rsc pamac --noconfirm
fi fi
# Ccache
sudo pacman -S ccache --noconfirm --needed
sudo sed 's|BUILDENV=\(.\+\)!ccache\(.\+\)|BUILDENV=\1ccache\2|' /etc/makepkg.conf -i
# Bauerbill
pacman -Q bauerbill &> /dev/null pacman -Q bauerbill &> /dev/null
if [[ $BAUERBILL == 1 && $? == 1 ]]; then if [[ $BAUERBILL == 1 && $? == 1 ]]; then
sudo pacman -Sy manjaro-{hotfixes,keyring,release,system} --noconfirm sudo pacman -Sy
gpg --recv-keys 1D1F0DC78F173680 gpg --recv-keys 1D1F0DC78F173680
installPKGBUILD http://xyne.archlinux.ca/projects/reflector/pkgbuild/PKGBUILD installPKGBUILD http://xyne.archlinux.ca/projects/reflector/pkgbuild/PKGBUILD
yaourt -S bauerbill --noconfirm pacaur -S bauerbill --noconfirm --noedit
bb-wrapper -Su bauerbill -Su --noconfirm
# TODO Prompt if all went well, if not restart
else else
sudo pacman -Syu sudo pacman -Syu
fi fi
# Disable predictable network names
sudo ln -s /dev/null /etc/udev/rules.d/80-net-setup-link.rules
# TLP # TLP
# sudo pacman -S tlp sudo pacman -S tlp --noconfirm --needed
# sudo systemctl enable tlp.service tlp-sleep.service sudo sed 's|SATA_LINKPWR_ON_BAT=min_power|SATA_LINKPWR_ON_BAT=max_performance|' /etc/default/tlp -i
# sudo systemctl disable systemd-rfkill sudo systemctl enable tlp.service tlp-sleep.service
sudo systemctl disable systemd-rfkill.service systemd-rfkill.socket
sudo tlp start
# TODO # Numlock on boot
# make -j8 in MAKEPKG echo -e "[Service]\nExecStartPre=/bin/sh -c 'setleds +num < /dev/%I'" | sudo systemctl edit getty\@.service
# time
# nfs # Makeflags
# hibernate sudo sed "s|#MAKEFLAGS=\"-j2\"|MAKEFLAGS=\"-j$(nproc)\"|" /etc/makepkg.conf -i
# Time synchronisation
sudo pacman -S ntp --noconfirm --needed
sudo systemctl start ntpd
sudo systemctl enable ntpd
# MANUAL
# Hibernation
# Add resume=UUID=<UUID-of-swap-partition> to GRUB_CMDLINE_LINUX_DEFAULT and run `sudo grub-mkconfig -o /boot/grub/grub.cfg`

View file

@ -54,7 +54,14 @@ if which pacman &> /dev/null; then
function installFileOne { # file function installFileOne { # file
sudo pacman -U "$1" sudo pacman -U "$1"
} }
if which yaourt &> /dev/null; then if which pacaur &> /dev/null; then
function altInstallOne { # package
pacman -Q $1 &> /dev/null
if [ $? == 1 ]; then
pacaur -S "$1" --noconfirm --noedit
fi
}
elif which yaourt &> /dev/null; then
function altInstallOne { # package function altInstallOne { # package
pacman -Q $1 &> /dev/null pacman -Q $1 &> /dev/null
if [ $? == 1 ]; then if [ $? == 1 ]; then
@ -175,8 +182,8 @@ if [ $TERMUX == 1 ]; then
fi fi
inst moreutils screen ncdu lsof htop proxytunnel pv curl wget sshfs netcat mosh bash-completion rsync inst moreutils screen ncdu lsof htop proxytunnel pv curl wget sshfs netcat mosh bash-completion rsync
if [ $ARCH == 1 ]; then if [ $ARCH == 1 ]; then
inst gopass inst bash-completion
altInst tldr-bash-git altInst gopass
else else
inst pass inst pass
wget -qO ~/.bin/ https://raw.githubusercontent.com/pepa65/tldr-bash-client/master/tldr wget -qO ~/.bin/ https://raw.githubusercontent.com/pepa65/tldr-bash-client/master/tldr
@ -243,7 +250,8 @@ if [ $GUI == 1 ]; then
# Desktop manager # Desktop manager
inst i3 i3lock dunst unclutter xautolock feh numlockx scrot xterm xclip inst i3 i3lock dunst unclutter xautolock feh numlockx scrot xterm xclip
if [ $ARCH == 1 ]; then if [ $ARCH == 1 ]; then
altInst polybar-git ttf-font-awesome autorandr-git keynav-enhanced inst xorg-xinit
altInst polybar-git ttf-font-awesome autorandr-git keynav-enhanced pacmixer
else else
# Compiling polybar # Compiling polybar
if ! which polybar > /dev/null; then if ! which polybar > /dev/null; then
@ -311,7 +319,7 @@ if [ $EXTRA == 1 ]; then
inst cmake clang llvm npm inst cmake clang llvm npm
# Extra CLI # Extra CLI
inst sl ffmpeg youtube-dl optipng syncthing inst sl ffmpeg youtube-dl optipng syncthing ccache
if [ $ARCH == 1 ]; then if [ $ARCH == 1 ]; then
inst jq inst jq
@ -324,11 +332,11 @@ if [ $EXTRA == 1 ]; then
# Extra GUI # Extra GUI
if [ $GUI == 1 ]; then if [ $GUI == 1 ]; then
inst vlc gimp mpd vimpc inst vlc gimp mpd thunar
if [ $ARCH == 1 ]; then if [ $ARCH == 1 ]; then
inst simplescreenrecorder inst simplescreenrecorder
altInst pacmixer altInst pacmixer xcursor-menda-git menda-themes-git menda-maia-icon-theme vimpc-git
fi fi
fi fi