Skip to content

Commit e0d1210

Browse files
authored
Merge branch 'master' into patch-1
2 parents 9689974 + b73e1b1 commit e0d1210

2 files changed

Lines changed: 7 additions & 47 deletions

File tree

‎static/larbs.sh‎

Lines changed: 2 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -210,49 +210,6 @@ makeuserjs(){
210210
[ ! -f "$arkenfox" ] && curl -sL "https://raw.githubusercontent.com/arkenfox/user.js/master/user.js" > "$arkenfox"
211211
cat "$arkenfox" "$overrides" > "$userjs"
212212
chown "$name:wheel" "$arkenfox" "$userjs"
213-
# Install the updating script.
214-
mkdir -p /usr/local/lib /etc/pacman.d/hooks
215-
cp "/home/$name/.local/bin/arkenfox-auto-update" /usr/local/lib/
216-
chown root:root /usr/local/lib/arkenfox-auto-update
217-
chmod 755 /usr/local/lib/arkenfox-auto-update
218-
# Trigger the update when needed via a pacman hook.
219-
echo "[Trigger]
220-
Operation = Upgrade
221-
Type = Package
222-
Target = firefox
223-
Target = librewolf
224-
Target = librewolf-bin
225-
[Action]
226-
Description=Update Arkenfox user.js
227-
When=PostTransaction
228-
Depends=arkenfox-user.js
229-
Exec=/usr/local/lib/arkenfox-auto-update" > /etc/pacman.d/hooks/arkenfox.hook
230-
}
231-
232-
installffaddons(){
233-
addonlist="ublock-origin decentraleyes istilldontcareaboutcookies vim-vixen"
234-
addontmp="$(mktemp -d)"
235-
trap 'rm -fr $addontmp' HUP INT QUIT TERM PWR EXIT
236-
IFS=' '
237-
sudo -u "$name" mkdir -p "$pdir/extensions/"
238-
for addon in $addonlist; do
239-
if [ "$addon" = "ublock-origin" ]; then
240-
addonurl="$(curl -sL https://api.github.com/repos/gorhill/uBlock/releases/latest | grep -E 'browser_download_url.*\.firefox\.xpi' | cut -d '"' -f 4)"
241-
else
242-
addonurl="$(curl --silent "https://addons.mozilla.org/en-US/firefox/addon/${addon}/" | grep -o 'https://addons.mozilla.org/firefox/downloads/file/[^"]*')"
243-
fi
244-
file="${addonurl##*/}"
245-
curl -LOs "$addonurl" | sudo -u "$name" tee "$addontmp/$file" >/dev/null
246-
id="$(unzip -p "$file" manifest.json | grep "\"id\"")"
247-
id="${id%\"*}"
248-
id="${id##*\"}"
249-
mv "$file" "$pdir/extensions/$id.xpi"
250-
done
251-
chown -R "$name:$name" "$pdir/extensions"
252-
# Fix a Vim Vixen bug with dark mode not fixed on upstream:
253-
sudo -u "$name" mkdir -p "$pdir/chrome"
254-
[ ! -f "$pdir/chrome/userContent.css" ] && echo ".vimvixen-console-frame { color-scheme: light !important; }
255-
#category-more-from-mozilla { display: none !important }" | sudo -u "$name" tee "$pdir/chrome/userContent.css" >/dev/null
256213
}
257214

258215
finalize() {
@@ -353,7 +310,8 @@ ln -sfT /bin/dash /bin/sh >/dev/null 2>&1
353310
dbus-uuidgen >/var/lib/dbus/machine-id
354311

355312
# Use system notifications for Brave on Artix
356-
echo "export \$(dbus-launch)" >/etc/profile.d/dbus.sh
313+
# Only do it when systemd is not present
314+
[ "$(readlink -f /sbin/init)" != "/usr/lib/systemd/systemd" ] && echo "export \$(dbus-launch)" >/etc/profile.d/dbus.sh
357315

358316
# Enable tap to click
359317
[ ! -f /etc/X11/xorg.conf.d/40-libinput.conf ] && printf 'Section "InputClass"
@@ -380,8 +338,6 @@ pdir="$browserdir/$profile"
380338

381339
[ -d "$pdir" ] && makeuserjs
382340

383-
[ -d "$pdir" ] && installffaddons
384-
385341
# Kill the now unnecessary librewolf instance.
386342
pkill -u "$name" librewolf
387343

‎static/progs.csv‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
,ttf-font-awesome,"provides extended glyph support."
99
,ttf-dejavu,"properly displays emojis."
1010
A,lf-git,"is an extensive terminal file manager that everyone likes."
11-
,ueberzug,"enables previews in the lf file manager."
11+
,ueberzugpp,"enables previews in the lf file manager."
1212
,bc,"is a mathematics language used for the dropdown calculator."
1313
,xcompmgr,"is for transparency and removing screen-tearing."
1414
,xorg-xprop,"is a tool for detecting window properties."
@@ -33,6 +33,10 @@ A,gtk-theme-arc-gruvbox-git,"gives the dark GTK theme used in LARBS."
3333
,ncmpcpp,"a ncurses interface for music with multiple formats and a powerful tag editor."
3434
,newsboat,"is a terminal RSS client."
3535
A,librewolf-bin,"is the default browser of LARBS which also comes with ad-blocking and other sensible and necessary features by default."
36+
A,librewolf-extension-localcdn-bin,"local emulation of Content Delivery Networks."
37+
A,librewolf-extension-istilldontcareaboutcookies-bin,"removes annoying cookie banners"
38+
A,librewolf-extension-tridactyl-bin,"vim bindings in your browser."
39+
A,librewolf-extension-ublock-origin-bin,"the best ad blocker in town."
3640
A,arkenfox-user.js,"provides hardened security settings for Firefox and Librewolf to avoid Mozilla spyware and general web fingerprinting."
3741
,noto-fonts,"is an expansive font package."
3842
,noto-fonts-emoji,"is an emoji font."

0 commit comments

Comments
 (0)