From 39cca340dfe216c0cfbbd1bf12178fe4f0ee6e61 Mon Sep 17 00:00:00 2001
From: foglar <kohout.fi.2023@skola.ssps.cz>
Date: Tue, 5 Nov 2024 15:37:06 +0100
Subject: [PATCH] VSCode update formatting

---
 nixos/packages/packages.nix                |  1 +
 nixos/packages/programming/code.nix        | 69 +++++++++++-----------
 nixos/packages/programming/programming.nix |  1 +
 3 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/nixos/packages/packages.nix b/nixos/packages/packages.nix
index acbb882..05be558 100644
--- a/nixos/packages/packages.nix
+++ b/nixos/packages/packages.nix
@@ -63,6 +63,7 @@
     builtins.elem (lib.getName pkg) [
       "discord"
       "spotify"
+      
       "steam"
       "steam-unwrapped"
 
diff --git a/nixos/packages/programming/code.nix b/nixos/packages/programming/code.nix
index 427fb69..ce049bc 100644
--- a/nixos/packages/programming/code.nix
+++ b/nixos/packages/programming/code.nix
@@ -17,41 +17,44 @@
       enable = true;
 
       userSettings = {
-          "files.autoSave"= "afterDelay";
-          "editor.fontSize" = 16;
-          "editor.minimap.side"= "right";
-          "editor.scrollbar.vertical"= "hidden";
-          "editor.scrollbar.verticalScrollbarSize"= 0;
-          "editor.fontLigatures"= "'calt', 'ss01', 'ss02', 'ss03', 'ss04', 'ss05', 'ss06', 'ss07', 'ss08', 'ss09', 'liga'";
-          "editor.stickyScroll.enabled"= false;
-          "security.workspace.trust.untrustedFiles"= "newWindow";
-          "security.workspace.trust.startupPrompt"= "never";
-          "security.workspace.trust.enabled"= false;
-          "terminal.external.linuxExec"= "kitty";
-          "terminal.integrated.stickyScroll.enabled"= true;
-          "telemetry.telemetryLevel"= "off";
-          "workbench.activityBar.location"= "hidden"; # bottom
-          "workbench.iconTheme"= "material-icon-theme";
-          "workbench.productIconTheme"= "material-product-icons";
-          "window.menuBarVisibility"= "toggle";
-          "github.copilot.editor.enableAutoCompletions"= false;
-          "nix.serverPath"= "nixd";
-          "nix.enableLanguageServer"= true;
-          "nix.serverSettings" = {
-            "nixd" = {
-              "formatting"= {
-                "command"= [ "alejandra" ]; # or nixfmt or nixpkgs-fmt
-              };
-              # "options": {
-              #    "nixos": {
-              #      "expr": "(builtins.getFlake \"~/mysystem/").nixosConfigurations.laptop.options"
-              #    },
-              #    "home_manager": {
-              #      "expr": "(builtins.getFlake \"/PATH/TO/FLAKE\").homeConfigurations..options"
-              #    },
-              # },
+        "files.autoSave" = "afterDelay";
+        "editor.fontSize" = 16;
+        "editor.minimap.side" = "right";
+        "editor.scrollbar.vertical" = "hidden";
+        "editor.scrollbar.verticalScrollbarSize" = 0;
+        "editor.fontLigatures" = "'calt', 'ss01', 'ss02', 'ss03', 'ss04', 'ss05', 'ss06', 'ss07', 'ss08', 'ss09', 'liga'";
+        "editor.stickyScroll.enabled" = false;
+        "security.workspace.trust.untrustedFiles" = "newWindow";
+        "security.workspace.trust.startupPrompt" = "never";
+        "security.workspace.trust.enabled" = false;
+        "terminal.external.linuxExec" = "kitty";
+        "terminal.integrated.stickyScroll.enabled" = true;
+        "telemetry.telemetryLevel" = "off";
+        "workbench.activityBar.location" = "hidden"; # bottom
+        "workbench.iconTheme" = "material-icon-theme";
+        "workbench.productIconTheme" = "material-product-icons";
+        "window.menuBarVisibility" = "toggle";
+        "github.copilot.editor.enableAutoCompletions" = false;
+        "[json]" = {
+          "editor.defaultFormatter" = "esbenp.prettier-vscode";
+        };
+        "nix.serverPath" = "nixd";
+        "nix.enableLanguageServer" = true;
+        "nix.serverSettings" = {
+          "nixd" = {
+            "formatting" = {
+              "command" = ["alejandra"]; # or nixfmt or nixpkgs-fmt
             };
+            # "options": {
+            #    "nixos": {
+            #      "expr": "(builtins.getFlake \"~/mysystem/").nixosConfigurations.laptop.options"
+            #    },
+            #    "home_manager": {
+            #      "expr": "(builtins.getFlake \"/PATH/TO/FLAKE\").homeConfigurations..options"
+            #    },
+            # },
           };
+        };
       };
 
       extensions = with pkgs.vscode-extensions; [
diff --git a/nixos/packages/programming/programming.nix b/nixos/packages/programming/programming.nix
index bf3b3c9..658d0d8 100644
--- a/nixos/packages/programming/programming.nix
+++ b/nixos/packages/programming/programming.nix
@@ -26,6 +26,7 @@
       go
       dotnet-sdk_8
       jq
+      conda
     ];
   };
 }