diff --git a/.config/fish/functions/hut_init.fish b/.config/fish/functions/hut_init.fish
index 284bbfbe..99a7b9c7 100644
--- a/.config/fish/functions/hut_init.fish
+++ b/.config/fish/functions/hut_init.fish
@@ -1,5 +1,5 @@
 function hut_init --argument-names vis --argument-names repo --argument-names desc
-    if test (count $argv) != 3
+    if test "$(count $argv)" != 3
         echo Require three args: visibility repo description
         exit 1
     end
@@ -7,8 +7,9 @@ function hut_init --argument-names vis --argument-names repo --argument-names de
         mkdir "$repo"
         cd "$repo"
         git init
-    else if not test -d "$repo" && test "$(path basename $(path resolve.))" = "$repo"
+    else if not test -d "$repo" && test "$(path basename $(path resolve .))" = "$repo"
         git init
     end
-    hut git create "$repo" -v "$vis" -d "$desc"
+    set output "$(hut git create "$repo" -v "$vis" -d "$desc")"
+    git remote add origin "$output"
 end