diff --git a/.gitmodules b/.gitmodules
index 1f5fd2a..e8e19d2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -23,3 +23,6 @@
 [submodule "vim/.vim/bundle/vim-lastplace"]
 	path = vim/.vim/bundle/vim-lastplace
 	url = https://github.com/farmergreg/vim-lastplace
+[submodule "vim/.vim/bundle/vim-fish"]
+	path = vim/.vim/bundle/vim-fish
+	url = https://github.com/dag/vim-fish
diff --git a/fish/.config/fish/functions/backupstatus.fish b/fish/.config/fish/functions/backupstatus.fish
new file mode 100644
index 0000000..ebb4c3f
--- /dev/null
+++ b/fish/.config/fish/functions/backupstatus.fish
@@ -0,0 +1,6 @@
+function backupstatus
+	ssh rsync quota
+for bkp in (ssh rsync ls)
+ssh rsync du -sh $bkp
+end
+end
diff --git a/vim/.vim/bundle/vim-commentary b/vim/.vim/bundle/vim-commentary
index 141d9d3..62b68ae 160000
--- a/vim/.vim/bundle/vim-commentary
+++ b/vim/.vim/bundle/vim-commentary
@@ -1 +1 @@
-Subproject commit 141d9d32a9fb58fe474fcc89cd7221eb2dd57b3a
+Subproject commit 62b68aecec2de531bc3978bfb9c07d3b6759ce0e
diff --git a/vim/.vim/bundle/vim-fish b/vim/.vim/bundle/vim-fish
new file mode 160000
index 0000000..50b95cb
--- /dev/null
+++ b/vim/.vim/bundle/vim-fish
@@ -0,0 +1 @@
+Subproject commit 50b95cbbcd09c046121367d49039710e9dc9c15f
diff --git a/vim/.vim/bundle/vim-fugitive b/vim/.vim/bundle/vim-fugitive
index b97a9ab..b09c5d2 160000
--- a/vim/.vim/bundle/vim-fugitive
+++ b/vim/.vim/bundle/vim-fugitive
@@ -1 +1 @@
-Subproject commit b97a9abe29c39c4e1a45ae199dbb470df362f538
+Subproject commit b09c5d2523f9964add241a04862c2f8bbd7d428f
diff --git a/vim/.vim/bundle/vim-gitgutter b/vim/.vim/bundle/vim-gitgutter
index e929cb8..5c73edb 160000
--- a/vim/.vim/bundle/vim-gitgutter
+++ b/vim/.vim/bundle/vim-gitgutter
@@ -1 +1 @@
-Subproject commit e929cb8b868aba97331231ece6f9f3e1204babea
+Subproject commit 5c73edb3c2fd8794661d7c7ac72eed1fc9d36761
diff --git a/vim/.vim/ftplugin/fish.vim b/vim/.vim/ftplugin/fish.vim
new file mode 100644
index 0000000..284d352
--- /dev/null
+++ b/vim/.vim/ftplugin/fish.vim
@@ -0,0 +1,9 @@
+" set up :make to use fish for syntax checking
+compiler fish
+
+" set this to have long lines wrap inside comments
+setlocal textwidth=79
+
+" enable folding of block structures in fish
+setlocal foldmethod=expr
+
diff --git a/vim/.vimrc b/vim/.vimrc
index beef3d9..e4c25bf 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -1,3 +1,8 @@
+" posix compatibility
+if &shell =~# 'fish$'
+    set shell=sh
+endif
+
 filetype plugin indent on
 
 syntax enable