diff options
Diffstat (limited to 'ar')
| -rw-r--r-- | ar/.config/shell/profile | 9 | ||||
| -rw-r--r-- | ar/.config/yazi/keymap-default.toml | 2 | ||||
| -rwxr-xr-x | ar/.local/bin/gitupdate | 7 |
3 files changed, 13 insertions, 5 deletions
diff --git a/ar/.config/shell/profile b/ar/.config/shell/profile index 4d3312b..ac0d532 100644 --- a/ar/.config/shell/profile +++ b/ar/.config/shell/profile @@ -20,8 +20,11 @@ unsetopt PROMPT_SP 2>/dev/null export BROWSER=$(command -v librewolf || command -v firefox || command -v qutebrowser) export EDITOR="nvim" export EDITOR2="vim" -# export FILE_MANAGER="lf $(lf -version)" -export FILE_MANAGER="yazi $(yazi --version)" +if command -v lf >/dev/null 2>&1; then + export FILE_MANAGER="lf $(lf -version)" +elif command -v yazi >/dev/null 2>&1; then + export FILE_MANAGER="yazi $(yazi --version)" +fi export KEYTIMEOUT=10 export SUDO_EDITOR=$EDITOR export SUDO_ASKPASS="$HOME/.local/bin/dmenupass" @@ -262,7 +265,7 @@ export SDCV_PAGER='less --quit-if-one-screen -RX' [ ! -f "$XDG_CONFIG_HOME/shell/shortcutrc" ] && setsid -f shortcuts >/dev/null 2>&1 ### --- START GRAPHICAL SERVER ON USER'S CURRENT TTY IF NOT ALREADY RUNNING --- ### -[ "$(tty)" = "/dev/tty1" ] && ! pidof -s Xorg >/dev/null 2>&1 && exec startx "$XINITRC" +tty -s && [ "$(tty)" = "/dev/tty1" ] && ! pidof -s Xorg >/dev/null 2>&1 && exec startx "$XINITRC" ### --- LAPTOP KEYMAP --- ### sudo -n loadkeys "$XDG_DATA_HOME/thesiah/ttymaps.kmap" 2>/dev/null diff --git a/ar/.config/yazi/keymap-default.toml b/ar/.config/yazi/keymap-default.toml index 6b7acad..24c5376 100644 --- a/ar/.config/yazi/keymap-default.toml +++ b/ar/.config/yazi/keymap-default.toml @@ -190,7 +190,7 @@ run = "plugin chmod" desc = "Chmod on selected files" [[mgr.prepend_keymap]] -on = "<C-d>" +on = [ "g", "f" ] run = "plugin diff" desc = "Diff the selected with the hovered file" diff --git a/ar/.local/bin/gitupdate b/ar/.local/bin/gitupdate index a2c65ba..6ee163a 100755 --- a/ar/.local/bin/gitupdate +++ b/ar/.local/bin/gitupdate @@ -73,7 +73,12 @@ else # Add and commit changes git add --all . git commit -m "$message" - git pull --rebase origin "$branch" + if git remote | grep -qx origin; then + remote=origin + else + remote=$(git remote | head -n 1) + fi + git pull --rebase "$remote" "$branch" git remote | xargs -L1 git push --all fi |