Compare commits

..

No commits in common. "87ade6f0aab5451db9eaf0c7b9da475576d8a9bd" and "4fc9eb628148d44d9e74f16d75a3408fadb13b46" have entirely different histories.

6 changed files with 59 additions and 120 deletions

1
.gitignore vendored
View File

@ -11,7 +11,6 @@
!.mailmap
!.mikaela
!.mikaela_install
!.nvmrc
!.pre-commit-config.yaml
!.prettierignore
!.prettierrc

1
.nvmrc
View File

@ -1 +0,0 @@
lts/*

View File

@ -1,2 +1,2 @@
kernel_cmdline="root=UUID=c3df30ca-878b-4125-bcb4-ba3ba4398efd rw rd.lvm.lv=fedora_localhost-live/root rd.luks.uuid=luks-f9a33e19-4176-44b3-8e06-2ee7fb70f3d0 mitigations=auto,nosmt btusb.force_scofix=1 btusb.enable_autosuspend=0 cpufreq.default_governor=schedutil rd.driver.blacklist=nouveau modprobe.blacklist=nouveau"
kernel_cmdline="root=UUID=c3df30ca-878b-4125-bcb4-ba3ba4398efd rw rd.lvm.lv=fedora_localhost-live/root rd.luks.uuid=luks-f9a33e19-4176-44b3-8e06-2ee7fb70f3d0 mitigations=auto,nosmt btusb.force_scofix=1 btusb.enable_autosuspend=0 cpufreq.default_governor=schedutil"
# vim: filetype=conf

View File

@ -94,44 +94,9 @@
"Containers": {
"Default": [
{
"color": "white",
"color": "red",
"icon": "fence",
"name": "Facebook"
},
{
"color": "white",
"icon": "chill",
"name": "ff"
},
{
"color": "pink",
"icon": "briefcase",
"name": "Git"
},
{
"color": "orange",
"icon": "chill",
"name": "Google"
},
{
"color": "blue",
"icon": "vacation",
"name": "HSL"
},
{
"color": "purple",
"icon": "chill",
"name": "IM"
},
{
"color": "cyan",
"icon": "briefcase",
"name": "LinkedIn"
},
{
"color": "green",
"icon": "pet",
"name": "WhatsApp"
"name": "DIY"
}
]
},

View File

@ -210,6 +210,14 @@ TZ=$(date +%Z)
# Sets PATH. To add another path, add :</path/to/new/path> to string below.
PATH=$HOME/.local/bin:$HOME/bin:$HOME/go/bin:$HOME/.local/share/flatpak/exports/bin:/var/lib/flatpak/exports/bin:/usr/local/bin:/usr/local/sbin:/usr/local/games:/snap/bin:/usr/bin:/usr/sbin:/usr/games:/bin:/sbin:/games:$PATH
# Add RubyGems to PATH
if hash ruby 2> /dev/null; then
PATH="$(ruby -e 'print Gem.user_dir')/bin:$PATH"
fi
# Removes duplicates from $PATH. Copied from https://unix.stackexchange.com/a/14896
PATH=$(echo "$PATH" | awk -v RS=':' -v ORS=":" '!a[$1]++{if (NR > 1) printf ORS; printf $a[$1]}')
# Colours to less
# Copied from https://nion.modprobe.de/blog/archives/572-less-colors-for-man-pages.html
export LESS_TERMCAP_mb=$'\E[01;31m'
@ -260,45 +268,6 @@ export LOCALDOMAIN=.
# regardless of whether DNSSEC=true or not.
export RES_OPTIONS="timeout:2 attempts:2 rotate edns0 trust-ad"
# https://github.com/nvm-sh/nvm
if [ -d ~/.nvm ]; then
. ~/.nvm/nvm.sh
. ~/.nvm/bash_completion
fi
# https://github.com/rbenv/rbenv
if [ -d ~/.rbenv/bin ]; then
PATH="$HOME/.rbenv/bin:$HOME/.rbenv/shims:$PATH"
rbenv init > /dev/null 2>&1
# Remember! And verify it before running!
# git clone https://github.com/rbenv/ruby-build.git "$(rbenv root)"/plugins/ruby-build
fi
# Add RubyGems to PATH
if hash ruby 2> /dev/null; then
PATH="$(ruby -e 'print Gem.user_dir')/bin:$PATH"
fi
# https://github.com/pyenv/pyenv
if [ -d ~/.pyenv/bin ]; then
PATH="$HOME/.pyenv/bin:$PATH"
pyenv init > /dev/null 2>&1
# Worth considering (and verifying before running)
# git clone https://github.com/pyenv/pyenv-virtualenv.git $(pyenv root)/plugins/pyenv-virtualenv
# git clone https://github.com/pyenv/pyenv-virtualenvwrapper.git $(pyenv root)/plugins/pyenv-virtualenvwrapper
fi
# https://github.com/nodenv/nodenv
if [ -d ~/.nodenv/bin ]; then
PATH="$HOME/.nodenv/bin:$PATH"
eval "$(nodenv init - bash)"
# Remember! And verify it before running!
# git clone https://github.com/nodenv/node-build.git "$(nodenv root)"/plugins/node-build
fi
# Removes duplicates from $PATH. Copied from https://unix.stackexchange.com/a/14896
PATH=$(echo "$PATH" | awk -v RS=':' -v ORS=":" '!a[$1]++{if (NR > 1) printf ORS; printf $a[$1]}')
##### Aliases RJ706I #####
# To get sudo work with aliases.
@ -462,6 +431,13 @@ alias cwho="who -H -w -u"
# FINEID to ssh-agent
alias fineid="ssh-add -s /usr/lib64/libcryptoki.so"
# Homebrew
#alias homebrew-install="cd ~;git clone https://github.com/Homebrew/homebrew.git --depth=1;mkdir -p .local;rsync -aP homebrew/* .local;rsync -aP homebrew/.* .local;rm -rf homebrew"
#alias homebrew-install-root="cd /usr;git clone https://github.com/Homebrew/homebrew.git --depth=1;mkdir -p local;rsync -aP homebrew/* local;rsync -aP homebrew/.* local/;\chmod -v -R 755 local;chown -R root:wheel local;rm -rf homebrew"
#alias linuxbrew-install="cd ~;git clone https://github.com/Homebrew/linuxbrew.git --depth=1;mkdir -p .local;rsync -aP linuxbrew/* .local;rsync -aP linuxbrew/.* .local;rm -rf linuxbrew"
#alias linuxbrew-install-root="cd /usr;git clone https://github.com/Homebrew/linuxbrew.git --depth=1;mkdir -p local;rsync -aP linuxbrew/* local;rsync -aP linuxbrew/.* local/;\chmod -v -R 755 local;chown -R root:wheel local;rm -rf linuxbrew"
#export HOMEBREW_LOGS=$HOME/.cache/Homebrew/Logs
# OS X
# What is this?
#alias osx-server-caching-interface="serveradmin settings caching:Interface ="
@ -613,7 +589,7 @@ if hash corepack 2> /dev/null; then
alias prettier="pnpm exec prettier --cache --ignore-unknown"
fi
else
echo "Information: corepack is not installed."
echo "WARNING! corepack is not installed."
fi
# https://pnpm.io/installation#using-a-shorter-alias
@ -755,6 +731,18 @@ function shell-things {
}
# This function fixes nodejs on Debian based systems.
# (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
fi
mkdir -vp "$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"
fi
}
# This function removes and regenerates ssh host keys.
#ssh-regen-host-keys () {

View File

@ -177,6 +177,14 @@ TZ=$(date +%Z)
# Sets PATH. To add another path, add :</path/to/new/path> to string below.
PATH=$HOME/.local/bin:$HOME/bin:$HOME/go/bin:$HOME/.local/share/flatpak/exports/bin:/var/lib/flatpak/exports/bin:/usr/local/bin:/usr/local/sbin:/usr/local/games:/snap/bin:/usr/bin:/usr/sbin:/usr/games:/bin:/sbin:/games:$PATH
# Add RubyGems to PATH
if hash ruby 2>/dev/null; then
PATH="$(ruby -e 'print Gem.user_dir')/bin:$PATH"
fi
# Removes duplicates from $PATH. Copied from https://unix.stackexchange.com/a/14896
PATH=$(echo "$PATH" | awk -v RS=':' -v ORS=":" '!a[$1]++{if (NR > 1) printf ORS; printf $a[$1]}')
# Colours to less
# Copied from https://nion.modprobe.de/blog/archives/572-less-colors-for-man-pages.html
export LESS_TERMCAP_mb=$'\E[01;31m'
@ -226,45 +234,6 @@ export LOCALDOMAIN=.
# regardless of whether DNSSEC=true or not.
export RES_OPTIONS="timeout:2 attempts:2 rotate edns0 trust-ad"
# https://github.com/nvm-sh/nvm
if [ -d ~/.nvm ]; then
. ~/.nvm/nvm.sh
. ~/.nvm/bash_completion
fi
# https://github.com/rbenv/rbenv
if [ -d ~/.rbenv/bin ]; then
PATH="$HOME/.rbenv/bin:$HOME/.rbenv/shims:$PATH"
rbenv init >/dev/null 2>&1
# Remember! And verify it before running!
# git clone https://github.com/rbenv/ruby-build.git "$(rbenv root)"/plugins/ruby-build
fi
# Add RubyGems to PATH
if hash ruby 2>/dev/null; then
PATH="$(ruby -e 'print Gem.user_dir')/bin:$PATH"
fi
# https://github.com/pyenv/pyenv
if [ -d ~/.pyenv/bin ]; then
PATH="$HOME/.pyenv/bin:$PATH"
pyenv init >/dev/null 2>&1
# Worth considering (and verifying before running)
# git clone https://github.com/pyenv/pyenv-virtualenv.git $(pyenv root)/plugins/pyenv-virtualenv
# git clone https://github.com/pyenv/pyenv-virtualenvwrapper.git $(pyenv root)/plugins/pyenv-virtualenvwrapper
fi
# https://github.com/nodenv/nodenv
if [ -d ~/.nodenv/bin ]; then
PATH="$HOME/.nodenv/bin:$PATH"
eval "$(nodenv init - zsh)"
# Remember! And verify it before running!
# git clone https://github.com/nodenv/node-build.git "$(nodenv root)"/plugins/node-build
fi
# Removes duplicates from $PATH. Copied from https://unix.stackexchange.com/a/14896
PATH=$(echo "$PATH" | awk -v RS=':' -v ORS=":" '!a[$1]++{if (NR > 1) printf ORS; printf $a[$1]}')
##### Aliases RJ706I #####
# To get sudo work with aliases.
@ -451,6 +420,13 @@ alias cwho="who -H -w -u"
# FINEID to ssh-agent
alias fineid="ssh-add -s /usr/lib64/libcryptoki.so"
# Homebrew
#alias homebrew-install="cd ~;git clone https://github.com/Homebrew/homebrew.git --depth=1;mkdir -p .local;rsync -aP homebrew/* .local;rsync -aP homebrew/.* .local;rm -rf homebrew"
#alias homebrew-install-root="cd /usr;git clone https://github.com/Homebrew/homebrew.git --depth=1;mkdir -p local;rsync -aP homebrew/* local;rsync -aP homebrew/.* local/;chmod -v -R 755 local;chown -R root:wheel local;rm -rf homebrew"
#alias linuxbrew-install="cd ~;git clone https://github.com/Homebrew/linuxbrew.git --depth=1;mkdir -p .local;rsync -aP linuxbrew/* .local;rsync -aP linuxbrew/.* .local;rm -rf linuxbrew"
#alias linuxbrew-install-root="cd /usr;git clone https://github.com/Homebrew/linuxbrew.git --depth=1;mkdir -p local;rsync -aP linuxbrew/* local;rsync -aP linuxbrew/.* local/;chmod -v -R 755 local;chown -R root:wheel local;rm -rf linuxbrew"
#export HOMEBREW_LOGS=$HOME/.cache/Homebrew/Logs
# OS X
# What is this?
#alias osx-server-caching-interface="serveradmin settings caching:Interface ="
@ -603,7 +579,7 @@ if hash corepack 2>/dev/null; then
alias prettier="pnpm exec prettier --cache --ignore-unknown"
fi
else
echo "Information: corepack is not installed."
echo "WARNING! corepack is not installed."
fi
# https://pnpm.io/installation#using-a-shorter-alias
@ -745,6 +721,18 @@ 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
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
fi
}
# This function removes and regenerates ssh host keys.
#ssh-regen-host-keys () {