diff --git a/dev-machine/roles/linux/tasks/main.yml b/dev-machine/roles/linux/tasks/main.yml
index 0c90157..9648d92 100644
--- a/dev-machine/roles/linux/tasks/main.yml
+++ b/dev-machine/roles/linux/tasks/main.yml
@@ -8,6 +8,7 @@
 - include_tasks: "x11.yml"
 - include_tasks: "fonts.yml"
 - include_tasks: "browsers.yml"
+- include_tasks: "wireshark.yml"
 - include_tasks: "docker.yml"
 - include_tasks: "user.yml"
 - include_tasks: "ergodox.yml"
diff --git a/dev-machine/roles/linux/tasks/user.yml b/dev-machine/roles/linux/tasks/user.yml
index 02eca03..d5870a2 100644
--- a/dev-machine/roles/linux/tasks/user.yml
+++ b/dev-machine/roles/linux/tasks/user.yml
@@ -12,7 +12,9 @@
   user:
     name: "marvin"
     append: true
-    groups: "docker"
+    groups:
+      - "docker"
+      - "wireshark"
 
 - name: "Put the ssh key in place"
   become: true
diff --git a/dev-machine/roles/linux/tasks/wireshark.yml b/dev-machine/roles/linux/tasks/wireshark.yml
new file mode 100644
index 0000000..630cb06
--- /dev/null
+++ b/dev-machine/roles/linux/tasks/wireshark.yml
@@ -0,0 +1,14 @@
+---
+- name: "Allow non-superusers to be able to capture wireshark packets"
+  ansible.builtin.debconf:
+    name: "wireshark-common"
+    question: "wireshark-common/install-setuid"
+    value: "true"
+    vtype: "boolean"
+
+- name: "Install wireshark"
+  environment:
+    DEBIAN_FRONTEND: "noninteractive"
+  apt:
+    name: "wireshark"
+    state: "present"
diff --git a/dotfiles/dot_config/private_cheat/cheatsheets/tmux b/dotfiles/dot_config/private_cheat/cheatsheets/tmux
index 13fe492..f0ddea1 100644
--- a/dotfiles/dot_config/private_cheat/cheatsheets/tmux
+++ b/dotfiles/dot_config/private_cheat/cheatsheets/tmux
@@ -37,3 +37,6 @@ mod + d                                  # detach from a session (within tmux)
 tmux attach -d -t <session-name>         # connect/attach to an existing session
 tmuxinator start <name>                  # start a named session sourced from a file in ~/.config/tmuxinator (i.e. "quickdev")
 tmuxinator start/stop                    # start or stop a named session sourced from a local ./.tmuxinator.yml file
+
+# Automatically re-number all your remaining tmux windows
+:movew -r