Merge branch 'main' of https://git.syzygial.cc/Syzygial/NixMachines

Change of default python to 3.12 broke freecad & kicad because wxpython & shiboken2 depend on <3.12. To be fixed later™️

machines/universedesktop/desktop/wayland.nix

@@ -1,9 +1,8 @@
 { config, pkgs, lib, ... }: {
   # Wayland support
   hardware = {
-    opengl.enable = true;
+    graphics.enable = true;
-    opengl.driSupport = true;
+    graphics.enable32Bit = true;
-    opengl.driSupport32Bit = true;
 
     nvidia = {
       modesetting.enable = true;

machines/universedesktop/programs/art.nix

@@ -114,7 +114,7 @@
   environment.systemPackages = with pkgs; [
     blender
     # GTK theme support (basic) for GTK apps e.g. inkscape
-    gnome.adwaita-icon-theme
+    adwaita-icon-theme
 
     rx
     aseprite-unfree

machines/universedesktop/programs/cad.nix

@@ -1,8 +1,10 @@
 { lib, config, pkgs, ... }: {
   environment.systemPackages = with pkgs; [
     openscad
-    freecad
+    # https://github.com/NixOS/nixpkgs/pull/326595
-    kicad
+    (freecad.override {python3Packages = pkgs.python311.pkgs;})
+    # https://github.com/NixOS/nixpkgs/pull/325726
+    (kicad.override {python3 = pkgs.python311;})
 
     prusa-slicer
   ];