From 2e208d9fe044ae2d02da9f31db4a77798d4b3b3e Mon Sep 17 00:00:00 2001
From: Sean Buckley <sean.bck@gmail.com>
Date: Tue, 1 Nov 2022 12:34:41 -0400
Subject: [PATCH] move vscode settings

---
 modules/profiles/desktop.nix          | 44 ++++++++-------------------
 modules/profiles/vscode-settings.json | 28 +++++++++++++++++
 2 files changed, 40 insertions(+), 32 deletions(-)
 create mode 100644 modules/profiles/vscode-settings.json

diff --git a/modules/profiles/desktop.nix b/modules/profiles/desktop.nix
index 4d2d214..c02a177 100644
--- a/modules/profiles/desktop.nix
+++ b/modules/profiles/desktop.nix
@@ -96,38 +96,18 @@ with lib;
       ln -sf /etc/vscode-keybindings.json ~/.config/VSCodium/User/keybindings.json
     '';
 
-    environment.etc."vscode-settings.json".text = builtins.toJSON {
-      "diffEditor.renderSideBySide" = false;
-      "editor.cursorSurroundingLines" = 9;
-      "editor.formatOnSave" = true;
-      "editor.renderFinalNewline" = false;
-      "editor.scrollBeyondLastLine" = false;
-      "files.insertFinalNewline" = true;
-      "files.trimFinalNewlines" = true;
-      "files.watcherExclude"."**/result/**" = true;
-      "git.autofetch" = true;
-      "git.confirmSync" = false;
-      "python.formatting.provider" = "black";
-      "redhat.telemetry.enabled" = false;
-      "security.workspace.trust.banner" = "never";
-      "security.workspace.trust.startupPrompt" = "never";
-      "security.workspace.trust.untrustedFiles" = "newWindow";
-      "terminal.external.linuxExec" = "x-terminal-emulator";
-      "terminal.integrated.fontFamily" = "DejaVuSansMono Nerd Font";
-      "terminal.integrated.fontSize" = 16;
-      "terminal.integrated.minimumContrastRatio" = 1;
-      "terminal.integrated.shellIntegration.enabled" = false;
-      "terminal.integrated.showExitAlert" = false;
-      "trailing-spaces.highlightCurrentLine" = false;
-      "update.showReleaseNotes" = false;
-      "window.menuBarVisibility" = "hidden";
-      "workbench.startupEditor" = "none";
-
-      # NixOS specific vscode settings, do not copy to other operating systems:
-      "extensions.autoCheckUpdates" = false;
-      "extensions.autoUpdate" = false;
-      "update.mode" = "none";
-    };
+    environment.etc."vscode-settings.json".text = builtins.toJSON (
+      (
+        builtins.fromJSON (builtins.readFile ./vscode-settings.json)
+      ) // {
+        # NixOS-specific vscode settings:
+        "extensions.autoCheckUpdates" = false;
+        "extensions.autoUpdate" = false;
+        "terminal.external.linuxExec" = "x-terminal-emulator";
+        "terminal.integrated.fontFamily" = "DejaVuSansMono Nerd Font";
+        "update.mode" = "none";
+      }
+    );
 
     environment.etc."vscode-keybindings.json".text = builtins.toJSON [
       { key = "ctrl+w"; command = "-workbench.action.terminal.killEditor"; }
diff --git a/modules/profiles/vscode-settings.json b/modules/profiles/vscode-settings.json
new file mode 100644
index 0000000..e8e7724
--- /dev/null
+++ b/modules/profiles/vscode-settings.json
@@ -0,0 +1,28 @@
+{
+    "diffEditor.renderSideBySide": false,
+    "editor.cursorSurroundingLines": 9,
+    "editor.formatOnSave": true,
+    "editor.renderFinalNewline": false,
+    "editor.scrollBeyondLastLine": false,
+    "files.insertFinalNewline": true,
+    "files.trimFinalNewlines": true,
+    "files.watcherExclude": {
+        "**/result/**": true
+    },
+    "git.autofetch": true,
+    "git.confirmSync": false,
+    "python.formatting.provider": "black",
+    "redhat.telemetry.enabled": false,
+    "security.workspace.trust.banner": "never",
+    "security.workspace.trust.startupPrompt": "never",
+    "security.workspace.trust.untrustedFiles": "newWindow",
+    "terminal.integrated.fontSize": 16,
+    "terminal.integrated.minimumContrastRatio": 1,
+    "terminal.integrated.shellIntegration.enabled": false,
+    "terminal.integrated.showExitAlert": false,
+    "trailing-spaces.highlightCurrentLine": false,
+    "update.showReleaseNotes": false,
+    "window.menuBarVisibility": "hidden",
+    "window.titleBarStyle": "native",
+    "workbench.startupEditor": "none"
+}