stuf

extras/dev.nix

@@ -1,5 +1,6 @@
 { pkgs, ... }: {
   environment.systemPackages = with pkgs; [
+    freecad
     # alsa-lib
     # alsa-oss
     # clang
@@ -10,20 +11,20 @@
     # openssl
     # pkg-config
     # pkgconfig
-    # rustup
+    rustup
     # udev
     nixpkgs-fmt
     nil
-    expat
-    fontconfig
-    freetype
-    freetype.dev
-    libGL
-    pkgconfig
-    xorg.libX11
-    xorg.libXcursor
-    xorg.libXi
-    xorg.libXrandr
+    # expat
+    # fontconfig
+    # freetype
+    # freetype.dev
+    # libGL
+    # pkgconfig
+    # xorg.libX11
+    # xorg.libXcursor
+    # xorg.libXi
+    # xorg.libXrandr
     bacon
     unstable.cargo
     unstable.cargo-feature
@@ -47,25 +48,6 @@
     "electron-12.2.3"
   ];
 
-  environment.variables = {
-    # LIBCLANG_PATH = pkgs.lib.makeLibraryPath [ pkgs.libclang.lib ];
-    # LD_LIBRARY_PATH =
-    #   builtins.foldl' (a: b: "${a}:${b}/lib") "${pkgs.vulkan-loader}/lib" pkgs;
-    LD_LIBRARY_PATH = builtins.foldl' (a: b: "${a}:${b}/lib") "${pkgs.vulkan-loader}/lib" [
-      pkgs.expat
-      pkgs.fontconfig
-      pkgs.freetype
-      pkgs.freetype.dev
-      pkgs.libGL
-      pkgs.pkgconfig
-      pkgs.xorg.libX11
-      pkgs.xorg.libXcursor
-      pkgs.xorg.libXi
-      pkgs.xorg.libXrandr
-      pkgs.vulkan-loader
-    ];
-  };
-
   services.udev.extraRules = ''
     SUBSYSTEM == "tty", GROUP="dialout", ATTRS{interface}=="Black Magic GDB Server", SYMLINK+="ttyBmpGdb"
     SUBSYSTEM == "tty", GROUP="dialout", ATTRS{interface}=="Black Magic UART Port",  SYMLINK+="ttyBmpTarg"