From 0f824bc28471d827481357766342317af8afe754 Mon Sep 17 00:00:00 2001
From: Katherina Walshe-Grey <git@katherina.rocks>
Date: Wed, 5 Jun 2024 21:07:45 +0100
Subject: [PATCH] [tohru] Modularise vscode config

---
 home/vscode.nix      | 40 ++++++++++++++++++++++++++++++++++++++++
 hosts/tohru/home.nix | 38 ++++----------------------------------
 2 files changed, 44 insertions(+), 34 deletions(-)
 create mode 100644 home/vscode.nix

diff --git a/home/vscode.nix b/home/vscode.nix
new file mode 100644
index 0000000..8d6efee
--- /dev/null
+++ b/home/vscode.nix
@@ -0,0 +1,40 @@
+{ config, lib, pkgs, ... }:
+
+{
+  programs.vscode =
+    let
+      system = builtins.currentSystem;
+      sources = import ../npins;
+      extensions = (import sources.nix-vscode-extensions).extensions.${system};
+    in
+    {
+      enable = true;
+      enableExtensionUpdateCheck = false;
+      enableUpdateCheck = false;
+      package = pkgs.vscodium;
+      extensions = (with pkgs.vscode-extensions; [
+        jnoortheen.nix-ide
+        ms-python.python
+      ]) ++ (with extensions.open-vsx; [
+        robbowen.synthwave-vscode
+      ]);
+      mutableExtensionsDir = false;
+      userSettings = {
+        "extensions.autoUpdate" = false;
+        "git.autofetch" = true;
+        "nix.enableLanguageServer" = true;
+        "nix.serverPath" = "nil";
+        "nix.serverSettings".nil = {
+          diagnostics.ignored = [ "unused_binding" "unused_with" ];
+          formatting.command = [ "nixpkgs-fmt" ];
+        };
+        "workbench.colorTheme" = "SynthWave '84";
+      };
+    };
+
+  # Language servers etc
+  home.packages = with pkgs; [
+    nil
+    nixpkgs-fmt
+  ];
+}
diff --git a/hosts/tohru/home.nix b/hosts/tohru/home.nix
index 44eb80b..332aa97 100644
--- a/hosts/tohru/home.nix
+++ b/hosts/tohru/home.nix
@@ -2,6 +2,10 @@
 
 {
   home-manager.users.qenya = { pkgs, ... }: {
+    imports = [
+      ../../home/vscode.nix
+    ];
+
     home.homeDirectory = config.users.users.qenya.home;
 
     home.packages = with pkgs; [
@@ -11,9 +15,6 @@
 
       bitwarden
       tor-browser-bundle-bin
-
-      nil
-      nixpkgs-fmt
     ];
 
     dconf = {
@@ -47,37 +48,6 @@
       userEmail = "git@katherina.rocks";
     };
 
-    programs.vscode =
-      let
-        system = builtins.currentSystem;
-        sources = import ../../npins;
-        extensions = (import sources.nix-vscode-extensions).extensions.${system};
-      in
-      {
-        enable = true;
-        enableExtensionUpdateCheck = false;
-        enableUpdateCheck = false;
-        package = pkgs.vscodium;
-        extensions = (with pkgs.vscode-extensions; [
-          jnoortheen.nix-ide
-          ms-python.python
-        ]) ++ (with extensions.open-vsx; [
-          robbowen.synthwave-vscode
-        ]);
-        mutableExtensionsDir = false;
-        userSettings = {
-          "extensions.autoUpdate" = false;
-          "git.autofetch" = true;
-          "nix.enableLanguageServer" = true;
-          "nix.serverPath" = "nil";
-          "nix.serverSettings".nil = {
-            diagnostics.ignored = [ "unused_binding" "unused_with" ];
-            formatting.command = [ "nixpkgs-fmt" ];
-          };
-          "workbench.colorTheme" = "SynthWave '84";
-        };
-      };
-
     home.stateVersion = "23.11";
   };
 }