diff --git a/TODO.md b/TODO.md
index 38607706..7ba29132 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,9 +1,30 @@
 # To-dos
 
-- [ ] Correctly handle multi-system environments
-  - [ ] NixOS
-  - [ ] nix-darwin
-  - [ ] home-manager
-- [ ] Migrate over koishi configs
-  - [ ] Contemplate the use of a different DE
-- [ ] Contemplate migration to Pulumi instead of tf-nix / Terraform
+- [x] Correctly handle multi-system environments
+  - [x] NixOS
+  - [x] nix-darwin
+  - [x] home-manager
+- [x] Contemplate migration to Pulumi instead of tf-nix / Terraform
+- [ ] Initial secrets setup
+  - [ ] age identity
+  - [ ] yubikey plugin
+  - [ ] SSH keys
+  - [ ] scalpel
+
+## Minimum Viable Koishi
+
+- [ ] GNOME
+  - [ ] Find minimal extension set
+  - [ ] Track config changes and add to dconf
+- [ ] firefox
+- [ ] neovim
+- [ ] zsh
+- [ ] exa
+- [ ] fzf
+- [ ] z
+- [ ] git
+- [ ] starship
+- [ ] ssh
+- [ ] tmux
+- [ ] direnv
+- [ ] bitw