Skip to content

Commit

Permalink
Fix sheldon
Browse files Browse the repository at this point in the history
  • Loading branch information
nanasess committed Jun 21, 2024
1 parent 37ace24 commit 3bda3aa
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 6 deletions.
7 changes: 5 additions & 2 deletions .zsh/.zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@ fi
#
[ -f $ZDOTDIR/.zaliases ] && source $ZDOTDIR/.zaliases
[ -f $ZDOTDIR/.zcompctl ] && source $ZDOTDIR/.zcompctl
[ -f $HOME/.cargo/bin/sheldon ] && eval "$($HOME/.cargo/bin/sheldon --config-dir $ZDOTDIR/../sheldon source)"
if which sheldon > /dev/null
then
eval "$(sheldon --config-dir $ZDOTDIR/../sheldon source)"
fi

# Emacs style key binding
bindkey -e
Expand Down Expand Up @@ -81,4 +84,4 @@ fi
[ -f "$HOME/.ghcup/env" ] && source "$HOME/.ghcup/env" # ghcup-env

# To customize prompt, run `p10k configure` or edit ~/dotfiles/.zsh/.p10k.zsh.
[[ ! -f ~/dotfiles/.zsh/.p10k.zsh ]] || source ~/dotfiles/.zsh/.p10k.zsh
[[ ! -f ${XDG_CONFIG_HOME}/dotfiles/.zsh/.p10k.zsh ]] || source ${XDG_CONFIG_HOME}/dotfiles/.zsh/.p10k.zsh
15 changes: 11 additions & 4 deletions .zsh/.zshrc.mine
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,17 @@ if which stack > /dev/null; then eval "$(stack --bash-completion-script stack)";
# export PHPBREW_SET_PROMPT=1
export WEBKIT_FORCE_SANDBOX=0

# if [ ! -L /tmp/.X11-unix ]
# then
# sudo ln -s /mnt/wslg/.X11-unix /tmp/.X11-unix
# fi
if [ ! -L /tmp/.X11-unix ]
then
rm -rf /tmp/.X11-unix
ln -s /mnt/wslg/.X11-unix /tmp/.X11-unix
fi
if [ ! -L "${XDG_RUNTIME_DIR}/wayland-0" ]
then
rm -rf "${XDG_RUNTIME_DIR}/wayland-0*"
ln -s /mnt/wslg/runtime-dir/wayland-0* "$XDG_RUNTIME_DIR"
fi

# if which xrdb > /dev/null; then xrdb -merge ~/.Xresources; fi
if [ -z "$WAYLAND_DISPLAY" ]
then
Expand Down

0 comments on commit 3bda3aa

Please sign in to comment.