From 5edb32974ab340e6e042d7aa8dd158682761eed0 Mon Sep 17 00:00:00 2001 From: Max O'Cull Date: Mon, 28 Oct 2024 15:10:33 -0400 Subject: [PATCH 1/2] Skip system permissions for macOS --- install.sh | 79 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 41 insertions(+), 38 deletions(-) diff --git a/install.sh b/install.sh index 825f418..bbb0b7a 100755 --- a/install.sh +++ b/install.sh @@ -1011,18 +1011,19 @@ case "$response" in xdg-settings set default-web-browser brave-browser.desktop fi - # TODO: Install extensions - #appindicatorsupport@rgcjonas.gmail.com - #blur-my-shell@aunetx - #gsconnect@andyholmes.github.io - #clipboard-indicator@tudmotu.com - #Vitals@CoreCoding.com - #x11gestures@joseexposito.github.io - #apps-menu@gnome-shell-extensions.gcampax.github.com - #background-logo@fedorahosted.org - #launch-new-instance@gnome-shell-extensions.gcampax.github.com - #places-menu@gnome-shell-extensions.gcampax.github.com - #window-list@gnome-shell-extensions.gcampax.github.com + extensions=( + "appindicatorsupport@rgcjonas.gmail.com" + "blur-my-shell@aunetx" + "gsconnect@andyholmes.github.io" + "clipboard-indicator@tudmotu.com" + "HeadsetControl@lauinger-clan.de" + ) + + for extension in "${extensions[@]}"; do + # TODO: Need to download the extensions first. + # gnome-extensions install "$extension" + gnome-extensions enable "$extension" + done # Clear the bookmarks file printf "" > "${HOME}/.config/gtk-3.0/bookmarks" @@ -1429,36 +1430,38 @@ case "$response" in ;; esac -read -r -p "Would you like to setup system permissions? [y/N] " response -case "$response" in - [yY][eE][sS] | [yY]) +if [[ "$(uname)" != "Darwin" ]]; then + read -r -p "Would you like to setup system permissions? [y/N] " response + case "$response" in + [yY][eE][sS] | [yY]) - if [[ -x "$(command -v pw)" ]]; then - sudo pw groupmod video -m "$USER" - sudo pw groupmod docker -m "$USER" - sudo pw groupmod wireshark -m "$USER" - sudo pw groupmod wheel -m "$USER" - sudo pw groupmod tty -m "$USER" - sudo pw groupmod nordvpn -m "$USER" - else - # TODO: Check that these are correct groupadd commands. - sudo groupadd -r docker - sudo usermod -a -G docker "$USER" + if [[ -x "$(command -v pw)" ]]; then + sudo pw groupmod video -m "$USER" + sudo pw groupmod docker -m "$USER" + sudo pw groupmod wireshark -m "$USER" + sudo pw groupmod wheel -m "$USER" + sudo pw groupmod tty -m "$USER" + sudo pw groupmod nordvpn -m "$USER" + else + # TODO: Check that these are correct groupadd commands. + sudo groupadd -r docker + sudo usermod -a -G docker "$USER" - sudo groupadd -r wireshark - sudo usermod -a -G wireshark "$USER" + sudo groupadd -r wireshark + sudo usermod -a -G wireshark "$USER" - sudo groupadd -r tty - sudo usermod -a -G tty "$USER" + sudo groupadd -r tty + sudo usermod -a -G tty "$USER" - sudo groupadd -r nordvpn - sudo usermod -a -G nordvpn "$USER" - fi - ;; - *) - echo "Skipping permission setup" - ;; -esac + sudo groupadd -r nordvpn + sudo usermod -a -G nordvpn "$USER" + fi + ;; + *) + echo "Skipping permission setup" + ;; + esac +fi if [ -n "${AUTOMATED}" ]; then response='n' From 821cdfddb5283a0877490a3392acfe83e345e042 Mon Sep 17 00:00:00 2001 From: Max O'Cull Date: Fri, 8 Nov 2024 02:37:20 -0500 Subject: [PATCH 2/2] pyenv hooks to zsh --- .zshrc | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.zshrc b/.zshrc index 9b20f71..436a444 100644 --- a/.zshrc +++ b/.zshrc @@ -449,6 +449,11 @@ zshrc_source() { if [ -s "$HOME/.luaver/luaver" ]; then source "$HOME/.luaver/luaver" fi + + if [ -n "${PYENV_ROOT}" ]; then + eval "$(pyenv init -)" + eval "$(pyenv virtualenv-init -)" + fi } zshrc_set_options() { @@ -904,6 +909,10 @@ zshrc_set_path() { zshrc_add_path "${KREW_ROOT:-$HOME/.krew}/bin" before + if [ -n "${PYENV_ROOT}" ]; then + zshrc_add_path "${PYENV_ROOT}/bin" before + fi + # Always wins, these are mine. zshrc_add_path "${HOME}/bin" before } @@ -2012,6 +2021,10 @@ zshrc_set_environment_variables() { # Python on macOS uses ~/Library/Python/X.Y/lib/python/site-packages # ... this is madness, unify them. export PYTHONUSERBASE="$HOME/.local" + + if [ -d "${HOME}/.pyenv" ]; then + export PYENV_ROOT="${HOME}/.pyenv" + fi } zshrc_aura_shrc() {