From: Elias Fleckenstein <eliasfleckenstein@web.de>
Date: Mon, 20 Dec 2021 17:27:23 +0000 (+0100)
Subject: Merge branch 'master' of github.com:EliasFleckenstein03/i3-setup
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=121b1a792f8d592a370d45e709d2ac1ebab03497;p=i3-setup.git

Merge branch 'master' of github.com:EliasFleckenstein03/i3-setup
---

121b1a792f8d592a370d45e709d2ac1ebab03497
diff --cc install.sh
index aa5adfe,f1c3415..889999d
--- a/install.sh
+++ b/install.sh
@@@ -1,70 -1,6 +1,73 @@@
  #! /bin/bash
- 
 -sudo -E add-apt-repository -y ppa:regolith-linux/stable
 -sudo -E apt install -y i3-gaps i3status feh picom bat lolcat cowsay fortune zsh lua5.3 git imagemagick
 +function command_exists {
 +	command -v $1 &> /dev/null
 +}
 +
 +if [[ "$USER" != "root" ]]; then
 +	if command_exists sudo; then
 +		SUDO="sudo -E"
 +	elif command_exists doas; then
 +		SUDO="doas"
 +		if ! ENV_TEST="test123" doas env | grep "ENV_TEST=test123" > /dev/null; then
 +			echo "Please make sure doas keeps the environment for emerge (add keepenv to /etc/doas.conf)"
 +			exit 1
 +		fi
 +	fi
 +fi
 +
 +if command_exists apt; then
- 	$SUDO add-apt-repository -y ppa:regolith-linux/stable
++	$SUDO add-apt-repository -y ppa:regolith-linux/stable	
 +	$SUDO apt install -y \
 +		i3-gaps \
++		i3status \
 +		feh \
 +		picom \
 +		bat \
 +		lolcat \
 +		cowsay \
 +		fortune \
 +		zsh \
 +		lua5.3 \
 +		git \
 +		imagemagick
 +
 +elif command_exists emerge; then
 +	USE="
 +>=x11-libs/cairo-1.16.0-r5 X
 +>=x11-libs/libxkbcommon-1.3.1 X
 +>=x11-libs/pango-1.48.10 X
 +>=media-libs/freetype-2.11.0-r2 harfbuzz
 +>=sys-auth/pambase-20210201.1 elogind
 +>=media-libs/libglvnd-1.3.4
 +>=net-wireless/wpa_supplicant-2.9-r5 dbus
 +>=app-crypt/gcr-3.40.0 gtk
 +" \
 +	$SUDO emerge --ask --newuse \
 +		x11-base/xorg-x11 \
 +		x11-wm/i3-gaps \
 +		x11-misc/dmenu \
 +		x11-misc/i3lock \
 +		x11-misc/i3status \
 +		gnome-extra/nm-applet \
 +		x11-misc/xss-lock \
 +		media-gfx/feh \
 +		x11-misc/picom \
 +		sys-apps/bat \
 +		games-misc/lolcat \
 +		games-misc/cowsay \
 +		games-misc/fortune-mod \
 +		app-shells/zsh \
 +		dev-lang/lua:5.3 \
 +		dev-vcs/git \
 +		media-gfx/imagemagick \
 +		media-fonts/ubuntu-font-family \
 +		media-fonts/hack
 +
 +	$SUDO ln -s /usr/local/bin/bat /usr/bin/batcat
++else
++	echo "Distro not supported"
++	exit 1
 +fi
  
  curl -L https://sw.kovidgoyal.net/kitty/installer.sh | bash
  sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"