diff --git a/home-manager/modules/vscode.nix b/home-manager/modules/vscode.nix
index 9e7c179..25f9381 100644
--- a/home-manager/modules/vscode.nix
+++ b/home-manager/modules/vscode.nix
@@ -27,15 +27,20 @@
                 tamasfe.even-better-toml              # TOML
                 yzhang.markdown-all-in-one            # Markdown
                 denoland.vscode-deno                  # Deno JS/TS
+                mathiasfrohlich.kotlin                # Kotlin (no LSP)
+                matthewpi.caddyfile-support           # Caddyfile
                 # Theming
                 pkief.material-icon-theme             # Material icons
                 # Utilities
                 streetsidesoftware.code-spell-checker # Spellchecking
                 jeanp413.open-remote-ssh              # Remote SSH
                 mkhl.direnv                           # nix-direnv autoloading
+                cschlosser.doxdocgen                  # C++ Doxygen generator
+                tomoki1207.pdf                        # PDF Viewing
             ])
             ++ (with vscode-marketplace; [
                 yy0931.save-as-root                   # Save as root over SSH
+                akiramiyakoda.cppincludeguard         # Auto-insert header guards for header files
             ])
         );
 
@@ -87,6 +92,9 @@
                 };
             };
             "direnv.restart.automatic" = true;
+            # C++ Include guards
+            "C/C++ Include Guard.Comment Style" = "Line";
+            "C/C++ Include Guard.Macro Type" = "Filename";
         };
     };
 }