From: Ruben Beltran del Rio <redacted>
Date: Sun, 19 Mar 2023 13:08:51 +0000 (+0100)
Subject: Merge branch 'main' of git.sr.ht:~rbdr/dotfiles
X-Git-Url: https://git.r.bdr.sh/rbdr/dotfiles/commitdiff_plain/08ea1b60270d697fff5992eb9b665cec35493b6d?ds=inline;hp=-c

Merge branch 'main' of git.sr.ht:~rbdr/dotfiles
---

08ea1b60270d697fff5992eb9b665cec35493b6d
diff --combined install
index 88930c4,ba0458b..a7f07b6
--- a/install
+++ b/install
@@@ -40,14 -40,11 +40,14 @@@ ln -fns .dotfiles/gitconfig ~/.gitconfi
  ln -fns .dotfiles/ctags.d ~/.ctags.d
  
  # XDefaults
- ln -fns .dotfiles/XDefaults ~/.XDefaults
+ ln -fns .dotfiles/Xdefaults ~/.Xdefaults
  
  # ripgrep
  ln -fns .dotfiles/rgignore ~/.rgignore
  
 +# skhdc
 +ln -fns .dotfiles/skhdrc ~/.skhdrc
 +
  # tmuxp
  ln -fns .dotfiles/tmuxp ~/.tmuxp
  
@@@ -60,9 -57,12 +60,12 @@@ ln -fns ../.dotfiles/config/kitty ~/.co
  # nvim
  ln -fns ../.dotfiles/config/nvim ~/.config/nvim
  
 -# Karabiner
 +# karabiner
  ln -fns ../.dotfiles/config/karabiner ~/.config/karabiner
  
+ # i3
+ ln -fns ../.dotfiles/config/i3 ~/.config/i3
+ 
  touch ~/.tool-versions
  
  # Italics setup
diff --combined runcoms/zshrc
index 153d73d,808616a..9555055
--- a/runcoms/zshrc
+++ b/runcoms/zshrc
@@@ -29,10 -29,11 +29,10 @@@ export TERM=xterm-256color-itali
  # Paths
  # export JAVA_HOME=$(/usr/libexec/java_home) # Enable if using JDK, otherwise disable for performance
  export GOPATH=$HOME/Projects/go
 -export NODE_PATH=/usr/local/lib/node_modules:$NODE_PATH
  export ANDROID_HOME=$HOME/Library/Android/sdk
  export ANDROID_NDK_HOME=$HOME/Library/Android/sdk/ndk-bundle
  export NVM_DIR=$HOME/.nvm
 -export PATH=$PATH:$HOME:/usr/local/opt/go/libexec/bin:${GOPATH//://bin:}/bin
 +export PATH=$PATH:$HOME:${GOPATH//://bin:}/bin
  export PATH=$PATH:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$ANDROID_NDK_HOME:/Applications/calibre.app/Contents/MacOS
  
  # Editor.
@@@ -43,6 -44,7 +43,6 @@@ export VISUAL="nvim
  export VIRTUAL_ENV_DISABLE_PROMPT=1
  export WORKON_HOME=$HOME/.virtualenvs
  export PROJECT_HOME=$HOME/Documents/projects
 -export VIRTUALENVWRAPPER_PYTHON="/usr/local/bin/python3"
  
  # GPG
  export GPG_TTY=$(tty)
@@@ -86,12 -88,20 +86,20 @@@ f
  if [[ -s "/opt/homebrew/bin/brew" ]]; then
    . /opt/homebrew/etc/profile.d/z.sh
  else
-   . /usr/local/etc/profile.d/z.sh
+   if [[ -s "/usr/share/z/z.sh" ]]; then
+     . /usr/share/z/z.sh
+   else
+     . /usr/local/etc/profile.d/z.sh
+   fi
  fi
  
  # ASDF
  if ! command -v brew &>  /dev/null; then
-   . $HOME/.asdf/asdf.sh
+   if [[ -s "/opt/asdf-vm/asdf.sh" ]]; then
+     . /opt/asdf-vm/asdf.sh
+   else
+     . $HOME/.asdf/asdf.sh
+   fi
  else
 -  . $(brew --prefix asdf)/asdf.sh
 +  . $(brew --prefix asdf)/libexec/asdf.sh
  fi