diff --git a/bigbird/README.md b/bigbird/README.md
index e9af318..0ccdd49 100644
--- a/bigbird/README.md
+++ b/bigbird/README.md
@@ -7,8 +7,3 @@ entirely sure at this point. For now, I took the easy way out: Just keep trying
 SD cards until one works! Thankfully, it seems to be reliable that an SD card
 works either 100% or 0% of the time. Currently using a 32GB Microcenter cheapo,
 in place of the nicer 128GB ones I was planning on instead.
-
-## Manual configuration
-```
-smbpasswd -a kathe <password>
-```
diff --git a/bigbird/smb.nix b/bigbird/smb.nix
index c45d308..59fe09d 100644
--- a/bigbird/smb.nix
+++ b/bigbird/smb.nix
@@ -1,29 +1,48 @@
 {
   services.samba = {
     enable = true;
+    securityType = "user";
     openFirewall = true;
-    settings = {
-      global = {
-        "workgroup" = "WORKGROUP";
-        "hosts allow" = "192.168.";
-        "hosts deny" = "0.0.0.0/0";
-        "guest account" = "nobody";
-        "map to guest" = "bad user";
-        "security" = "user";
-      };
+    ## Switch to structured config with NixOS 24.11
+    # settings = {
+    #   global = {
+    #     "workgroup" = "WORKGROUP";
+    #     "hosts allow" = "192.168.";
+    #     "hosts deny" = "0.0.0.0/0";
+    #     "guest account" = "nobody";
+    #     "map to guest" = "bad user";
+    #   };
+    #   "public" = {
+    #     "path" = "/nas/chandler/Public";
+    #     "browseable" = "yes";
+    #     "read only" = "yes";
+    #     "guest ok" = "yes"; # aka "public = yes"
+    #   };
+    #   # "private" = {
+    #   #   "path" = "/mnt/Shares/Private";
+    #   #   "browseable" = "yes";
+    #   #   "read only" = "no";
+    #   #   "guest ok" = "no";
+    #   #   "create mask" = "0644";
+    #   #   "directory mask" = "0755";
+    #   #   "force user" = "username";
+    #   #   "force group" = "groupname";
+    #   # };
+    # };
+    extraConfig = ''
+      workgroup = WORKGROUP
+      hosts allow = 192.168.
+      hosts deny = 0.0.0.0/0
+      guest account = nobody
+      map to guest = bad user
+    '';
+    shares = {
       "public" = {
         "path" = "/nas/chandler/public";
         "browseable" = "yes";
         "read only" = "yes";
         "guest ok" = "yes"; # aka "public = yes"
       };
-      kathe = {
-        path = "/nas/katherine";
-        browseable = "yes";
-        "valid users" = "kathe";
-        "read only" = "no";
-        "guest ok" = "no";
-      };
     };
   };
 }
diff --git a/oscar/configuration.nix b/oscar/configuration.nix
index b0c41e9..bbf7aeb 100644
--- a/oscar/configuration.nix
+++ b/oscar/configuration.nix
@@ -202,32 +202,9 @@
       ];
     };
 
-    programs.vscode = let
-      extensionrepo =
-        (import (builtins.fetchGit {
-          url = "https://github.com/nix-community/nix-vscode-extensions";
-          ref = "refs/heads/master";
-        })).extensions.${builtins.currentSystem};
-    in {
+    programs.vscode = {
       enable = true;
       package = pkgs.vscodium;
-      mutableExtensionsDir = false;
-      extensions = with extensionrepo.open-vsx; [ # TODO: -release ?
-        eamodio.gitlens
-        editorconfig.editorconfig
-        golang.go
-        jeandeaual.lilypond-syntax
-        jeandeaual.scheme
-        jeanp413.open-remote-ssh
-        jnoortheen.nix-ide
-        llvm-vs-code-extensions.vscode-clangd
-        ms-azuretools.vscode-docker
-        ms-python.debugpy
-        ms-python.python
-        rust-lang.rust-analyzer
-        stkb.rewrap
-        xaver.clang-format
-      ];
       userSettings = {
           "files.autoSave" = "afterDelay";
           "editor.renderWhitespace" = "boundary";