From 3b0c27f3bb912af1bfaf045682faf686dcf7a1ac Mon Sep 17 00:00:00 2001
From: Thomas Syms <thomassyms@gmail.com>
Date: Tue, 23 Jan 2024 14:08:20 -0400
Subject: [PATCH] Fixed VSCode theming conflict

---
 themes/targets/all.nix        | 1 +
 themes/tokyonight/default.nix | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/themes/targets/all.nix b/themes/targets/all.nix
index 321ff9a..38ab0fb 100644
--- a/themes/targets/all.nix
+++ b/themes/targets/all.nix
@@ -4,6 +4,7 @@
   home-manager.sharedModules = [
     {
       stylix.autoEnable = true;
+      stylix.targets.vscode.enable = false;
     }
   ];
 }
diff --git a/themes/tokyonight/default.nix b/themes/tokyonight/default.nix
index 6c979d7..90989e9 100644
--- a/themes/tokyonight/default.nix
+++ b/themes/tokyonight/default.nix
@@ -2,7 +2,6 @@
   pkgs,
   system,
   inputs,
-  lib,
   ...
 }: {
   stylix.image = ./wallpaper.jpg;
@@ -16,7 +15,7 @@
           vscode-marketplace.huytd.tokyo-city
           vscode-marketplace.vscode-icons-team.vscode-icons
         ];
-        userSettings = lib.mkForce {
+        userSettings = {
           "workbench.colorTheme" = "Tokyo City Darker";
           "workbench.iconTheme" = "vscode-icons";
         };