Swap bspwmrc to fish; refactor root-level scripts

.config/bspwm/bspwmrc

@@ -1,10 +1,9 @@
-#!/bin/sh
+#!/usr/bin/env fish
 
-if [ ! -e ~/.bspwm_no_lock ]
-then
+if ! test -e ~/.bspwm_no_lock
   slock &
   touch ~/.bspwm_no_lock
-fi
+end
 
 setxkbmap -option altwin:swap_alt_win
 setxkbmap -option ctrl:swapcaps

.config/fish/functions/vm_inst.fish

@@ -4,14 +4,14 @@ function vm_inst -a name os_variant install_source
         'c/cpus=' \
         'd/disk-size=' \
         'b/bridge=' \
-        'i/import' \
-        'n/netboot' \
+        i/import \
+        n/netboot \
         -- $argv
 
-    set -l memory '4096'
-    set -l vcpus '2'
-    set -l disk_size '40'
-    set -l bridge_iface 'br0'
+    set -l memory 4096
+    set -l vcpus 2
+    set -l disk_size 40
+    set -l bridge_iface br0
 
     if test -n "$_flag_m"
         set memory $_flag_m
@@ -33,8 +33,12 @@ function vm_inst -a name os_variant install_source
         --name $name \
         --memory $memory \
         --vcpus $vcpus \
-        --os-variant $os_variant \
-        --network bridge=$bridge_iface \
+        --os-variant $os_variant
+
+    if test -n "$_flag_b"
+        set inst_args $inst_args \
+            --network bridge=$bridge_iface
+    end
 
     if test -n "$_flag_i"
         set inst_args $inst_args \