From d028ec304a841d659ba6f00d485923e74015a201 Mon Sep 17 00:00:00 2001
From: Lyndon Sanche <lsanche@lyndeno.ca>
Date: Mon, 24 Feb 2025 12:18:38 -0700
Subject: [PATCH] flakewide: Fix renamed options

---
 home/lsanche/programs/vscode/default.nix | 120 ++++++++++++-----------
 mods/hydraCache/nix.nix                  |   6 +-
 2 files changed, 64 insertions(+), 62 deletions(-)

diff --git a/home/lsanche/programs/vscode/default.nix b/home/lsanche/programs/vscode/default.nix
index 85aa3ee..c8a70e1 100644
--- a/home/lsanche/programs/vscode/default.nix
+++ b/home/lsanche/programs/vscode/default.nix
@@ -4,70 +4,72 @@
 }: {
   inherit (osConfig.mods.desktop) enable;
   package = pkgs.vscodium;
-  enableExtensionUpdateCheck = false;
-  enableUpdateCheck = false;
-  extensions = with pkgs.vscode-extensions; [
-    vscodevim.vim
-    rust-lang.rust-analyzer
-    pkief.material-icon-theme
-    usernamehw.errorlens
-    yzhang.markdown-all-in-one
-    ibm.output-colorizer
-    christian-kohler.path-intellisense
-    mechatroner.rainbow-csv
-    jnoortheen.nix-ide
-    eamodio.gitlens
-    llvm-vs-code-extensions.vscode-clangd
-    mkhl.direnv
-    vadimcn.vscode-lldb
-    dart-code.dart-code
-    dart-code.flutter
-    github.vscode-pull-request-github
-    github.vscode-github-actions
-    redhat.vscode-xml
-    graphql.vscode-graphql
-    graphql.vscode-graphql-syntax
-    tamasfe.even-better-toml
-    james-yu.latex-workshop
-  ];
-  userSettings = {
-    git = {
-      autofetch = true;
-      confirmSync = false;
-      enableSmartCommit = true;
-    };
-    window = {
-      menuBarVisibility = "toggle";
-      titleBarStyle = "native";
-      #autoDetectColorScheme = true;
-    };
-    diffEditor.renderSideBySide = true;
-    workbench = {
-      iconTheme = "material-icon-theme";
+  profiles.default = {
+    enableExtensionUpdateCheck = false;
+    enableUpdateCheck = false;
+    extensions = with pkgs.vscode-extensions; [
+      vscodevim.vim
+      rust-lang.rust-analyzer
+      pkief.material-icon-theme
+      usernamehw.errorlens
+      yzhang.markdown-all-in-one
+      ibm.output-colorizer
+      christian-kohler.path-intellisense
+      mechatroner.rainbow-csv
+      jnoortheen.nix-ide
+      eamodio.gitlens
+      llvm-vs-code-extensions.vscode-clangd
+      mkhl.direnv
+      vadimcn.vscode-lldb
+      dart-code.dart-code
+      dart-code.flutter
+      github.vscode-pull-request-github
+      github.vscode-github-actions
+      redhat.vscode-xml
+      graphql.vscode-graphql
+      graphql.vscode-graphql-syntax
+      tamasfe.even-better-toml
+      james-yu.latex-workshop
+    ];
+    userSettings = {
+      git = {
+        autofetch = true;
+        confirmSync = false;
+        enableSmartCommit = true;
+      };
+      window = {
+        menuBarVisibility = "toggle";
+        titleBarStyle = "native";
+        #autoDetectColorScheme = true;
+      };
+      diffEditor.renderSideBySide = true;
+      workbench = {
+        iconTheme = "material-icon-theme";
+        editor = {
+          decorations.badges = true;
+          decorations.colors = true;
+          wrapTabs = true;
+        };
+      };
       editor = {
-        decorations.badges = true;
-        decorations.colors = true;
-        wrapTabs = true;
+        cursorSmoothCaretAnimation = "on";
+        smoothScrolling = true;
+        cursorBlinking = "phase";
+        fontLigatures = true;
+        guides.bracketPairs = true;
       };
-    };
-    editor = {
-      cursorSmoothCaretAnimation = "on";
-      smoothScrolling = true;
-      cursorBlinking = "phase";
-      fontLigatures = true;
-      guides.bracketPairs = true;
-    };
-    nix = {
-      enableLanguageServer = true;
-      serverPath = "nixd";
-      serverSettings = {
-        nixd = {
-          formatting = {
-            command = ["nix" "fmt" "--" "--quiet" "-"];
+      nix = {
+        enableLanguageServer = true;
+        serverPath = "nixd";
+        serverSettings = {
+          nixd = {
+            formatting = {
+              command = ["nix" "fmt" "--" "--quiet" "-"];
+            };
           };
         };
       };
+      rust-analyzer.checkOnSave.command = "clippy";
     };
-    rust-analyzer.checkOnSave.command = "clippy";
   };
 }
diff --git a/mods/hydraCache/nix.nix b/mods/hydraCache/nix.nix
index 8ba083c..57a21f3 100644
--- a/mods/hydraCache/nix.nix
+++ b/mods/hydraCache/nix.nix
@@ -3,12 +3,12 @@
     substituters = [
       "https://hydra.lyndeno.ca"
     ];
+    trusted-public-keys = [
+      "morpheus:sENQ8rUrJnNC5eLSBAfXuWouftFrVFjB5V7FCbDXb+M="
+    ];
   };
   extraOptions = ''
     max-substitution-jobs = 128
     http-connections = 128
   '';
-  binaryCachePublicKeys = [
-    "morpheus:sENQ8rUrJnNC5eLSBAfXuWouftFrVFjB5V7FCbDXb+M="
-  ];
 }