Compare commits
No commits in common. "e112a35393cf2ce56ba27ba30e425e7568ca51af" and "d60099c22a71dfc54f4eccf00721fb20a96f56ca" have entirely different histories.
e112a35393
...
d60099c22a
16
Dockerfile
16
Dockerfile
|
@ -1,16 +0,0 @@
|
||||||
FROM pritunl/archlinux
|
|
||||||
|
|
||||||
RUN pacman -Sy --noconfirm sudo zsh \
|
|
||||||
&& useradd -m -s /bin/zsh test \
|
|
||||||
&& groupadd sudo \
|
|
||||||
&& usermod -aG sudo test \
|
|
||||||
&& echo "%sudo ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
|
|
||||||
|
|
||||||
USER test
|
|
||||||
COPY . /src
|
|
||||||
RUN cd /src/packages && ./packages.sh \
|
|
||||||
&& cd .. && ./install.sh \
|
|
||||||
&& cd ~ && sudo rm -r /src
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -54,10 +54,12 @@ if [ $ZSH_POWERLINE -gt 0 ]; then
|
||||||
POWERLINE_DIR="$(pip3 show powerline-status --isolated | grep '^Location:' | awk '{print $2}')"
|
POWERLINE_DIR="$(pip3 show powerline-status --isolated | grep '^Location:' | awk '{print $2}')"
|
||||||
log "Powerline repository root: $POWERLINE_DIR"
|
log "Powerline repository root: $POWERLINE_DIR"
|
||||||
|
|
||||||
|
log "Disabling current prompt theme..."
|
||||||
|
prompt off
|
||||||
|
|
||||||
log "Preparing zstyle..."
|
log "Preparing zstyle..."
|
||||||
autoload -Uz promptinit
|
autoload -Uz promptinit
|
||||||
promptinit
|
promptinit
|
||||||
prompt off
|
|
||||||
|
|
||||||
log "Loading powerline zsh plugin..."
|
log "Loading powerline zsh plugin..."
|
||||||
source "$POWERLINE_DIR/powerline/bindings/zsh/powerline.zsh"
|
source "$POWERLINE_DIR/powerline/bindings/zsh/powerline.zsh"
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#!/bin/sh -e
|
#!/bin/sh
|
||||||
|
|
||||||
. ./os.sh
|
. ./os.sh
|
||||||
|
|
||||||
|
@ -26,10 +26,6 @@ pip3_install() {
|
||||||
pip3 install --user -U "$@"
|
pip3 install --user -U "$@"
|
||||||
}
|
}
|
||||||
|
|
||||||
download() {
|
|
||||||
curl -L "$@"
|
|
||||||
}
|
|
||||||
|
|
||||||
###
|
###
|
||||||
|
|
||||||
# Actual package installation code from here
|
# Actual package installation code from here
|
||||||
|
@ -45,8 +41,7 @@ if has_tags pm:pacman; then
|
||||||
tar \
|
tar \
|
||||||
gzip \
|
gzip \
|
||||||
xz \
|
xz \
|
||||||
jq \
|
jq
|
||||||
git
|
|
||||||
|
|
||||||
# yay
|
# yay
|
||||||
if ! has_tags pm:yay; then
|
if ! has_tags pm:yay; then
|
||||||
|
@ -58,7 +53,7 @@ if has_tags pm:pacman; then
|
||||||
(
|
(
|
||||||
dir="$(mktemp -d)"
|
dir="$(mktemp -d)"
|
||||||
cd "${dir}"
|
cd "${dir}"
|
||||||
download https://aur.archlinux.org/cgit/aur.git/snapshot/yay.tar.gz | tar -xz --strip=1
|
wget https://aur.archlinux.org/cgit/aur.git/snapshot/yay.tar.gz -O- | tar -xz --strip=1
|
||||||
makepkg -sri --noconfirm
|
makepkg -sri --noconfirm
|
||||||
cd
|
cd
|
||||||
rm -rf "${dir}"
|
rm -rf "${dir}"
|
||||||
|
@ -104,8 +99,7 @@ if has_tags pm:apt; then
|
||||||
python3-pip \
|
python3-pip \
|
||||||
zsh \
|
zsh \
|
||||||
zsh-syntax-highlighting \
|
zsh-syntax-highlighting \
|
||||||
jq \
|
jq
|
||||||
git
|
|
||||||
if has_tags desktop; then
|
if has_tags desktop; then
|
||||||
apt_install ibus
|
apt_install ibus
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue