diff --git a/scripts/.local/bin/update.sh b/scripts/.local/bin/update.sh index 8b1f17d..a0d5cd0 100755 --- a/scripts/.local/bin/update.sh +++ b/scripts/.local/bin/update.sh @@ -1,7 +1,11 @@ #!/bin/dash -[ "$(lsb_release -si)" = "Artix" ] && paru -[ "$(lsb_release -si)" = "Fedora" ] && sudo dnf upgrade +if [ "$(uname -o)" = "Android" ]; then + pkg upgrade +elif [ "$(uname -o)" = "GNU/Linux" ]; then + [ "$(lsb_release -si)" = "Artix" ] && paru + [ "$(lsb_release -si)" = "Fedora" ] && sudo dnf upgrade +fi command -v flatpak >/dev/null 2>&1 && { echo; flatpak update; } command -v npm >/dev/null 2>&1 && { echo; npm up -g; } diff --git a/zsh/.config/zsh/.zlogout b/zsh/.config/zsh/.zlogout index 1eb0adf..39a4630 100644 --- a/zsh/.config/zsh/.zlogout +++ b/zsh/.config/zsh/.zlogout @@ -8,6 +8,6 @@ function kill_services { pkill "^pipewire$" } -[[ $(uname -o) != "Android" ]] && [[ $(lsb_release -si) == "Artix" ]] && [[ $(tty) == "/dev/tty1" ]] && +[[ $(uname -o) == "GNU/Linux" ]] && [[ $(lsb_release -si) == "Artix" ]] && [[ $(tty) == "/dev/tty1" ]] && kill_services >/dev/null unfunction kill_services diff --git a/zsh/.config/zsh/.zprofile b/zsh/.config/zsh/.zprofile index b5ed071..cb9d319 100644 --- a/zsh/.config/zsh/.zprofile +++ b/zsh/.config/zsh/.zprofile @@ -1,4 +1,4 @@ -if [[ $(uname -o) != "Android" ]] && [[ $(lsb_release -si) == "Artix" ]] && [[ $(tty) == "/dev/tty1" ]]; then +if [[ $(uname -o) == "GNU/Linux" ]] && [[ $(lsb_release -si) == "Artix" ]] && [[ $(tty) == "/dev/tty1" ]]; then export $(gnome-keyring-daemon --start) export XDG_CURRENT_DESKTOP="Unity" export GTK_USE_PORTAL=1 diff --git a/zsh/.config/zsh/.zshenv b/zsh/.config/zsh/.zshenv index 6f12486..f360032 100644 --- a/zsh/.config/zsh/.zshenv +++ b/zsh/.config/zsh/.zshenv @@ -3,7 +3,7 @@ export PATH="$PATH:$HOME/.local/bin" (( ${+commands[go]} )) && export PATH="$PATH:$(go env GOPATH)/bin" # Essentials -export LANG="en_DK.UTF-8" +[[ $(uname -o) == "Android" ]] && export LANG="en_US.UTF-8" || export LANG="en_DK.UTF-8" export PAGER="less" export EDITOR="nano" (( ${+commands[vim]} )) && export EDITOR="vim" diff --git a/zsh/.config/zsh/aliases.zsh b/zsh/.config/zsh/aliases.zsh index 93504e9..ada5a81 100644 --- a/zsh/.config/zsh/aliases.zsh +++ b/zsh/.config/zsh/aliases.zsh @@ -1,4 +1,3 @@ -# Common aliases alias btctl="bluetoothctl" alias cl="clear" alias cp="cp -i" @@ -19,7 +18,7 @@ if [[ $(uname -o) == "Android" ]]; then alias l="exa -aFhl --color=always --git --icons" alias la="exa -Fhl --color=always --git --icons" alias ll="exa -aaFghl --color=always --git --icons" -else +elif [[ $(uname -o) == "GNU/Linux" ]]; then alias exa="exa -aFhl --color=always --git --icons" alias l="lsd -hlA --color=always" alias la="lsd -hl --color=always" diff --git a/zsh/.config/zsh/gpg.zsh b/zsh/.config/zsh/gpg.zsh index 2178374..8390a7b 100644 --- a/zsh/.config/zsh/gpg.zsh +++ b/zsh/.config/zsh/gpg.zsh @@ -1,4 +1,4 @@ -if [[ $(uname -o) != "Android" ]]; then +if [[ $(uname -o) == "GNU/Linux" ]]; then export GPG_TTY=$TTY export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) gpgconf --launch gpg-agent