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=sidebyside

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

08ea1b60270d697fff5992eb9b665cec35493b6d
diff --cc install
index 88930c4,ba0458b..a7f07b6
--- a/install
+++ b/install
@@@ -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 --cc runcoms/zshrc
index 153d73d,808616a..9555055
--- a/runcoms/zshrc
+++ b/runcoms/zshrc
@@@ -91,7 -97,11 +95,11 @@@ f
  
  # 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