diff --git a/lib/moi/completion.elv b/lib/moi/completion.elv
index fffb64f..157d1ae 100644
--- a/lib/moi/completion.elv
+++ b/lib/moi/completion.elv
@@ -1,12 +1,12 @@
 #use github.com/zzamboni/elvish-completions/builtins
-use github.com/zzamboni/elvish-completions/cd
-use github.com/zzamboni/elvish-completions/git
-set git:git-command               = hub
-set git:git-completions[checkout] = [ { git:MODIFIED; git:BRANCHES &all } ... ]
-git:init
+#use github.com/zzamboni/elvish-completions/cd
+#use github.com/zzamboni/elvish-completions/git
+#set git:git-command               = hub
+#set git:git-completions[checkout] = [ { git:MODIFIED; git:BRANCHES &all } ... ]
+#git:init
 #use github.com/zzamboni/elvish-completions/ssh
 
-use github.com/xiaq/edit.elv/compl/go
+#use github.com/xiaq/edit.elv/compl/go
 
 use ./completion/arc
 use ./completion/archiver
@@ -15,5 +15,5 @@ use ./completion/kcp
 use ./completion/mpv
 use ./completion/pacman
 use ./completion/ssh
-use ./completion/sudo
+#use ./completion/sudo
 use ./completion/use
diff --git a/rc.elv b/rc.elv
index 46c5d54..3940203 100644
--- a/rc.elv
+++ b/rc.elv
@@ -20,13 +20,13 @@ set edit:insert:binding[Ctrl-H] = $edit:histlist:start~
 set edit:prompt  = { go-prompt }
 set edit:rprompt = { nop }
 
+# Carapace completion : https://github.com/rsteube/carapace-bin
+eval (carapace _carapace|slurp)
+
 use moi/completion
 use moi/alias
 use moi/util/common
 
-# Carapace completion : https://github.com/rsteube/carapace-bin
-eval (carapace _carapace|slurp)
-
 {
   use ./aliases/get-uid uid
   if (not (uid:-is-root)) {