[bugfix] installation problem on archlinux
This commit is contained in:
parent
5d94480b01
commit
4bd7cf3a53
2
env.sh
2
env.sh
|
@ -67,6 +67,7 @@ case "$PM" in
|
||||||
build-essential \
|
build-essential \
|
||||||
unzip p7zip \
|
unzip p7zip \
|
||||||
openssh-client \
|
openssh-client \
|
||||||
|
curl wget \
|
||||||
man sudo
|
man sudo
|
||||||
;;
|
;;
|
||||||
pacman)
|
pacman)
|
||||||
|
@ -74,6 +75,7 @@ case "$PM" in
|
||||||
base-devel \
|
base-devel \
|
||||||
unzip p7zip \
|
unzip p7zip \
|
||||||
openssh \
|
openssh \
|
||||||
|
curl wget \
|
||||||
man sudo
|
man sudo
|
||||||
# install yay
|
# install yay
|
||||||
if ! which yay; then
|
if ! which yay; then
|
||||||
|
|
|
@ -46,7 +46,7 @@ case "$PM" in
|
||||||
wget http://mirrors.163.com/debian/pool/main/f/fonts-wqy-microhei/$DEB_PKG_NAME -O /tmp/$DEB_PKG_NAME
|
wget http://mirrors.163.com/debian/pool/main/f/fonts-wqy-microhei/$DEB_PKG_NAME -O /tmp/$DEB_PKG_NAME
|
||||||
ar p /tmp/$DEB_PKG_NAME data.tar.xz | sudo tar Jxv -C /
|
ar p /tmp/$DEB_PKG_NAME data.tar.xz | sudo tar Jxv -C /
|
||||||
# install symbola for plain emojis(no-color) for st
|
# install symbola for plain emojis(no-color) for st
|
||||||
yay -S --needed ttf-symbola-free
|
! fc-list | grep -qi symbola && yay -S --needed ttf-symbola-free
|
||||||
# clipboard
|
# clipboard
|
||||||
sudo pacman -S --needed \
|
sudo pacman -S --needed \
|
||||||
xclip xsel
|
xclip xsel
|
||||||
|
@ -64,7 +64,7 @@ case "$PM" in
|
||||||
sudo systemctl start bluetooth
|
sudo systemctl start bluetooth
|
||||||
fi
|
fi
|
||||||
# for setting up default programs: exo-preferred-applications
|
# for setting up default programs: exo-preferred-applications
|
||||||
sudo pacman -S --needed
|
sudo pacman -S --needed \
|
||||||
exfat-utils \
|
exfat-utils \
|
||||||
axel \
|
axel \
|
||||||
exo
|
exo
|
||||||
|
@ -74,6 +74,7 @@ esac
|
||||||
|
|
||||||
# install hermit nerd font
|
# install hermit nerd font
|
||||||
install-nerdfont () {
|
install-nerdfont () {
|
||||||
|
grep -F "$*" /usr/local/share/fonts/nerdfont && return
|
||||||
ORIGIN_NAME=$1
|
ORIGIN_NAME=$1
|
||||||
PATCHED_PAT=$2
|
PATCHED_PAT=$2
|
||||||
VERSION=$3
|
VERSION=$3
|
||||||
|
@ -87,6 +88,7 @@ install-nerdfont () {
|
||||||
$LOCAL_REPO_PATH
|
$LOCAL_REPO_PATH
|
||||||
sudo 7z x -x!'*Windows*' -aoa $LOCAL_REPO_PATH/$NAME -o/usr/local/share/fonts
|
sudo 7z x -x!'*Windows*' -aoa $LOCAL_REPO_PATH/$NAME -o/usr/local/share/fonts
|
||||||
sudo chmod +rx /usr/local/share/fonts
|
sudo chmod +rx /usr/local/share/fonts
|
||||||
|
echo "$*" | sudo tee -a /usr/local/share/fonts/nerdfont
|
||||||
echo $LOCAL_REPO_PATH
|
echo $LOCAL_REPO_PATH
|
||||||
rm -rf $LOCAL_REPO_PATH
|
rm -rf $LOCAL_REPO_PATH
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,5 +4,7 @@ DIR=$(readlink -f $(dirname $0))
|
||||||
|
|
||||||
killall -q picom
|
killall -q picom
|
||||||
while pgrep -x picom >/dev/null; do sleep 1; done
|
while pgrep -x picom >/dev/null; do sleep 1; done
|
||||||
picom -b --config $DIR/picom.conf --experimental-backends --blur-method dual_kawase --blur-strength 6 --no-fading-openclose
|
picom -b --config $DIR/picom.conf --experimental-backends \
|
||||||
#picom -b --config $DIR/picom.conf
|
--blur-method dual_kawase --blur-strength 6 \
|
||||||
|
--no-fading-openclose || \
|
||||||
|
picom -b --config $DIR/picom.conf --no-fading-openclose
|
||||||
|
|
|
@ -21,17 +21,19 @@ case "$PM" in
|
||||||
esac
|
esac
|
||||||
|
|
||||||
# build and install picom
|
# build and install picom
|
||||||
VERSION=next
|
VERSION=v8.2
|
||||||
VERSION_PATH=$XDG_CONFIG_HOME/picom/version
|
VERSION_PATH=$XDG_CONFIG_HOME/picom/version
|
||||||
if [ "$VERSION" = "next" ] || ! eqv "$VERSION_PATH" "$VERSION"; then
|
if [ "$VERSION" = "next" ] || ! eqv "$VERSION_PATH" "$VERSION"; then
|
||||||
echo Downloading picom $VERSION
|
echo Downloading picom $VERSION
|
||||||
rm -rf /tmp/picom.zip
|
[ ! -f /tmp/picom-$VERSION.zip ] && \
|
||||||
curl "https://github.com/yshui/picom/archive/$VERSION.zip" -Lo /tmp/picom-$VERSION.zip
|
curl "https://github.com/yshui/picom/archive/$VERSION.zip" -Lo /tmp/picom-$VERSION.zip
|
||||||
unzip /tmp/picom-$VERSION.zip -d /tmp
|
unzip /tmp/picom-$VERSION.zip -d /tmp
|
||||||
pushd /tmp/picom-$VERSION
|
FD=$(unzip -l /tmp/picom-$VERSION.zip | awk 'NR==5{print $4}')
|
||||||
|
pushd /tmp/$FD
|
||||||
meson --buildtype=release . build
|
meson --buildtype=release . build
|
||||||
sudo ninja -C build install
|
sudo ninja -C build install
|
||||||
popd
|
popd
|
||||||
|
mkdir -p $(dirname $VERSION_PATH)
|
||||||
echo "$VERSION" > "$VERSION_PATH"
|
echo "$VERSION" > "$VERSION_PATH"
|
||||||
sudo rm -rf /tmp/picom-$VERSION*
|
sudo rm -rf /tmp/picom-$VERSION*
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -40,16 +40,16 @@ esac
|
||||||
# clone / compile utilities and dwm itself
|
# clone / compile utilities and dwm itself
|
||||||
mkdir -p ~/Projects/suckless
|
mkdir -p ~/Projects/suckless
|
||||||
|
|
||||||
[! -d ~/Projects/suckless/st] && git clone https://gitee.com/klesh/st.git ~/Projects/suckless/st
|
[ ! -d ~/Projects/suckless/st ] && git clone https://gitee.com/klesh/st.git ~/Projects/suckless/st
|
||||||
cd ~/Projects/suckless/st && sudo rm -f config.h && sudo make clean install
|
cd ~/Projects/suckless/st && sudo rm -f config.h && sudo make clean install
|
||||||
|
|
||||||
[! -d ~/Projects/suckless/dmenu] &&git clone https://gitee.com/klesh/dmenu.git ~/Projects/suckless/dmenu
|
[ ! -d ~/Projects/suckless/dmenu ] &&git clone https://gitee.com/klesh/dmenu.git ~/Projects/suckless/dmenu
|
||||||
cd ~/Projects/suckless/dmenu && sudo rm -f config.h && sudo make clean install
|
cd ~/Projects/suckless/dmenu && sudo rm -f config.h && sudo make clean install
|
||||||
|
|
||||||
[! -d ~/Projects/suckless/slock] &&git clone https://gitee.com/klesh/slock.git ~/Projects/suckless/slock
|
[ ! -d ~/Projects/suckless/slock ] &&git clone https://gitee.com/klesh/slock.git ~/Projects/suckless/slock
|
||||||
cd ~/Projects/suckless/slock && sudo rm -f config.h && sudo make clean install
|
cd ~/Projects/suckless/slock && sudo rm -f config.h && sudo make clean install
|
||||||
|
|
||||||
[! -d ~/Projects/suckless/dwm] &&git clone https://gitee.com/klesh/dwm.git ~/Projects/suckless/dwm
|
[ ! -d ~/Projects/suckless/dwm ] &&git clone https://gitee.com/klesh/dwm.git ~/Projects/suckless/dwm
|
||||||
cd ~/Projects/suckless/dwm && sudo rm -f config.h && sudo make clean install
|
cd ~/Projects/suckless/dwm && sudo rm -f config.h && sudo make clean install
|
||||||
|
|
||||||
# config xinit to start for dwm
|
# config xinit to start for dwm
|
||||||
|
@ -80,7 +80,7 @@ EOT
|
||||||
|
|
||||||
# config dwm
|
# config dwm
|
||||||
[[ -L $XDG_CONFIG_HOME/dwm/autostart ]] && rm $XDG_CONFIG_HOME/dwm/autostart
|
[[ -L $XDG_CONFIG_HOME/dwm/autostart ]] && rm $XDG_CONFIG_HOME/dwm/autostart
|
||||||
mkdir -p $DIR/config/dwm
|
mkdir -p $XDG_CONFIG_HOME/dwm
|
||||||
cp $DIR/config/dwm/autostart $XDG_CONFIG_HOME/dwm/autostart
|
cp $DIR/config/dwm/autostart $XDG_CONFIG_HOME/dwm/autostart
|
||||||
lnsf $DIR/config/dwm/dwmbar $XDG_CONFIG_HOME/dwm/dwmbar
|
lnsf $DIR/config/dwm/dwmbar $XDG_CONFIG_HOME/dwm/dwmbar
|
||||||
lnsf $DIR/config/autorandr/postswitch $XDG_CONFIG_HOME/autorandr/postswitch
|
lnsf $DIR/config/autorandr/postswitch $XDG_CONFIG_HOME/autorandr/postswitch
|
||||||
|
|
Loading…
Reference in New Issue
Block a user