1 files changed, 47 insertions, 7 deletions
diff --git a/config.fish b/config.fish
index ddd84c5..480eb3f 100644
--- a/config.fish
+++ b/config.fish
@@ -1,15 +1,14 @@
-
 if status is-interactive
-  if which khal 2> /dev/null > /dev/null
+  if type khal 2> /dev/null > /dev/null
     khal calendar 2> /dev/null
   end
 end
 
-if which roxterm 2> /dev/null > /dev/null
+if type roxterm 2> /dev/null > /dev/null
   set -x TERMINAL roxterm
 end
 
-if which nvim 2> /dev/null > /dev/null
+if type nvim 2> /dev/null > /dev/null
   set -x VISUAL nvim
   set -x EDITOR nvim
   set -x SYSTEMD_EDITOR nvim
@@ -19,19 +18,34 @@ else
   set -x SYSTEMD_EDITOR vim
 end
 
-if which ruby 2> /dev/null > /dev/null
+if type ruby 2> /dev/null > /dev/null
   set RUBY_PATH (ruby -e 'print Gem.user_dir')/bin
 end
 
+if test -e /home/ache/.elan/
+  set LEAN_PATH /home/ache/.elan/bin
+end
+
+
+
 set -x NPM_PACKAGES "$HOME/.npm-packages"
 set -x GOPATH "$HOME/.go"
 set -x NODE_PATH "$NPM_PACKAGES/lib/node_modules:$NODE_PATH"
 set -x RUST_PATH "$HOME/.cargo"
+set -x DEVKITPRO_DIR "/opt/devkitpro"
 set -x EMSCRIPTEN_PATH "/usr/lib/emscripten"
 set -x JUPYTERLAB_DIR "$HOME/.local/share/jupyterlab"
+set -x DOTNET_TOOLS_PATH "$HOME/.dotnet/tools"
 
 set -x GPG_TTY (tty)
 
+if [ -d "$HOME/.local/bin" ]
+    set -x PATH $PATH "$HOME/.local/bin"
+end
+if [ -d "/opt/cuda/" ]
+    set -x CUDA_HOME "/opt/cuda"
+end
+
 if [ -d "$NPM_PACKAGES/bin" ]
     set -x PATH $PATH "$NPM_PACKAGES/bin"
 end
@@ -47,8 +61,24 @@ end
 if [ -d "$EMSCRIPTEN_PATH" ]
     set -x PATH $PATH "$EMSCRIPTEN_PATH"
 end
+if [ -d "$DOTNET_TOOLS_PATH" ]
+    set -x PATH $PATH "$DOTNET_TOOLS_PATH"
+end
 
-if which fcitx 2> /dev/null > /dev/null
+
+
+if [ -d "$LEAN_PATH" ]
+    set -x PATH $PATH "$LEAN_PATH"
+end
+if [ -d "$DEVKITPRO_DIR" ]
+    set -x DEVKITPRO '/opt/devkitpro'
+    set -x DEVKITARM '/opt/devkitpro/devkitARM'
+    set -x DEVKITPPC '/opt/devkitpro/devkitPPC'
+    set -x DEVKIT_PATH "$DEVKITPRO_DIR/tools/bin"
+    set -x PATH $PATH "$DEVKITPRO_PATH"
+end
+
+if type fcitx 2> /dev/null > /dev/null
     set -x GTK_IM_MODULE "fcitx"
     set -x QT_IM_MODULE "fcitx"
     set -x XMODIFIERS "@im=fcitx"
@@ -57,9 +87,15 @@ if [ -d "/opt/android-sdk" ]
     set -x ANDROID_HOME /opt/android-sdk/
 end
 
-[ -z "$DISPLAY" ] ; and [ "$XDG_VTNR" = "1" ] ; and exec startx
+## Pyenv
+set -Ux PYENV_ROOT $HOME/.pyenv
+fish_add_path $PYENV_ROOT/bin
 
+[ -z "$DISPLAY" ] ; and [ "$XDG_VTNR" = "1" ] ; and exec startx
 
+if [ -e ".ssh/id_main_key" ]
+    eval (keychain --agents ssh,gpg .ssh/id_main_key --eval D9778431CDCABBB1 E15360EAE11E2A34 -q --noask)
+end
 
 # alias gobjc='gcc -L /usr/lib/GNUstep/Libraries/gnustep-base -lgnustep-base -fconstant-string-class=NSConstantString'
 # alias smpd='ssh achessh@ache.one -fp 21 ssh ache@localhost -p 60065 -L 8091:localhost:8091 -fN'
@@ -67,7 +103,11 @@ end
 set -x fish_emoji_width 2
 
 
+load-em
 
 if test -e ~/.dircolors
     eval (dircolors -c ~/.dircolors)
 end
+
+# opam configuration
+source /home/ache/.opam/opam-init/init.fish > /dev/null 2> /dev/null; or true