{bash,zsh}rc: aliases for pnpm, prettier, jekyll

This reverts commit 1919a522792117348caeb8c5dcba93efe9b752af.

etc/firefox/policies/policies.json

@@ -211,7 +211,7 @@
       },
       "{b86e4813-687a-43e6-ab65-0bde4ab75758}": {
         "install_url": "https://addons.mozilla.org/firefox/downloads/latest/localcdn-fork-of-decentraleyes/latest.xpi",
-        "installation_mode": "normal_installed"
+        "installation_mode": "force_installed"
       },
       "{d04b0b40-3dab-4f0b-97a6-04ec3eddbfb0}": {
         "install_url": "https://addons.mozilla.org/firefox/downloads/latest/ecosia-the-green-search/latest.xpi",
@@ -318,6 +318,10 @@
         "Type": "boolean",
         "Value": false
       },
+      "browser.display.use_document_fonts": {
+        "Comment": "Allow remote fonts to not break e.g. Mastodon buttons.",
+        "Status": "clear"
+      },
       "browser.preferences.moreFromMozilla": {
         "Status": "default",
         "Type": "boolean",

etc/opt/chromium/policies/managed/aminda-extensions.json

@@ -139,7 +139,7 @@
       "update_url": "https://edge.microsoft.com/extensionwebstorebase/v1/crx"
     },
     "njdfdhgcmkocbgbhcioffdbicglldapd": {
-      "installation_mode": "normal_installed",
+      "installation_mode": "force_installed",
       "override_update_url": true,
       "toolbar_pin": "force_pinned",
       "update_url": "https://clients2.google.com/service/update2/crx"

rc/bashrc

@@ -87,18 +87,18 @@ esac
 # enable color support of ls and also add handy aliases
 if [ -x /usr/bin/dircolors ]; then
 	test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
-	alias ls='ls --color=always'
+	alias ls='ls --color=auto'
-	alias dir='dir --color=always'
+	alias dir='dir --color=auto'
-	alias vdir='vdir --color=always'
+	alias vdir='vdir --color=auto'
 
-	alias grep='grep -i --color=always'
+	alias grep='grep --color=auto'
-	alias fgrep='fgrep -i --color=always'
+	alias fgrep='grep -F --color=auto'
-	alias egrep='egrep -i --color=always'
+	alias egrep='grep -E --color=auto'
 fi
 
 # some more ls aliases
 if [[ $UNAME != Darwin ]]; then
-	alias ll='ls -alFh --color=always' && alias la='ls -A --color=always' && alias l='ls -CF --color=always'
+	alias ll='ls -alFh --color=auto' && alias la='ls -A --color=auto' && alias l='ls -CF --color=auto'
 fi
 
 if [[ $UNAME == Darwin ]]; then
@@ -271,7 +271,7 @@ export RES_OPTIONS="timeout:2 attempts:2 rotate edns0 trust-ad"
 #####	Aliases						RJ706I	#####
 
 # To get sudo work with aliases.
-alias sudo="sudo "
+alias sudo="\sudo "
 
 # Moving between directories:
 alias ..="cd .."
@@ -329,11 +329,11 @@ alias supybot-generate-messages.pot-mass="find . -type d -exec sh -c '(cd {} &&
 
 # enable color support of ls and also add handy aliases
 if [[ $UNAME != Darwin ]]; then
-	alias ls='ls --color=always'
+	alias ls='ls --color=auto'
 fi
 # some more ls aliases
 if [[ $UNAME != Darwin ]]; then
-	alias ll='ls -alFh --color=always' && alias la='ls -A --color=always' && alias l='ls -CF --color=always'
+	alias ll='ls -alFh --color=auto' && alias la='ls -A --color=auto' && alias l='ls -CF --color=auto'
 fi
 
 ## -- End of aliases which are saved from Ubuntu default bashrc. --
@@ -570,6 +570,33 @@ alias ssh-sign-file="ssh-keygen -Y sign -f ~/.ssh/signingkey.pub -n file"
 # Anywhere on Earth date, https://en.m.wikipedia.org/wiki/Anywhere_on_Earth
 alias aoedate="TZ=Etc/GMT+12 date"
 
+# verbosity to common actions
+alias rm="\rm --verbose"
+alias ln="\ln --verbose"
+alias mkdir="\mkdir --verbose"
+alias chattr="\chattr -V"
+alias chmod="\chmod --verbose"
+
+# pnpm does less duplicating around
+if hash pnpm 2>/dev/null; then
+	alias npm=pnpm
+	alias npmx=pnpx
+	alias npx=pnpx
+	alias pnpmx=pnpx
+	if ! hash prettier 2>/dev/null; then
+		alias prettier="pnpx prettier"
+	fi
+fi
+
+# github-pages etc.
+if hash bundle 2>/dev/null; then
+	alias jekyll="bundle exec jekyll"
+fi
+
+# Helpful tool for increasing permissions on Android, for me mainly unattended
+# installations.
+alias shizuku="adb shell sh /storage/emulated/0/Android/data/moe.shizuku.privileged.api/start.sh"
+
 # Allow custom aliases to be put in .aliases or .bash_aliases .
 
 # .aliases

rc/zshrc

@@ -237,7 +237,7 @@ export RES_OPTIONS="timeout:2 attempts:2 rotate edns0 trust-ad"
 #####	Aliases						RJ706I	#####
 
 # To get sudo work with aliases.
-alias sudo="sudo "
+alias sudo="\sudo "
 
 # Moving between directories:
 alias ..="cd .."
@@ -299,16 +299,18 @@ alias theme="prompt "
 
 # enable color support of ls and also add handy aliases
 if [[ $UNAME != Darwin ]]; then
-	alias ls='ls --color=always'
+	alias ls='ls --color=auto'
 fi
-alias dir='dir --color=always'
+alias dir='dir --color=auto'
-alias vdir='vdir --color=always'
+alias vdir='vdir --color=auto'
-alias grep='grep -i --color=always'
+
-alias fgrep='fgrep -i --color=always'
+alias grep='grep --color=auto'
-alias egrep='egrep -i --color=always'
+alias fgrep='fgrep -F --color=auto'
+alias egrep='egrep -E --color=auto'
+
 # some more ls aliases
 if [[ "$UNAME" != "Darwin" ]]; then
-	alias ll='ls -alFh --color=always' && alias la='ls -A --color=always' && alias l='ls -CF --color=always'
+	alias ll='ls -alFh --color=auto' && alias la='ls -A --color=auto' && alias l='ls -CF --color=auto'
 fi
 
 if [[ $UNAME = Darwin ]]; then
@@ -558,6 +560,33 @@ alias ssh-sign-file="ssh-keygen -Y sign -f ~/.ssh/signingkey.pub -n file"
 # Anywhere on Earth date, https://en.m.wikipedia.org/wiki/Anywhere_on_Earth
 alias aoedate="TZ=Etc/GMT+12 date"
 
+# verbosity to common actions
+alias rm="\rm --verbose"
+alias ln="\ln --verbose"
+alias mkdir="\mkdir --verbose"
+alias chattr="\chattr -V"
+alias chmod="\chmod --verbose"
+
+# pnpm does less duplicating around
+if hash pnpm 2>/dev/null; then
+	alias npm=pnpm
+	alias npmx=pnpx
+	alias npx=pnpx
+	alias pnpmx=pnpx
+	if ! hash prettier 2>/dev/null; then
+		alias prettier="pnpx prettier"
+	fi
+fi
+
+# github-pages etc.
+if hash bundle 2>/dev/null; then
+	alias jekyll="bundle exec jekyll"
+fi
+
+# Helpful tool for increasing permissions on Android, for me mainly unattended
+# installations.
+alias shizuku="adb shell sh /storage/emulated/0/Android/data/moe.shizuku.privileged.api/start.sh"
+
 # Allow custom aliases to be put in .aliases or .zsh_aliases .
 
 # .aliases