From 85f334d3127ed75e4b62fbad502713e04c723caf Mon Sep 17 00:00:00 2001
From: roxwize <rae@roxwize.xyz>
Date: Wed, 22 Jan 2025 22:50:51 -0500
Subject: [PATCH] ~

---
 TODO                  |  1 +
 nixos/home/vscode.nix | 49 ++++++++++++++++++++++++++-----------------
 nixos/packages.nix    |  1 +
 3 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/TODO b/TODO
index ab8917d..17cb68e 100644
--- a/TODO
+++ b/TODO
@@ -32,6 +32,7 @@
  +- [ ] Click to focus doesnt work unless its on the titlebar for some reason
  +- [ ] Using shift instead of ctrl seems inconsistent but it appears that other applications use ctrl+alt+arrowkeys for their own purposes which IDK if i want to overwrite
 [ ] Download Slack !!NOW WWWW!!!!FUCKKKK
+[ ] Fix alt+tab switcher fonts and colors being fucked up
 
 [x] Get PulseAudio sound controls on polybar to work
 [x] Add desktop switching to windows (context menu?)
diff --git a/nixos/home/vscode.nix b/nixos/home/vscode.nix
index e5c0658..3999846 100644
--- a/nixos/home/vscode.nix
+++ b/nixos/home/vscode.nix
@@ -17,24 +17,35 @@
             vadimcn.vscode-lldb
             wakatime.vscode-wakatime
         ];
-        userSettings = {
-            "editor.fontFamily" = "'Fira Code Light', monospace";
-          # "editor.fontLigatures" = true;
-            "editor.formatOnSave" = false;
-            "editor.indentSize" = 4;
-            "editor.tabSize" = 4;
-            "explorer.confirmDelete" = false;
-            "explorer.confirmDragAndDrop" = false;
-            "mesonbuild.buildFolder" = "build";
-            "prettier.tabWidth" = 4;
-            "prettier.trailingComma" = "none";
-            "prettier.singleAttributePerLine" = false;
-            "prettier.useEditorConfig" = true;
-            "telemetry.telemetryLevel" = "off";
-            "workbench.activityBar.iconClickBehavior" = "toggle";
-            "workbench.activityBar.location" = "bottom";
-            "workbench.colorTheme" = "Catppuccin Frappé";
-            "workbench.iconTheme" = "catppuccin-frappe";
-        };
+        userSettings = 
+            let
+                df = lang: formatter: {
+                    name = "[" + lang + "]";
+                    value = {
+                        "editor.defaultFormatter" = formatter;
+                    };
+                };
+            in {
+                "editor.fontFamily" = "'Fira Code Light', monospace";
+              # "editor.fontLigatures" = true;
+                "editor.formatOnSave" = false;
+                "editor.indentSize" = 4;
+                "editor.tabSize" = 4;
+                "explorer.confirmDelete" = false;
+                "explorer.confirmDragAndDrop" = false;
+                "mesonbuild.buildFolder" = "build";
+                "prettier.tabWidth" = 4;
+                "prettier.trailingComma" = "none";
+                "prettier.singleAttributePerLine" = false;
+                "prettier.useEditorConfig" = true;
+                "telemetry.telemetryLevel" = "off";
+                "workbench.activityBar.iconClickBehavior" = "toggle";
+                "workbench.activityBar.location" = "bottom";
+                "workbench.colorTheme" = "Catppuccin Frappé";
+                "workbench.iconTheme" = "catppuccin-frappe";
+            } // builtins.listToAttrs [
+                (df "typescript" "esbenp.prettier-vscode")
+                (df "javascript" "esbenp.prettier-vscode")
+            ];
     };
 }
diff --git a/nixos/packages.nix b/nixos/packages.nix
index 4a4e98b..80f9d48 100644
--- a/nixos/packages.nix
+++ b/nixos/packages.nix
@@ -45,6 +45,7 @@
         pantheon.elementary-gtk-theme                            # GTK theme designed to be smooth, attractive, fast, and usable
         # internet
         nicotine-plus                                            # Graphical client for the SoulSeek peer-to-peer system
+        slack                                                    # Desktop client for Slack
         vesktop                                                  # Alternate client for Discord with Vencord built-in
         yt-dlp                                                   # Command-line tool to download videos from YouTube.com and other sites (youtube-dl fork)
         # system tools