From cf2841a0fc7ec7edeee0422241e500f8cf81abb0 Mon Sep 17 00:00:00 2001
From: iFargle <albert@sysctl.io>
Date: Sat, 30 Sep 2023 21:44:49 +0900
Subject: [PATCH] firefox and vscodium updates

---
 home-manager/common/software/gui/default.nix  |  2 +-
 home-manager/common/software/gui/vscodium.nix | 44 ++++++++++++++++---
 nixos/common/software/gui/firefox.nix         | 36 +++++++++------
 3 files changed, 62 insertions(+), 20 deletions(-)

diff --git a/home-manager/common/software/gui/default.nix b/home-manager/common/software/gui/default.nix
index c9fae3df..c6d29112 100644
--- a/home-manager/common/software/gui/default.nix
+++ b/home-manager/common/software/gui/default.nix
@@ -3,6 +3,6 @@
     ./kitty.nix
     ./firefox.nix
     # ./thunderbird.nix
-    # ./vscodium.nix
+    ./vscodium.nix
     ];
 }
\ No newline at end of file
diff --git a/home-manager/common/software/gui/vscodium.nix b/home-manager/common/software/gui/vscodium.nix
index cc7d66c5..30eb255b 100644
--- a/home-manager/common/software/gui/vscodium.nix
+++ b/home-manager/common/software/gui/vscodium.nix
@@ -1,14 +1,14 @@
-{ config, pkgs, ... }: {
+{ config; pkgs; ... }: {
   programs.vscode = {
     enable = true;
     package = pkgs.vscodium;
     enableUpdateCheck = false;
     enableExtensionUpdateCheck = false;
     extensions = with pkgs.vscode-extensions; [
-        waderyan.gitblame
-        vscodevim.vim
-        oderwat.indent-rainbow
-        naumovs.color-highlight
+        waderyan.gitblame       # See Git Blame info in status bar
+        vscodevim.vim           # Vim keybinds
+        oderwat.indent-rainbow  # Colorise indents
+        naumovs.color-highlight # Highlight HTML color codes
 
         # Themes 
         jdinhlife.gruvbox
@@ -17,7 +17,41 @@
         dracula-theme.theme-dracula
     ];
     userSettings = {
+      # Theming:
+      "window.autoDetectColorScheme" = true;
+      "workbench.preferredLightColorTheme" = "GitHub Light Default";
+      "workbench.preferredDarkColorTheme" = "Github Dark Dimmed";
+      "workbench.colorTheme" = "Github Dark Dimmed";
+      "workbench.iconTheme" = "";
 
+      # Workbench
+      "workbench.startupEditor" = "none";
+      "diffEditor.ignoreTrimWhitespace" = false;
+      "workbench.editor.autoLockGroups" = {
+          "mainThreadWebview-markdown.preview" = true
+      };
+      "editor.fontFamily" = "JetBrainsMono Regular";
+      "editor.fontLigatures" = true;
+
+      # Telemetry
+      "redhat.telemetry.enabled" = false;
+      "telemetry.telemetryLevel" = "off";
+
+      # Git
+      "git.enableSmartCommit" = true;
+      "git.confirmSync" = false;
+      "git.autofetch" = true;
+
+      # Language Specific
+      # Python
+      "python.diagnostics.sourceMapsEnabled" = true;
+      "python.linting.pylintEnabled" = true;
+      "python.linting.pylintArgs" = [
+          "--rcfile=~/.config/pylintrc"
+      ];
+
+      # Rust
+      "rust-analyzer.cargo.buildScripts.overrideCommand" = null;
     };
   };
 }
\ No newline at end of file
diff --git a/nixos/common/software/gui/firefox.nix b/nixos/common/software/gui/firefox.nix
index a2b90638..6a69688a 100644
--- a/nixos/common/software/gui/firefox.nix
+++ b/nixos/common/software/gui/firefox.nix
@@ -3,15 +3,24 @@
     enable = true;
     # https://search.nixos.org/options?channel=23.05&show=programs.firefox.preferences&from=0&size=50&sort=relevance&type=packages&query=firefox
     preferences = {
+
+      # Browser Settings
       "extensions.pocket.enabled" = false;
-      "toolkit.telemetry.pioneer-new-studies-availble" = false;
-      "datareporting.healthreport.uploadEnabled" = false;
-      "datareporting.healthreport.infoURL" = "null";
-      "toolkit.telemetry.server" = "null";
       "browser.newtabpage.activity-stream.feeds.telemetry" = false;
       "browser.newtabpage.activity-stream.telemetry" = false;
       "browser.ping-centre.telemetry" = false;
+      "browser.startup.homepage" = "https://dir.sysctl.io";
+      "browser.search.region" = "US";
+      "browser.search.isUS" = true;
+      "browser.bookmarks.showMobileBookmarks" = false;
+      "browser.newtabpage.enabled" = false;
+      "browser.tabs.firefox-view" = false;
+
+      # Telemetry
+      "toolkit.telemetry.server" = "null";
       "toolkit.telemetry.enabled" = false;
+      "toolkit.telemetry.bhrPing.enabled" = false;
+      "toolkit.telemetry.pioneer-new-studies-availble" = false;
       "toolkit.telemetry.firstShutdownPing.enabled" = false;
       "toolkit.telemetry.hybridContent.enabled" = false;
       "toolkit.telemetry.newProfilePing.enabled" = false;
@@ -20,19 +29,18 @@
       "toolkit.telemetry.reportingpolicy.firstRun" = false;
       "toolkit.telemetry.unified" = false;
       "toolkit.telemetry.archive.enabled" = false;
-      "devtools.onboarding.telemetry.logged" = false;
-      "toolkit.telemetry.bhrPing.enabled" = false;
+
+      # Data Reporting
       "datareporting.policy.dataSubmissionEnabled" = false;
       "datareporting.sessions.current.clean" = "true";
-      "browser.startup.homepage" = "https://dir.sysctl.io";
-      "browser.search.region" = "US";
-      "browser.search.isUS" = false;
-      "distribution.searchplugins.defaultLocale" = "en-US";
-      "general.useragent.locale" = "en-US";
-      "browser.bookmarks.showMobileBookmarks" = false;
-      "browser.newtabpage.enabled" = false;
+      "datareporting.healthreport.uploadEnabled" = false;
+      "datareporting.healthreport.infoURL" = "null";
+
+      # Other
+      "devtools.onboarding.telemetry.logged" = false;
       "services.sync.prefs.sync.browser.newtabpage.enabled" = false;
-      "browser.tabs.firefox-view" = false;
+      "general.useragent.locale" = "en-US";
+      "distribution.searchplugins.defaultLocale" = "en-US";
     };
   };
 }
\ No newline at end of file