From a630607350ad1d23f19bd1f35a9e65ca37a32d42 Mon Sep 17 00:00:00 2001
From: Katherina Walshe-Grey <git@qenya.tel>
Date: Wed, 28 May 2025 15:50:52 +0100
Subject: [PATCH] treewide: Update deprecated options for NixOS 25.05

---
 common/base-graphical/sound.nix |   2 +-
 home/qenya/firefox.nix          |   2 +-
 home/qenya/vscode.nix           | 140 ++++++++++++++++----------------
 home/qenya/zsh.nix              |   2 +-
 4 files changed, 74 insertions(+), 72 deletions(-)

diff --git a/common/base-graphical/sound.nix b/common/base-graphical/sound.nix
index bb0c847..140eb93 100644
--- a/common/base-graphical/sound.nix
+++ b/common/base-graphical/sound.nix
@@ -14,7 +14,7 @@ in
       pulse.enable = true;
       jack.enable = true;
     };
-    hardware.pulseaudio.enable = false; # this theoretically defaults to false but something else seems to be flipping it
+    services.pulseaudio.enable = false; # this theoretically defaults to false but something else seems to be flipping it
     environment.systemPackages = with pkgs; [ helvum ]; # patchbay
   };
 }
diff --git a/home/qenya/firefox.nix b/home/qenya/firefox.nix
index 96715e5..603208a 100644
--- a/home/qenya/firefox.nix
+++ b/home/qenya/firefox.nix
@@ -10,7 +10,7 @@ in
     languagePacks = [ "en-GB" ];
 
     profiles.default = {
-      extensions = with inputs.firefox-addons.packages.${pkgs.hostPlatform.system}; [
+      extensions.packages = with inputs.firefox-addons.packages.${pkgs.hostPlatform.system}; [
         bitwarden
         ublock-origin
       ];
diff --git a/home/qenya/vscode.nix b/home/qenya/vscode.nix
index d190cbe..568913d 100644
--- a/home/qenya/vscode.nix
+++ b/home/qenya/vscode.nix
@@ -7,79 +7,81 @@ in
 {
   programs.vscode = mkIf isGraphical {
     enable = true;
-    enableExtensionUpdateCheck = false;
-    enableUpdateCheck = false;
     package = pkgs.vscodium;
-    extensions = with pkgs.vscode-extensions; [
-      charliermarsh.ruff
-      dbaeumer.vscode-eslint
-      eamodio.gitlens
-      golang.go
-      jdinhlife.gruvbox
-      jnoortheen.nix-ide
-      matangover.mypy
-      mkhl.direnv
-      ms-python.black-formatter
-      ms-python.python
-      rust-lang.rust-analyzer
-      vadimcn.vscode-lldb
-    ];
     mutableExtensionsDir = false;
-    userSettings = {
-      "css.format.spaceAroundSelectorSeparator" = true;
-      "css.format.newlineBetweenSelectors" = false;
-      "debug.allowBreakpointsEverywhere" = true;
-      "extensions.autoUpdate" = false;
-      "files.insertFinalNewline" = true;
-      "git.autofetch" = true;
-      "git.confirmSync" = false;
-      "git.enableSmartCommit" = true;
-      "git.inputValidation" = true;
-      "git.inputValidationSubjectLength" = null;
-      "javascript.updateImportsOnFileMove.enabled" = "always";
-      "nix.enableLanguageServer" = true;
-      "nix.serverPath" = "${pkgs.nil}/bin/nil";
-      "nix.serverSettings".nil = {
-        diagnostics.ignored = [ "unused_binding" "unused_with" ];
-        formatting.command = [ "${pkgs.nixpkgs-fmt}/bin/nixpkgs-fmt" ];
-        nix.flake.autoArchive = true;
-      };
-      "rust-analyzer.check.command" = "clippy";
-      "terminal.integrated.allowChords" = false;
-      "terminal.integrated.defaultProfile.linux" = "zsh";
-      "workbench.colorTheme" = "Gruvbox Dark Medium";
-
-      "[go]" = {
-        "editor.defaultFormatter" = "golang.go";
-        "editor.formatOnSave" = false;
-      };
-      "go.alternateTools" = {
-        "go" = "${pkgs.go}/bin/go";
-        "golangci-lint" = "${pkgs.golangci-lint}/bin/golangci-lint";
-        "gopls" = "${pkgs.gopls}/bin/gopls";
-        "dlv" = "${pkgs.delve}/bin/dlv";
-        "staticcheck" = "${pkgs.go-tools}/bin/staticcheck";
-      };
-      "go.lintTool" = "golangci-lint";
-      "go.toolsManagement.checkForUpdates" = "off";
-      "gopls" = {
-        "formatting.gofumpt" = true;
-        "ui.semanticTokens" = true;
-      };
-
-      "[python]" = {
-        "editor.defaultFormatter" = "ms-python.black-formatter";
-        "editor.formatOnSave" = true;
-        "editor.codeActionsOnSave" = {
-          "source.fixAll" = "explicit";
-          "source.organizeImports" = "explicit";
+    profiles.default = {
+      enableExtensionUpdateCheck = false;
+      enableUpdateCheck = false;
+      extensions = with pkgs.vscode-extensions; [
+        charliermarsh.ruff
+        dbaeumer.vscode-eslint
+        eamodio.gitlens
+        golang.go
+        jdinhlife.gruvbox
+        jnoortheen.nix-ide
+        matangover.mypy
+        mkhl.direnv
+        ms-python.black-formatter
+        ms-python.python
+        rust-lang.rust-analyzer
+        vadimcn.vscode-lldb
+      ];
+      userSettings = {
+        "css.format.spaceAroundSelectorSeparator" = true;
+        "css.format.newlineBetweenSelectors" = false;
+        "debug.allowBreakpointsEverywhere" = true;
+        "extensions.autoUpdate" = false;
+        "files.insertFinalNewline" = true;
+        "git.autofetch" = true;
+        "git.confirmSync" = false;
+        "git.enableSmartCommit" = true;
+        "git.inputValidation" = true;
+        "git.inputValidationSubjectLength" = null;
+        "javascript.updateImportsOnFileMove.enabled" = "always";
+        "nix.enableLanguageServer" = true;
+        "nix.serverPath" = "${pkgs.nil}/bin/nil";
+        "nix.serverSettings".nil = {
+          diagnostics.ignored = [ "unused_binding" "unused_with" ];
+          formatting.command = [ "${pkgs.nixpkgs-fmt}/bin/nixpkgs-fmt" ];
+          nix.flake.autoArchive = true;
         };
+        "rust-analyzer.check.command" = "clippy";
+        "terminal.integrated.allowChords" = false;
+        "terminal.integrated.defaultProfile.linux" = "zsh";
+        "workbench.colorTheme" = "Gruvbox Dark Medium";
+
+        "[go]" = {
+          "editor.defaultFormatter" = "golang.go";
+          "editor.formatOnSave" = false;
+        };
+        "go.alternateTools" = {
+          "go" = "${pkgs.go}/bin/go";
+          "golangci-lint" = "${pkgs.golangci-lint}/bin/golangci-lint";
+          "gopls" = "${pkgs.gopls}/bin/gopls";
+          "dlv" = "${pkgs.delve}/bin/dlv";
+          "staticcheck" = "${pkgs.go-tools}/bin/staticcheck";
+        };
+        "go.lintTool" = "golangci-lint";
+        "go.toolsManagement.checkForUpdates" = "off";
+        "gopls" = {
+          "formatting.gofumpt" = true;
+          "ui.semanticTokens" = true;
+        };
+
+        "[python]" = {
+          "editor.defaultFormatter" = "ms-python.black-formatter";
+          "editor.formatOnSave" = true;
+          "editor.codeActionsOnSave" = {
+            "source.fixAll" = "explicit";
+            "source.organizeImports" = "explicit";
+          };
+        };
+        "python.createEnvironment.contentButton" = "show";
+        "python.defaultInterpreterPath" = "${pkgs.python3}/bin/python";
+        "ruff.nativeServer" = "on";
+        "ruff.path" = [ "${pkgs.ruff}/bin/ruff" ];
+        "mypy.dmypyExecutable" = "${pkgs.mypy}/bin/dmypy";
       };
-      "python.createEnvironment.contentButton" = "show";
-      "python.defaultInterpreterPath" = "${pkgs.python3}/bin/python";
-      "ruff.nativeServer" = "on";
-      "ruff.path" = "${pkgs.ruff}/bin/ruff";
-      "mypy.dmypyExecutable" = "${pkgs.mypy}/bin/dmypy";
     };
   };
 }
diff --git a/home/qenya/zsh.nix b/home/qenya/zsh.nix
index d322889..e7e550b 100644
--- a/home/qenya/zsh.nix
+++ b/home/qenya/zsh.nix
@@ -31,7 +31,7 @@
       theme = ""; # defer to powerlevel10k
     };
 
-    initExtra = ''
+    initContent = ''
       source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme
       source ${./.p10k.zsh}
     '';