Unconsider fish. Cleanup garbage. Minor ranger usability improvement.

bspwm

@@ -14,7 +14,3 @@ bspc rule -a Firefox desktop='^2'
 bspc rule -a mpv state=floating
 bspc rule -a Peek state=floating
 bspc rule -a kittyfloat state=floating
-
-bspc rule -a 'labview' state=floating
-bspc rule -a 'Matlab-GLEE' state=floating
-bspc rule -a 'MATLAB R2018b' state=floating

elvish/lib/config.elv

@@ -28,4 +28,3 @@ fn pqiv { e $conf/pqivrc }
 fn mpv { e $conf/mpv/mpv.conf }
 fn ncmpcpp { e $@setini $conf/ncmpcpp/config }
 fn bedrock { e /bedrock/etc/bedrock.conf }
-fn fish { e $conf/fish/config.fish }

elvish/rc.elv

@@ -6,6 +6,11 @@ use module
 fn ls [@a]{ e:exa --group-directories-first -s Name $@a }
 fn xqt [a]{ e $E:XBPS_DISTDIR/srcpkgs/$a/template }
 fn xr [@a]{ sudo xbps-remove -R $@a }
+fn r [@a]{
+  f = (mktemp)
+  if ?(ranger --choosedir=$f $@a) { cd (cat $f) }
+  rm -f $f
+}
 
 -exports- = [&]
 

fish/config.fish

@@ -1,65 +0,0 @@
-set -x PATH $HOME/.local/bin $HOME/.nimble/bin $PATH
-set -x GPG_TTY (tty)
-
-set fish_prompt_pwd_dir_length 1
-set -e fish_greeting
-
-set fish_color_error       red
-set fish_color_end         red
-set fish_color_comment     yellow
-set fish_color_quote       yellow
-set fish_color_command     green
-set fish_color_param       cyan
-set fish_color_operator    cyan
-set fish_color_redirection cyan
-
-
-fish_vi_key_bindings
-
-
-function ls
-  command exa --group-directories-first -s Name $argv
-end
-
-function xr
-  command sudo xbps-remove -R $argv
-end
-
-
-set default_sym △
-set insert_sym ▲
-set visual_sym ▸
-set replace_sym ◇
-
-function prompt_sym
-  if not test $status = 0
-    set_color red
-  end
-  if test "$fish_key_bindings" = "fish_vi_key_bindings"
-    or test "$fish_key_bindings" = "fish_hybrid_key_bindings"
-    switch $fish_bind_mode
-      case default
-        printf '%s' $default_sym
-      case insert
-        printf '%s' $insert_sym
-      case replace_one
-        printf '%s' $replace_sym
-      case visual
-        printf '%s' $visual_sym
-    end
-  end
-  set_color normal
-end
-
-function fish_mode_prompt
-end
-
-function fish_prompt
-  echo
-  printf " %s %s%s  " (prompt_sym) (set_color cyan) (prompt_pwd)
-end
-
-function fish_right_prompt
-  printf "%s" (__fish_git_prompt)
-end
-

profile

@@ -48,7 +48,7 @@ fi
 . $HOME/sns/profile
 
 # Start X or shell
-if [ -z "$DISPLAY" ] && [ "$GPG_TTY" = /dev/tty1 ]; then
+if [ "$GPG_TTY" = /dev/tty1 ]; then
 	exec dbus-launch sx
 fi
 exec elvish

setup

@@ -23,7 +23,6 @@ rofi
 firefox
 kitty
 elvish
-fish
 kak (kakoune)
 pqiv
 mpv
@@ -95,8 +94,6 @@ for arg; do
 			FF_CHROME=$FF_DIR/chrome
 			_install $arg/user.js "$FF_DIR/user.js"
 			_install $arg/userChrome.css "$FF_CHROME/userChrome.css";;
-		fish)
-			_install $arg/config.fish "$CONF/fish/config.fish";;
 		elvish)
 			_install $arg/rc.elv "$HOME/.elvish/rc.elv"
 			for i in "$arg"/lib/* ; do