diff --git a/roles/system/tasks/main.yml b/roles/system/tasks/main.yml
index 89a1b52..7b79761 100644
--- a/roles/system/tasks/main.yml
+++ b/roles/system/tasks/main.yml
@@ -56,6 +56,7 @@
       - codium
       - tree
       - virtualbox-6.1
+      - wireshark
       # Erlang stuff: https://github.com/asdf-vm/asdf-erlang#before-asdf-install
       - build-essential
       - autoconf
diff --git a/roles/system/templates/.gitconfig.j2 b/roles/system/templates/.gitconfig.j2
index 47b96a6..4bbc1f6 100644
--- a/roles/system/templates/.gitconfig.j2
+++ b/roles/system/templates/.gitconfig.j2
@@ -2,4 +2,4 @@
 	email = {{ email }}
 	name = {{ full_name }}
 [core]
-	editor = vim
+	editor = /usr/local/bin/nvim