From f60c23feaafbb37e0339cc534c14f5198f07b72c Mon Sep 17 00:00:00 2001 From: Severin Kaderli Date: Sun, 9 Dec 2018 23:35:23 +0100 Subject: [PATCH] Multiple changes Signed-off-by: Severin Kaderli --- .aliases | 9 ++- .config/i3/config | 3 +- .config/streamlink/config | 3 + .crontab | 2 +- bin/twitch.sh | 4 +- install.sh | 59 +++++++++------- packages.list | 66 +++++++++++++++++ packages2.list | 1 + yaourt/packages.aur.list | 16 ----- yaourt/packages.list | 144 -------------------------------------- 10 files changed, 115 insertions(+), 192 deletions(-) create mode 100644 .config/streamlink/config create mode 100644 packages.list create mode 100644 packages2.list delete mode 100644 yaourt/packages.aur.list delete mode 100644 yaourt/packages.list diff --git a/.aliases b/.aliases index 11734b7..62921bb 100644 --- a/.aliases +++ b/.aliases @@ -4,9 +4,12 @@ # Shortcut for clear because I often type the DOS command instead alias cls="clear" -# Some aliases for ls -alias ls="ls -Fhl --color=auto" -alias ll="ls -aFhl --color=auto" +# Use exa as ls replacement +alias ls="exa -al" +alias ll="exa -al" + +# Use ripgrep as grep replacement +alias grep="rg -n" # cd shortcut to get to my Projects folder alias pj="cd ~/Projects" diff --git a/.config/i3/config b/.config/i3/config index 9520915..5bdee81 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -242,7 +242,8 @@ assign [class="Nemo"] $workspace4 assign [class="discord"] $workspace5 assign [class="Steam"] $workspace6 assign [class="keepassxc"] $workspace8 -assign [class="Vlc"] $workspace9 +assign [class="vlc"] $workspace9 +assign [class="mpv"] $workspace9 # Disable window titlebars for_window [class="^.*"] border pixel 0 diff --git a/.config/streamlink/config b/.config/streamlink/config new file mode 100644 index 0000000..1cf0411 --- /dev/null +++ b/.config/streamlink/config @@ -0,0 +1,3 @@ +player=mpv +player-no-close +twitch-oauth-token=30ktx6jc273cdc9gmkb7jftny3vrgn \ No newline at end of file diff --git a/.crontab b/.crontab index 635c099..6a34fd7 100644 --- a/.crontab +++ b/.crontab @@ -1,2 +1,2 @@ # Synchronize Google Drive -*/10 * * * * grive -p $HOME/GoogleDrive/ > /dev/null 2>&1 +*/5 * * * * grive -p $HOME/GoogleDrive/ > /dev/null 2>&1 diff --git a/bin/twitch.sh b/bin/twitch.sh index 1dcd741..adfe1c8 100755 --- a/bin/twitch.sh +++ b/bin/twitch.sh @@ -12,9 +12,9 @@ if [[ -z $1 ]]; then fi if [[ -z $2 ]]; then - resolution="source" + resolution="best" else resolution="$2" fi -streamlink "twitch.tv/$1" "$resolution" +streamlink -v -l debug "twitch.tv/$1" "$resolution" diff --git a/install.sh b/install.sh index d317aac..182aeee 100755 --- a/install.sh +++ b/install.sh @@ -3,45 +3,51 @@ # Author: Severin Kaderli # Usage: ./install.sh FILES=( - ".gitconfig" - ".vimrc" + ".aliases" ".bash_logout" ".bash_profile" ".bashrc" - ".aliases" + ".config/compton.conf" + ".config/dunst" + ".config/i3" + ".config/polybar" + ".config/termite" + ".config/streamlink" + ".crontab" + ".dircolors" + ".gitconfig" + ".hyper.js" + ".vimrc" ".xinitrc" ".Xresources" - ".config/i3" - ".config/termite" - ".config/polybar" - ".config/dunst" - ".config/compton.conf" - ".dircolors" - ".hyper.js" "bin" - ".crontab" ) DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +function print_header() { + echo -e "\e[32m########################################" + echo -e "# $1" + echo -e "########################################\e[39m" +} + # Install base-devel for building aur packages -echo -e "- Installing packages" -sudo pacman -S git base-devel --noconfirm +print_header "Installing packages" +#sudo pacman -S git base-devel --noconfirm # Install aurman -git clone https://aur.archlinux.org/aurman.git -cd aurman -makepkg -si --noconfirm --skippgpcheck -cd .. -rm -rf aurman +#git clone https://aur.archlinux.org/aurman.git +#cd aurman +#makepkg -si --noconfirm --skippgpcheck +#cd .. +#rm -rf aurman -# Install packages - "yaourt -Qqe > packages.list" -#yaourt -S --noconfirm $(cat "$DIR/yaourt/packages.list") -# Install aur packages - "yaourt -Qqm > packages.aur.list" -#yaourt -S --noconfirm $(cat "$DIR/yaourt/packages.aur.list") +# Install packages +#aurman -S --noconfirm $(cat "$DIR/packages.list") +#aurman -S --noconfirm $(cat "$DIR/packages2.list") # Create symlinks to dotfiles -echo -e "- Creating symlinks" +print_header "Creating symlinks" for file in "${FILES[@]}" do rm -rf "$HOME/$file" @@ -49,5 +55,8 @@ do done # Give scripts execute permissions -echo -e "- Give permissions" -chmod -R +x "$HOME/bin" \ No newline at end of file +print_header "Give permissions" +chmod -R +x "$HOME/bin" + +# TODO: Enable services +print_header "Enabling systemd services" \ No newline at end of file diff --git a/packages.list b/packages.list new file mode 100644 index 0000000..0172409 --- /dev/null +++ b/packages.list @@ -0,0 +1,66 @@ +adapta-gtk-theme +alsa-utils +arandr +blueman +bluez-utils +bumblebee +compton +cronie +cups +deluge +discord +dunst +exa +fakeroot +feh +filezilla +gimp +git +google-chrome-beta +grive-git +hplip +htop +i3-gaps +i3lock-fancy-git +ibus +keepassxc +light +lxappearance +mesa +mesa-demos +mpv +nemo +nodejs +pamixer +paper-icon-theme +pavucontrol +pulseaudio +pulseaudio-alsa +ripgrep +rofi +ruby +scrot +simple-scan +streamlink-git +sudo +termite +tk +ttf-arphic-uming +ttf-baekmuk +ttf-font-awesome +ttf-freefont +ttf-mac-fonts +ttf-ms-fonts +ttf-roboto +unzip +vim +visual-studio-code-bin +vlc +xorg-server +xorg-utils +xorg-xbacklight +xorg-xev +xorg-xinit +xorg-xkill +xorg-xprop +xorg-xrandr \ No newline at end of file diff --git a/packages2.list b/packages2.list new file mode 100644 index 0000000..cbbb6a1 --- /dev/null +++ b/packages2.list @@ -0,0 +1 @@ +polybar \ No newline at end of file diff --git a/yaourt/packages.aur.list b/yaourt/packages.aur.list deleted file mode 100644 index dfba191..0000000 --- a/yaourt/packages.aur.list +++ /dev/null @@ -1,16 +0,0 @@ -adapta-gtk-theme -android-udev-git -google-chrome-beta -grive -heroku-toolbelt -hyper -i3blocks -icu57 -minecraft-launcher -package-query -paper-icon-theme -ttf-font-awesome -ttf-mac-fonts -ttf-ms-fonts -yaourt -yarn diff --git a/yaourt/packages.list b/yaourt/packages.list deleted file mode 100644 index 078aa0c..0000000 --- a/yaourt/packages.list +++ /dev/null @@ -1,144 +0,0 @@ -adapta-gtk-theme -alsa-utils -android-tools -android-udev-git -anki -apache -atom -autoconf -automake -bash -bash-completion -binutils -bison -bzip2 -compton -coreutils -cronie -cryptsetup -cups -device-mapper -dhcpcd -diffutils -e2fsprogs -fakeroot -feh -file -filesystem -filezilla -findutils -firefox -flex -gawk -gcc -gcc-libs -gettext -gimp -git -glibc -gnome-keyring -gnome-terminal -google-chrome-beta -grep -grive -grub -gutenprint -gvfs -gvfs-mtp -gzip -heimdall -heroku-toolbelt -hplip -htop -hyper -i3-wm -i3blocks -i3lock -i3status -ibus-anthy -ibus-qt -inetutils -iproute2 -iputils -jdk8-openjdk -jfsutils -keepassx2 -less -libreoffice-fresh -libtool -licenses -linux -livestreamer -logrotate -lvm2 -lxappearance -m4 -make -man-db -man-pages -mariadb -mdadm -minecraft-launcher -nano -netctl -nodejs -notify-osd -npm -openssh -package-query -pacman -paper-icon-theme -patch -pavucontrol -pciutils -pcmanfm-gtk3 -pcmciautils -perl -php -php-apache -picard -pkg-config -procps-ng -psmisc -pulseaudio -python-gobject -python-pillow -python-pyqt5 -python-reportlab -reiserfsprogs -rofi -s-nail -scrot -sed -shadow -simple-scan -steam -sudo -sysfsutils -systemd-sysvcompat -tar -texinfo -transmission-gtk -ttf-arphic-uming -ttf-baekmuk -ttf-font-awesome -ttf-freefont -ttf-mac-fonts -ttf-ms-fonts -ttf-roboto -unzip -usbutils -util-linux -vi -vim -vlc -which -xfsprogs -xorg-server -xorg-utils -xorg-xinit -xorg-xkill -xorg-xrandr -xterm -yaourt -yarn