etc/NetworkManager-resolv.conf-restore.bash

@@ -7,7 +7,7 @@ set -x
 
 # I know there are old versions that used something else, but I don't remember
 # that name and they are ancient.
-if ! hash nmcli 2> /dev/null; then
+if ! hash nmcli 2>/dev/null; then
 	echo "You don't seem to have NetworkManager (or nmcli) installed." 1>&2
 	exit 1
 fi

install

@@ -53,22 +53,6 @@ if hash pre-commit 2> /dev/null; then
 	pre-commit gc
 fi
 
-if hash corepack 2> /dev/null; then
-	corepack enable --install-directory ~/.local/bin/
-	corepack enable npm --install-directory ~/.local/bin/
-else
-	echo "WARNING! corepack is not installed."
-fi
-
-if [ "$(id -u)" == "0" ]; then
-	mkdir -vp /etc/apt/apt.conf.d/
-	echo 'Dpkg::Progress-Fancy "1";' > /etc/apt/apt.conf.d/99progressbar
-	echo 'APT::Color "1";' > /etc/apt/apt.conf.d/99color
-	if hash updatedb 2> /dev/null; then
-		(updatedb &)
-	fi
-fi
-
 if [ -f "$MIKAELA_GREP" ]; then
 	bash -x .mikaela_install
 fi

rc/bashrc

@@ -233,11 +233,11 @@ UNAME=$(uname)
 CPUARCH=$(uname -p)
 
 # If we are on Linux, enable apt progress bar and colours
-#if [[ $USER == "root" ]]; then
-#	mkdir -p /etc/apt/apt.conf.d/
-#	echo 'Dpkg::Progress-Fancy "1";' > /etc/apt/apt.conf.d/99progressbar
-#	echo 'APT::Color "1";' > /etc/apt/apt.conf.d/99color
-#fi
+if [[ $USER == "root" ]]; then
+	mkdir -p /etc/apt/apt.conf.d/
+	echo 'Dpkg::Progress-Fancy "1";' > /etc/apt/apt.conf.d/99progressbar
+	echo 'APT::Color "1";' > /etc/apt/apt.conf.d/99color
+fi
 
 # if gpg[-agent] has sshcontrol file, use it as ssh-agent. sshcontrol should
 # include the authentication subkey keygrip from
@@ -735,11 +735,11 @@ function shell-things {
 # (Everything expects nodejs to be called as node, but it's not with Debian.)
 fix-node() {
 	if [[ $USER == "root" && -f /usr/bin/nodejs && ! -f /usr/bin/node && ! -f /usr/local/bin/node ]]; then
-		ln -fnsv /usr/bin/nodejs /usr/local/bin/node
+		ln -s /usr/bin/nodejs /usr/local/bin/node
 	fi
-	mkdir -vp "$HOME/.local/bin"
+	mkdir -p $HOME/.local/bin
 	if [[ -f /usr/bin/nodejs && ! -f /usr/bin/node && ! -f /usr/local/bin/node && ! -f $HOME/.local/bin/node ]]; then
-		ln -fnsv /usr/bin/nodejs "$HOME/.local/bin/node"
+		ln -s /usr/bin/nodejs $HOME/.local/bin/node
 	fi
 }
 

rc/zshrc

@@ -215,11 +215,11 @@ else
 fi
 
 # If we are on Linux, enable apt progress bar and colours
-#if [[ $USER = "root" ]]; then
-#	mkdir -p /etc/apt/apt.conf.d/
-#	echo 'Dpkg::Progress-Fancy "1";' > /etc/apt/apt.conf.d/99progressbar
-#	echo 'APT::Color "1";' > /etc/apt/apt.conf.d/99color
-#fi
+if [[ $USER = "root" ]]; then
+	mkdir -p /etc/apt/apt.conf.d/
+	echo 'Dpkg::Progress-Fancy "1";' > /etc/apt/apt.conf.d/99progressbar
+	echo 'APT::Color "1";' > /etc/apt/apt.conf.d/99color
+fi
 
 # OS X ls colours (copied from https://apple.stackexchange.com/questions/33677/
 export CLICOLOR=1
@@ -582,8 +582,8 @@ else
 	echo "WARNING! corepack is not installed."
 fi
 
-# https://pnpm.io/installation#using-a-shorter-alias
-alias pn="corepack pnpm"
+ # https://pnpm.io/installation#using-a-shorter-alias
+ alias pn="corepack pnpm"
 
 # github-pages etc.
 if hash bundle 2>/dev/null; then
@@ -724,13 +724,17 @@ cd
 # This function fixes nodejs on Debian based systems.
 # (Everything expects nodejs to be called as node, but it's not with Debian.)
 function fix-node {
+
 if [[ $USER = "root" && -f /usr/bin/nodejs && ! -f /usr/bin/node && ! -f /usr/local/bin/node ]] then;
-	ln -fnsv /usr/bin/nodejs /usr/local/bin/node
+	ln -s /usr/bin/nodejs /usr/local/bin/node
 fi
+
 mkdir -p $HOME/.local/bin
+
 if [[ -f /usr/bin/nodejs && ! -f /usr/bin/node && ! -f /usr/local/bin/node && ! -f $HOME/.local/bin/node ]] then;
-	ln -fnsv /usr/bin/nodejs $HOME/.local/bin/node
+	ln -s /usr/bin/nodejs $HOME/.local/bin/node
 fi
+
 }
 
 # This function removes and regenerates ssh host keys.