diff --git a/README.md b/README.md index 9d6eb77..efcb65f 100644 --- a/README.md +++ b/README.md @@ -48,6 +48,8 @@ I override various regolith defaults in unsupported ways, so I maintain copies o * `regolith-i3-rofication-ilia` * `regolith-i3-swap-focus` +Due to https://github.com/regolith-linux/regolith-desktop/issues/1042, rename `/etc/environment` to `/etc/environment.back`. Hopefully I can remove this hack at some point in the future. + ## Fonts I use Hack as my main font, with Noto as the backup/CJK font. To install: diff --git a/profile/.profile b/profile/.profile index 1fbb5d7..3738f3a 100644 --- a/profile/.profile +++ b/profile/.profile @@ -8,6 +8,11 @@ # for ssh logins, install and configure the libpam-umask package. #umask 022 +# Copy from /etc/environment. See https://github.com/regolith-linux/regolith-desktop/issues/1042 +if [ -f "/env/environment.back" ]; then + . "/env/environment.back" +fi + # if running bash if [ -n "$BASH_VERSION" ]; then # include .bashrc if it exists @@ -28,11 +33,6 @@ fi . "$HOME/.cargo/env" -if [ -d "$HOME/.dotnet" ]; then - export DOTNET_ROOT="$HOME/.dotnet" - PATH="$DOTNET_ROOT:$PATH" -fi - # Define a `.profile.local` file for setting local globals, such as `PRIMARY_MONITOR`` and `SECONDARY_MONITOR`` if [ -f "$HOME/.profile.local" ]; then . "$HOME/.profile.local" diff --git a/zsh/.zprofile b/zsh/.zprofile index cbe9ae9..bfe2c66 100644 --- a/zsh/.zprofile +++ b/zsh/.zprofile @@ -76,8 +76,3 @@ fi export ANDROID_HOME=/home/fred/Android/Sdk export ANDROID_SDK_ROOT=/home/fred/Android/Sdk export PATH=/home/fred/Android/Sdk/cmdline-tools/latest/bin:/home/fred/Android/Sdk/platform-tools:$PATH - -if [ -f "$HOME/.local/share/dnvm/env" ]; then - echo "Test" - . "$HOME/.local/share/dnvm/env" -fi