From 8ac1e0f7653ab178143d8326f678e41ed48d498a Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Sun, 9 Dec 2018 23:40:35 -0500 Subject: [PATCH 1/9] archlinux: Add make rust target Since rustup is just the installer, we have to use it to install rust. --- .archlinux/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.archlinux/Makefile b/.archlinux/Makefile index 26ff0502..b64418b4 100644 --- a/.archlinux/Makefile +++ b/.archlinux/Makefile @@ -36,6 +36,11 @@ yarnconfig: @yarn config set -- --emoji true @yarn config set prefix /usr/local +.PHONY: rust +rust: + @rustup install stable + @rustup default stable + .PHONY: clean clean: @rm -fv PKGBUILDs/**/*.pkg.tar.xz From cdad1fe3bfe101ef31baeae72de4dfb5db7ea68a Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Sun, 9 Dec 2018 23:44:21 -0500 Subject: [PATCH 2/9] archlinux: Remove dependency step from bootstrap.sh Any dependencies that need to be installed will be done so from tari-core. --- .archlinux/bootstrap.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/.archlinux/bootstrap.sh b/.archlinux/bootstrap.sh index 254d9b1a..b25d74ff 100755 --- a/.archlinux/bootstrap.sh +++ b/.archlinux/bootstrap.sh @@ -13,9 +13,6 @@ sudo -v # Source: https://gist.github.com/cowboy/3118588 while true; do sudo -n true; sleep 60; kill -0 "$$" || exit; done 2>/dev/null & -# Install dependencies -sudo -n pacman -S stow - # Install PKGBUILDs make package=tari-core make package=bspwm-round-corners-git From 49c0091f1b899c582529290daa64f6ff8efe363b Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Sun, 9 Dec 2018 23:46:46 -0500 Subject: [PATCH 3/9] archlinux: Use yay to install AUR packages It turns out that yay automatically handles the process of installing package dependencies not in the official repositories. This is very important for some PKGBUILDs, so I've gone ahead and let yay handle all the AUR packages I build. --- .archlinux/bootstrap.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.archlinux/bootstrap.sh b/.archlinux/bootstrap.sh index b25d74ff..f227122f 100755 --- a/.archlinux/bootstrap.sh +++ b/.archlinux/bootstrap.sh @@ -19,12 +19,14 @@ make package=bspwm-round-corners-git make package=color-scripts make package=xeventbind -# Install aur dependencies +# Install yay make aur package=yay -make aur package=rtv -make aur package=polybar -make aur package=shotgun -make aur package=ranger-git + +# Install aur packages with yay +yay -S rtv +yay -S polybar +yay -S shotgun +yay -S ranger-git # Additional settings make fontconfig From 429a56d480c647e6a51bed43befffc9401171e37 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Sun, 9 Dec 2018 23:54:41 -0500 Subject: [PATCH 4/9] archlinux: Refresh keys before installing packages This fixes an issue where some packages cannot be verified if they use new keys. --- .archlinux/bootstrap.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.archlinux/bootstrap.sh b/.archlinux/bootstrap.sh index f227122f..3e9849c1 100755 --- a/.archlinux/bootstrap.sh +++ b/.archlinux/bootstrap.sh @@ -13,6 +13,9 @@ sudo -v # Source: https://gist.github.com/cowboy/3118588 while true; do sudo -n true; sleep 60; kill -0 "$$" || exit; done 2>/dev/null & +# Refresh GPG keys before installing packages +make refresh-keys + # Install PKGBUILDs make package=tari-core make package=bspwm-round-corners-git From 1324f4099a1d4db2562cc279a20e6795ddbe6b27 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Tue, 11 Dec 2018 13:41:47 -0500 Subject: [PATCH 5/9] archlinux: Remove bspwm-round-corners-git from bootstrap.sh It turns out that manual intervention is necessary to resolve dependency conflicts (bspwm-round-corners-git replaces bspwm), so it is easier to simply install bspwm-round-corners-git later if wanted. --- .archlinux/bootstrap.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/.archlinux/bootstrap.sh b/.archlinux/bootstrap.sh index 3e9849c1..ee6295c1 100755 --- a/.archlinux/bootstrap.sh +++ b/.archlinux/bootstrap.sh @@ -18,7 +18,6 @@ make refresh-keys # Install PKGBUILDs make package=tari-core -make package=bspwm-round-corners-git make package=color-scripts make package=xeventbind From e7f00aa7f8d5e6e62042ef011c9ed62517e59c60 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Tue, 11 Dec 2018 14:26:47 -0500 Subject: [PATCH 6/9] archlinux: Run xdg-user-dirs-update during bootstrap.sh Note that the directories generated can be changed with user-dirs.dirs, and should respect the user's locale. --- .archlinux/bootstrap.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.archlinux/bootstrap.sh b/.archlinux/bootstrap.sh index ee6295c1..47062bb5 100755 --- a/.archlinux/bootstrap.sh +++ b/.archlinux/bootstrap.sh @@ -43,5 +43,8 @@ make -C .. # Change the color scheme to a sane default wal --theme base16-tomorrow-night +# Create the user's home directories +xdg-user-dirs-update + # Run vim for the first time (i.e. install plugins and exit) nvim From d4475bbf3ab06a1b946397f65406bea97dcc7a51 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Tue, 11 Dec 2018 14:39:09 -0500 Subject: [PATCH 7/9] archlinux: Add shantz-xwinwrap-bzr This makes it possible to draw mpv on your desktop. In other words, it lets you use animated backgrounds with any format mpv supports. --- .archlinux/bootstrap.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.archlinux/bootstrap.sh b/.archlinux/bootstrap.sh index 47062bb5..890af1d1 100755 --- a/.archlinux/bootstrap.sh +++ b/.archlinux/bootstrap.sh @@ -29,6 +29,7 @@ yay -S rtv yay -S polybar yay -S shotgun yay -S ranger-git +yay -S shantz-xwinwrap-bzr # Additional settings make fontconfig From 7825eed62f8bbd2f54fff213626a235807569f5e Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Tue, 11 Dec 2018 15:06:52 -0500 Subject: [PATCH 8/9] archlinux: Enable the lxdm service Note that we enable lxdm before revoking privileges. The user can start lxdm manually after this script is finished, but ideally the system should first be rebooted to ensure that any kernel updates are applied properly. --- .archlinux/bootstrap.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.archlinux/bootstrap.sh b/.archlinux/bootstrap.sh index 890af1d1..a462c054 100755 --- a/.archlinux/bootstrap.sh +++ b/.archlinux/bootstrap.sh @@ -35,6 +35,9 @@ yay -S shantz-xwinwrap-bzr make fontconfig make yarnconfig +# Enable the lightweight X11 display manager +systemctl enable --now lxdm.service + # Revoke privileges sudo -K From bb5b168ca55a8e602f2f860dbf6130b717d1fed7 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Tue, 11 Dec 2018 15:14:36 -0500 Subject: [PATCH 9/9] archlinux: Add make gnome target Here are some good default GNOME settings for when you want to boot into the gnome shell instead of bspwm. --- .archlinux/Makefile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.archlinux/Makefile b/.archlinux/Makefile index b64418b4..f5645378 100644 --- a/.archlinux/Makefile +++ b/.archlinux/Makefile @@ -41,6 +41,13 @@ rust: @rustup install stable @rustup default stable +.PHONY: gnome +gnome: + @../gnome/.config/gnome/extensions.sh + @../gnome/.config/gnome/antialiasing.sh + @../gnome/.config/gnome/arc-dark-gtk-theme.sh + @../gnome/.config/gnome/breeze-cursor-theme.sh + .PHONY: clean clean: @rm -fv PKGBUILDs/**/*.pkg.tar.xz