Update fish config

1 files changed, 38 insertions, 38 deletions

diff --git a/config.fish b/config.fish
index 23f1246..ce10b44 100644
--- a/config.fish
+++ b/config.fish
@@ -1,39 +1,40 @@
+# Test with khal
+# --------------
+#
 # if status is-interactive
 #   if type khal 2> /dev/null > /dev/null
 #     khal calendar 2> /dev/null
 #   end
 # end
 
-if type roxterm 2> /dev/null > /dev/null
-  set -x TERMINAL roxterm
+if type roxterm 2>/dev/null >/dev/null
+    set -x TERMINAL roxterm
 end
 
-if type nvim 2> /dev/null > /dev/null
-  set -x VISUAL nvim
-  set -x EDITOR nvim
-  set -x SYSTEMD_EDITOR nvim
+if type nvim 2>/dev/null >/dev/null
+    set -x VISUAL nvim
+    set -x EDITOR nvim
+    set -x SYSTEMD_EDITOR nvim
 else
-  set -x VISUAL vim
-  set -x EDITOR vim
-  set -x SYSTEMD_EDITOR vim
+    set -x VISUAL vim
+    set -x EDITOR vim
+    set -x SYSTEMD_EDITOR vim
 end
 
-if type ruby 2> /dev/null > /dev/null
-  set RUBY_PATH (ruby -e 'print Gem.user_dir')/bin
+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
+    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 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 -l VAGRANT_DEFAULT_DIR "$HOME/.vagrant.d"
@@ -43,8 +44,8 @@ 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"
+if [ -d /opt/cuda/ ]
+    set -x CUDA_HOME /opt/cuda
 end
 
 if [ -d "$NPM_PACKAGES/bin" ]
@@ -66,49 +67,46 @@ if [ -d "$DOTNET_TOOLS_PATH" ]
     set -x PATH $PATH "$DOTNET_TOOLS_PATH"
 end
 if [ -d "$VAGRANT_DEFAULT_DIR" ]
-    set -x VAGRANT_DISABLE_STRICT_DEPENDENCY_ENFORCEMENT "1"
+    set -x VAGRANT_DISABLE_STRICT_DEPENDENCY_ENFORCEMENT 1
     set -x VAGRANT_HOME "$VAGRANT_DEFAULT_DIR"
 end
 
-
-
-
 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 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"
+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"
 end
-if [ -d "/opt/android-sdk" ]
+if [ -d /opt/android-sdk ]
     set -x ANDROID_HOME /opt/android-sdk/
 end
 
 ## Pyenv
-set -Ux PYENV_ROOT $HOME/.pyenv
-fish_add_path $PYENV_ROOT/bin
 
-[ -z "$DISPLAY" ] ; and [ "$XDG_VTNR" = "1" ] ; and exec startx
+if [ -e "$HOME/.pyenv" ]
+    set -Ux PYENV_ROOT $HOME/.pyenv
+    fish_add_path $PYENV_ROOT/bin
+end
+
+[ -z "$DISPLAY" ]; and [ "$XDG_VTNR" = 1 ]; and type -q startx; and exec startx
 
 if [ -e ".ssh/id_main_key" ]
-    eval (keychain --agents ssh,gpg .ssh/id_main_key --eval D9778431CDCABBB1 E15360EAE11E2A34 -q --noask)
+    eval (keychain .ssh/id_main_key .ssh/id_ed25519 .ssh/id_github --eval 0EC90BD273ECF07DBEFEE9DE240C2A15636270AF -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'
-
 set -x fish_emoji_width 2
 
-
+# Load fish shell function description
 load-em
 
 if test -e ~/.dircolors
@@ -116,4 +114,6 @@ if test -e ~/.dircolors
 end
 
 # opam configuration
-source /home/ache/.opam/opam-init/init.fish > /dev/null 2> /dev/null; or true
+if [ -e "/home/ache/.opam/opam-init/init.fish" ]
+    source /home/ache/.opam/opam-init/init.fish >/dev/null 2>/dev/null; or true
+end