From b9a7c4f42fad61e6cb3f1ce4604ab7d7863325f5 Mon Sep 17 00:00:00 2001 From: Klesh Wong Date: Thu, 26 Aug 2021 21:13:36 +0800 Subject: [PATCH] fix: installation on archlinux --- env.sh | 2 +- gui/pass.sh | 9 ++++++++- gui/picom.sh | 2 +- gui/suckless.sh | 3 ++- gui/sysutils.sh | 2 ++ 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/env.sh b/env.sh index de7ed05..f6edc9f 100755 --- a/env.sh +++ b/env.sh @@ -8,7 +8,7 @@ XDG_CONFIG_HOME=${XDG_CONFIG_HOME-"$HOME/.config"} PREFIX=/usr/local PDIR=$(dirname "${DIR-$0}") GITHUB_PROXY=${GITHUB_PROXY-$HTTPS_PROXY} -WSL=$(grep -i Microsoft /proc/sys/kernel/osrelease) +WSL=$(grep -i Microsoft /proc/sys/kernel/osrelease || true) in_china() { ! [ -f /tmp/myip_full ] && curl -s myip.ipip.net > /tmp/myip_full diff --git a/gui/pass.sh b/gui/pass.sh index 69e11b0..8e41938 100755 --- a/gui/pass.sh +++ b/gui/pass.sh @@ -32,10 +32,17 @@ case "$PM" in pacman) # TODO sudo pacman -S --noconfirm --needed \ - go + go \ + browserpass ;; esac +# longer password caching time +echo < ~/.gnupg/gpg-agent.conf +default-cache-ttl 28800 +max-cache-ttl 28800 +EOF + # install browserpass-native intorepo https://github.com/browserpass/browserpass-native.git "$DIR/repos/browserpass-native" make configure diff --git a/gui/picom.sh b/gui/picom.sh index d4d7fc2..19a568a 100755 --- a/gui/picom.sh +++ b/gui/picom.sh @@ -19,7 +19,7 @@ case "$PM" in sudo apt install -y ninja-build libxext-dev libxcb1-dev libxcb-damage0-dev libxcb-xfixes0-dev libxcb-shape0-dev libxcb-render-util0-dev libxcb-render0-dev libxcb-randr0-dev libxcb-composite0-dev libxcb-image0-dev libxcb-present-dev libxcb-xinerama0-dev libxcb-glx0-dev libpixman-1-dev libdbus-1-dev libconfig-dev libgl1-mesa-dev libpcre3-dev libevdev-dev uthash-dev libev-dev libx11-xcb-dev ;; pacman) - sudo pacman -S --noconfirm --needed uthash ninja meson + sudo pacman -S --noconfirm --needed uthash ninja meson libev libconfig ;; esac diff --git a/gui/suckless.sh b/gui/suckless.sh index 4f4a126..bb53f95 100755 --- a/gui/suckless.sh +++ b/gui/suckless.sh @@ -14,7 +14,8 @@ case "$PM" in ;; pacman) sudo pacman -S --noconfirm --needed \ - trayer + trayer \ + xorg-xsetroot ;; esac diff --git a/gui/sysutils.sh b/gui/sysutils.sh index dd9f87c..a3a82f0 100755 --- a/gui/sysutils.sh +++ b/gui/sysutils.sh @@ -62,6 +62,8 @@ esac # start network sudo systemctl enable NetworkManager sudo systemctl start NetworkManager +sudo systemctl enable autorandr +sudo systemctl start autorandr lnsf "$DIR/dunst/dunstrc" "$XDG_CONFIG_HOME/dunst/dunstrc" lnsf "$DIR/thunar/uca.xml" "$XDG_CONFIG_HOME/Thunar/uca.xml"