From 3e9901bd2aeb67c8e2614a1bea047de613fd6df8 Mon Sep 17 00:00:00 2001
From: Katherina Walshe-Grey <git@katherina.rocks>
Date: Wed, 19 Jun 2024 19:14:59 +0100
Subject: [PATCH] Add extra package repos as nixpkgs overrides instead of
 independent references

---
 colmena/local.nix |  4 ----
 hive.nix          | 13 ++++++++++-
 home/vscode.nix   | 55 +++++++++++++++++++++--------------------------
 3 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/colmena/local.nix b/colmena/local.nix
index 51720b9..a567ae9 100644
--- a/colmena/local.nix
+++ b/colmena/local.nix
@@ -8,10 +8,6 @@ in {
     tags = [ "local" ];
   };
 
-  nixpkgs.config.packageOverrides = pkgs: {
-    agenix = (import "${sources.agenix}" { inherit pkgs; }).agenix;
-  };
-
   environment.systemPackages = with pkgs; [
     agenix
     colmena
diff --git a/hive.nix b/hive.nix
index d7a8ae9..c9e17de 100644
--- a/hive.nix
+++ b/hive.nix
@@ -6,7 +6,18 @@ in {
     deployment.replaceUnknownProfiles = false;
     networking.hostName = name;
 
-    nixpkgs.config.allowUnfree = true;
+    nixpkgs.config = {
+      allowUnfree = true;
+      packageOverrides = pkgs: {
+        agenix = (import sources.agenix { inherit pkgs; }).agenix;
+        vscode-extensions = (import sources.nix-vscode-extensions).extensions.x86_64-linux; # TODO: This should check the host architecture
+      };
+    };
+
+    home-manager = {
+      useUserPackages = true;
+      useGlobalPkgs = true;
+    };
 
     imports = [
       (import "${sources.home-manager}/nixos")
diff --git a/home/vscode.nix b/home/vscode.nix
index 4187060..6620c02 100644
--- a/home/vscode.nix
+++ b/home/vscode.nix
@@ -1,39 +1,32 @@
 { 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;
-        "git.confirmSync" = false;
-        "git.enableSmartCommit" = true;
-        "javascript.updateImportsOnFileMove.enabled" = "always";
-        "nix.enableLanguageServer" = true;
-        "nix.serverPath" = "nil";
-        "nix.serverSettings".nil = {
-          diagnostics.ignored = [ "unused_binding" "unused_with" ];
-          formatting.command = [ "nixpkgs-fmt" ];
-        };
-        "workbench.colorTheme" = "SynthWave '84";
+  programs.vscode = {
+    enable = true;
+    enableExtensionUpdateCheck = false;
+    enableUpdateCheck = false;
+    package = pkgs.vscodium;
+    extensions = (with pkgs.vscode-extensions; [
+      open-vsx.jnoortheen.nix-ide
+      open-vsx.ms-python.python
+      open-vsx.robbowen.synthwave-vscode
+    ]);
+    mutableExtensionsDir = false;
+    userSettings = {
+      "extensions.autoUpdate" = false;
+      "git.autofetch" = true;
+      "git.confirmSync" = false;
+      "git.enableSmartCommit" = true;
+      "javascript.updateImportsOnFileMove.enabled" = "always";
+      "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; [