From 0c5c03049bee420c379c030bf510941176cc634f Mon Sep 17 00:00:00 2001
From: roxwize <rae@roxwize.xyz>
Date: Tue, 21 Jan 2025 18:39:20 -0500
Subject: [PATCH] ~

Signed-off-by: roxwize <rae@roxwize.xyz>
---
 TODO                   |  1 +
 nixos/home/base.nix    | 16 +---------------
 nixos/home/dconf.nix   |  3 +--
 nixos/home/default.nix |  4 ++--
 nixos/home/polybar.nix |  3 +--
 nixos/home/vscode.nix  | 37 +++++++++++++++++++++++++++++++++++++
 6 files changed, 43 insertions(+), 21 deletions(-)
 create mode 100644 nixos/home/vscode.nix

diff --git a/TODO b/TODO
index fa006ca..630630f 100644
--- a/TODO
+++ b/TODO
@@ -27,6 +27,7 @@
  +- [ ] Maybe symlink your music to a music folder in your home directory or something (i.e. `~/Music -> /mnt/world/music` or perhaps a subdirectory of that?)
 [ ] alvr doesnt work :(
 [ ] Using clangd and gcc ??? Also clang-tools is atrociously big
+[ ] Try getting `ultram4rine.vscode-choosealicense` (either locally via overlays and `buildVscodeMarketplaceExtension` or via <https://github.com/nix-community/nix-vscode-extensions>)
 
 [x] Get PulseAudio sound controls on polybar to work
 [x] Add desktop switching to windows (context menu?)
diff --git a/nixos/home/base.nix b/nixos/home/base.nix
index af2048f..e9f1314 100644
--- a/nixos/home/base.nix
+++ b/nixos/home/base.nix
@@ -1,5 +1,4 @@
-{ pkgs, inputs, ... }:
-{
+{ pkgs, inputs, ... }: {
     nixpkgs.overlays = import ../overlays.nix inputs;
 
     home = {
@@ -42,19 +41,6 @@
             font = "Fira Code Light 11";
             terminal = "kitty";
         };
-        vscode = {
-            enable = true;
-            package = pkgs.vscodium;
-            extensions = with pkgs.vscode-extensions; [
-                editorconfig.editorconfig
-                jnoortheen.nix-ide
-                llvm-vs-code-extensions.vscode-clangd
-                mesonbuild.mesonbuild
-                rust-lang.rust-analyzer
-                skellock.just
-                wakatime.vscode-wakatime
-            ];
-        };
     };
 
     services = {
diff --git a/nixos/home/dconf.nix b/nixos/home/dconf.nix
index 8563dea..f1c3b47 100644
--- a/nixos/home/dconf.nix
+++ b/nixos/home/dconf.nix
@@ -1,5 +1,4 @@
-{ ... }:
-{
+{ ... }: {
     dconf.settings = {
         "io/elementary/code/settings" = {
             font = "Fira Code Light 10";
diff --git a/nixos/home/default.nix b/nixos/home/default.nix
index e8f349c..443b23c 100644
--- a/nixos/home/default.nix
+++ b/nixos/home/default.nix
@@ -1,5 +1,4 @@
-{ ... }:
-{
+{ ... }: {
     imports = [
         ./base.nix
 
@@ -7,6 +6,7 @@
         ./firefox.nix
         ./neovim.nix
         ./polybar.nix
+        ./vscode.nix
         ./yambar.nix
     ];
 }
diff --git a/nixos/home/polybar.nix b/nixos/home/polybar.nix
index 59d9d49..00263c1 100644
--- a/nixos/home/polybar.nix
+++ b/nixos/home/polybar.nix
@@ -1,5 +1,4 @@
-{ ... }:
-{
+{ ... }: {
     services.polybar = {
         enable = true;
         script = "polybar &";
diff --git a/nixos/home/vscode.nix b/nixos/home/vscode.nix
new file mode 100644
index 0000000..7c09924
--- /dev/null
+++ b/nixos/home/vscode.nix
@@ -0,0 +1,37 @@
+{ pkgs, ... }: {
+    programs.vscode = {
+        enable = true;
+        package = pkgs.vscodium;
+        enableUpdateCheck = false;
+        enableExtensionUpdateCheck = false;
+        extensions = with pkgs.vscode-extensions; [
+            catppuccin.catppuccin-vsc
+            catppuccin.catppuccin-vsc-icons
+            editorconfig.editorconfig
+            esbenp.prettier-vscode
+            jnoortheen.nix-ide
+            llvm-vs-code-extensions.vscode-clangd
+            mesonbuild.mesonbuild
+            rust-lang.rust-analyzer
+            skellock.just
+            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.colorTheme" = "Catppuccin Frappé";
+            "workbench.iconTheme" = "catppuccin-frappe";
+        };
+    };
+}