From 07705b4dcaa8ba4277c4c3043c9c5bd8436967d8 Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Sun, 22 Nov 2020 21:26:28 +0000
Subject: [PATCH] Move more packages into sets

---
 packages.nix            |  4 ----
 private                 |  2 +-
 sets/hardware.nix       | 39 +++++++++++++++++----------------------
 sets/neovim/default.nix |  8 ++++++++
 4 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/packages.nix b/packages.nix
index 696e930..05153b8 100644
--- a/packages.nix
+++ b/packages.nix
@@ -136,11 +136,7 @@ in
     llvm.clang
     llvm.lld
     nasm
-    nixpkgs-fmt
-    nodejs
     patchelf
-    python37Packages.python-language-server
-    rnix-lsp
     rustup
     valgrind
     yarn
diff --git a/private b/private
index 2075554..23bbfd2 160000
--- a/private
+++ b/private
@@ -1 +1 @@
-Subproject commit 2075554bdfc0515af6990199514a82bb74ac533f
+Subproject commit 23bbfd25c49e4eeb2e2127c1dd73c97db330b1ba
diff --git a/sets/hardware.nix b/sets/hardware.nix
index 5ed5713..0fa230e 100644
--- a/sets/hardware.nix
+++ b/sets/hardware.nix
@@ -1,26 +1,21 @@
 { config, pkgs, ... }:
 
-let
-  openocd = if pkgs.stdenv.cc.isGNU then (pkgs.openocd.overrideAttrs ( old: {
-    NIX_CFLAGS_COMPILE = old.NIX_CFLAGS_COMPILE ++ [ "-Wno-error=strict-prototypes" ];
-  })) else pkgs.openocd;
-in
-  {
-    services.udev.packages = [
-      (pkgs.callPackage ../externals/rules/adafruit.nix { })
-      (pkgs.callPackage ../externals/rules/limesuite.nix { })
-      openocd
-    ];
+{
+  services.udev.packages = [
+    (pkgs.callPackage ../externals/rules/adafruit.nix { })
+    (pkgs.callPackage ../externals/rules/limesuite.nix { })
+    pkgs.openocd
+  ];
 
-    environment.systemPackages = with pkgs; [
-      kicad-unstable
-      openocd
-      stlink
-      (callPackage ../externals/packages/jlink { })
-    ];
+  environment.systemPackages = with pkgs; [
+    kicad-unstable
+    openocd
+    stlink
+    (callPackage ../externals/packages/jlink { })
+  ];
 
-    users = {
-      users.artemis.extraGroups = [ "plugdev" "dialout" ];
-      extraGroups.plugdev = {};
-    };
-  }
+  users = {
+    users.artemis.extraGroups = [ "plugdev" "dialout" ];
+    extraGroups.plugdev = {};
+  };
+}
diff --git a/sets/neovim/default.nix b/sets/neovim/default.nix
index 4c0c012..107a8d5 100644
--- a/sets/neovim/default.nix
+++ b/sets/neovim/default.nix
@@ -26,4 +26,12 @@
       ];
     };
   };
+
+  environment.systemPackages = with pkgs; [
+    nixpkgs-fmt
+    nodejs
+    python3Packages.python-language-server
+    rnix-lsp
+    rust-analyzer
+  ];
 }