Amazing-Mirror/FollieHiyuki-dotfiles
Amazing-Mirror/FollieHiyuki-dotfiles
1
0
Fork 0
mirror of https://git.disroot.org/FollieHiyuki/dotfiles.git synced 2024-12-02 04:08:30 -05:00
Code Issues Projects Releases Wiki Activity

forgit: fix setting env logic

Browse Source
This commit is contained in:
FollieHiyuki 2021-05-03 15:50:23 +03:00
parent 93800d7ac4
commit 0d71225bcd
No known key found for this signature in database
GPG Key ID: 813CF484F4993419
3 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
home/.bashrc-bloated
View File

@ -674,15 +674,17 @@ if [ ! -f "$BASH_COMPLETION_USER_DIR/plugins/forgit.plugin.bash" ]; then
fi fi
source $BASH_COMPLETION_USER_DIR/plugins/forgit.plugin.sh source $BASH_COMPLETION_USER_DIR/plugins/forgit.plugin.sh
if [ -n "$XDG_SESSION_TYPE" ]; then
if [ "$XDG_SESSION_TYPE" = "wayland" ]; then if [ "$XDG_SESSION_TYPE" = "wayland" ]; then
export FORGIT_COPY_CMD="wl-copy" export FORGIT_COPY_CMD="wl-copy"
elif [ "$XDG_SESSION_TYPE" = "x11" ]; then else
if command -v xclip >/dev/null; then if command -v xclip >/dev/null; then
export FORGIT_COPY_CMD="xclip -selection clipboard" export FORGIT_COPY_CMD="xclip -selection clipboard"
else else
export FORGIT_COPY_CMD="xsel -i -b" export FORGIT_COPY_CMD="xsel -i -b"
fi fi
fi fi
fi
# If I don't want starship # If I don't want starship
# source $BASH_COMPLETION_USER_DIR/plugins/prompt.bash # source $BASH_COMPLETION_USER_DIR/plugins/prompt.bash

4
home/.config/fish/conf.d/env.fish
View File

@ -101,15 +101,17 @@ set -gx _ZO_RESOLVE_SYMLINKS 1
# set -gx _ZL_ROOT_MARKERS ".git,.svn,.hg,.root,package.json,.projectile,.pro" # set -gx _ZL_ROOT_MARKERS ".git,.svn,.hg,.root,package.json,.projectile,.pro"
# set -gx RANGER_ZLUA $HOME/.config/fish/z.lua # set -gx RANGER_ZLUA $HOME/.config/fish/z.lua
# forgit # forgit
if test -n "$XDG_SESSION_TYPE"
if test $XDG_SESSION_TYPE = "wayland" if test $XDG_SESSION_TYPE = "wayland"
set -gx FORGIT_COPY_CMD wl-copy set -gx FORGIT_COPY_CMD wl-copy
else if test $XDG_SESSION_TYPE = "x11" else
if command -v xclip >/dev/null if command -v xclip >/dev/null
set -gx FORGIT_COPY_CMD "xclip -selection clipboard" set -gx FORGIT_COPY_CMD "xclip -selection clipboard"
else else
set -gx FORGIT_COPY_CMD "xsel -i -b" set -gx FORGIT_COPY_CMD "xsel -i -b"
end end
end end
end
# nnn # nnn
if command -v nnn >/dev/null if command -v nnn >/dev/null
set -gx TERMINAL alacritty set -gx TERMINAL alacritty

4
home/.config/zsh/.zshenv
View File

@ -387,15 +387,17 @@ export ABBR_USER_ABBREVIATIONS_FILE="$HOME/.local/share/zsh/abbreviations"
# gencomp # gencomp
export GENCOMP_DIR=$XDG_DATA_HOME/zsh/completions export GENCOMP_DIR=$XDG_DATA_HOME/zsh/completions
# forgit # forgit
if [ -n "$XDG_SESSION_TYPE" ]; then
if [ "$XDG_SESSION_TYPE" = "wayland" ]; then if [ "$XDG_SESSION_TYPE" = "wayland" ]; then
export FORGIT_COPY_CMD="wl-copy" export FORGIT_COPY_CMD="wl-copy"
elif [ "$XDG_SESSION_TYPE" = "x11" ]; then else
if command -v xclip >/dev/null; then if command -v xclip >/dev/null; then
export FORGIT_COPY_CMD="xclip -selection clipboard" export FORGIT_COPY_CMD="xclip -selection clipboard"
else else
export FORGIT_COPY_CMD="xsel -i -b" export FORGIT_COPY_CMD="xsel -i -b"
fi fi
fi fi
fi
# PATH # PATH
typeset -U PATH path typeset -U PATH path