From 4934c3e57eb0a4d0197c16a1886ea4b91b964502 Mon Sep 17 00:00:00 2001 From: David Crompton Date: Sat, 13 Jul 2024 11:11:26 -0400 Subject: [PATCH 1/4] nixos: hardware.opengl -> hardware.graphics --- machines/universedesktop/desktop/wayland.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/machines/universedesktop/desktop/wayland.nix b/machines/universedesktop/desktop/wayland.nix index db4db84..e850b62 100644 --- a/machines/universedesktop/desktop/wayland.nix +++ b/machines/universedesktop/desktop/wayland.nix @@ -1,9 +1,8 @@ { config, pkgs, lib, ... }: { # Wayland support hardware = { - opengl.enable = true; - opengl.driSupport = true; - opengl.driSupport32Bit = true; + graphics.enable = true; + graphics.enable32Bit = true; nvidia = { modesetting.enable = true; From 3abc41a934bbcae740a98ca0484d91b25b5bc354 Mon Sep 17 00:00:00 2001 From: David Crompton Date: Sat, 13 Jul 2024 11:13:48 -0400 Subject: [PATCH 2/4] nixos: gnome.adwaita-icon-theme -> pkgs.adwaita-icon-theme --- machines/universedesktop/programs/art.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/machines/universedesktop/programs/art.nix b/machines/universedesktop/programs/art.nix index 0b45148..caf552e 100644 --- a/machines/universedesktop/programs/art.nix +++ b/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 From 0abd9978d8a09ab33bc73f53ff6001e713c45481 Mon Sep 17 00:00:00 2001 From: David Crompton Date: Sat, 13 Jul 2024 11:22:43 -0400 Subject: [PATCH 3/4] nixos: shiboken2 & wxpython broken for 3.12 Change of default python to 3.12 broke freecad & kicad because wxpython & shiboken2 depend on <3.12. To be fixed later:tm: --- machines/universedesktop/programs/cad.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/machines/universedesktop/programs/cad.nix b/machines/universedesktop/programs/cad.nix index 4ce328d..63b996f 100644 --- a/machines/universedesktop/programs/cad.nix +++ b/machines/universedesktop/programs/cad.nix @@ -1,8 +1,10 @@ { lib, config, pkgs, ... }: { environment.systemPackages = with pkgs; [ openscad - freecad - kicad + # https://github.com/NixOS/nixpkgs/pull/326595 + (freecad.override {python3Packages = pkgs.python311.pkgs;}) + # https://github.com/NixOS/nixpkgs/pull/325726 + (kicad.override {python3 = pkgs.python311;}) prusa-slicer ]; From cd445975babd00ee2f3b48522f6b852eb7ee7e8d Mon Sep 17 00:00:00 2001 From: David Crompton Date: Tue, 23 Jul 2024 19:53:32 -0400 Subject: [PATCH 4/4] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/90ae324e2c56af10f20549ab72014804a3064c7f' (2024-07-11) → 'github:nix-community/home-manager/7560dc942a6fbd37ebd1310b3dbda513de2d4b82' (2024-07-23) • Updated input 'me-emacs': 'git+https://git.syzygial.cc/Syzygial/EmacsConfig.git?ref=refs/heads/master&rev=5433a14e490639b735715aa2e672066a23daaa0b' (2024-07-14) → 'git+https://git.syzygial.cc/Syzygial/EmacsConfig.git?ref=refs/heads/master&rev=031084e3c685a5247536cc94b55d2887640658d3' (2024-07-14) • Updated input 'nix-darwin': 'github:LnL7/nix-darwin/5ce8503cf402cf76b203eba4b7e402bea8e44abc' (2024-07-13) → 'github:LnL7/nix-darwin/884f3fe6d9bf056ba0017c132c39c1f0d07d4fec' (2024-07-23) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/feb2849fdeb70028c70d73b848214b00d324a497' (2024-07-09) → 'github:NixOS/nixpkgs/68c9ed8bbed9dfce253cc91560bf9043297ef2fe' (2024-07-21) • Updated input 'sops-nix': 'github:Mic92/sops-nix/67035a355b1d52d2d238501f8cc1a18706979760' (2024-07-08) → 'github:Mic92/sops-nix/aff2f88277dabe695de4773682842c34a0b7fd54' (2024-07-22) • Updated input 'sops-nix/nixpkgs': 'github:NixOS/nixpkgs/4284c2b73c8bce4b46a6adf23e16d9e2ec8da4bb' (2024-07-05) → 'github:NixOS/nixpkgs/6e14bbce7bea6c4efd7adfa88a40dac750d80100' (2024-07-20) • Updated input 'sops-nix/nixpkgs-stable': 'github:NixOS/nixpkgs/550ac3e955c30fe96dd8b2223e37e0f5d225c927' (2024-07-06) → 'github:NixOS/nixpkgs/556533a23879fc7e5f98dd2e0b31a6911a213171' (2024-07-21) --- flake.lock | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index 1637139..133856b 100644 --- a/flake.lock +++ b/flake.lock @@ -66,11 +66,11 @@ ] }, "locked": { - "lastModified": 1720734513, - "narHash": "sha256-neWQ8eNtLTd+YMesb7WjKl1SVCbDyCm46LUgP/g/hdo=", + "lastModified": 1721714663, + "narHash": "sha256-ZDW5+rlROxaOuoEfIQM7Gqhoa+WALEYdYIiZhyJjAu0=", "owner": "nix-community", "repo": "home-manager", - "rev": "90ae324e2c56af10f20549ab72014804a3064c7f", + "rev": "7560dc942a6fbd37ebd1310b3dbda513de2d4b82", "type": "github" }, "original": { @@ -88,11 +88,11 @@ ] }, "locked": { - "lastModified": 1720979867, - "narHash": "sha256-9SaLJ+TyILVuDBLHR/8ltOnLhqgs864P5L2nnNHKBCw=", + "lastModified": 1720981146, + "narHash": "sha256-UsyP+WaOY1S9p0EIGJOCBIQ7VSZ8HbN5Gs5wSp8prR8=", "ref": "refs/heads/master", - "rev": "5433a14e490639b735715aa2e672066a23daaa0b", - "revCount": 66, + "rev": "031084e3c685a5247536cc94b55d2887640658d3", + "revCount": 68, "type": "git", "url": "https://git.syzygial.cc/Syzygial/EmacsConfig.git" }, @@ -108,11 +108,11 @@ ] }, "locked": { - "lastModified": 1720845312, - "narHash": "sha256-yPhAsJTpyoIPQZJGC8Fw8W2lAXyhLoTn+HP20bmfkfk=", + "lastModified": 1721719500, + "narHash": "sha256-nnkqjv4Y37Hydjh6HE9wW4kSkV5Q7q4iIXlL5lwUFOw=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "5ce8503cf402cf76b203eba4b7e402bea8e44abc", + "rev": "884f3fe6d9bf056ba0017c132c39c1f0d07d4fec", "type": "github" }, "original": { @@ -124,11 +124,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1720542800, - "narHash": "sha256-ZgnNHuKV6h2+fQ5LuqnUaqZey1Lqqt5dTUAiAnqH0QQ=", + "lastModified": 1721562059, + "narHash": "sha256-Tybxt65eyOARf285hMHIJ2uul8SULjFZbT9ZaEeUnP8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "feb2849fdeb70028c70d73b848214b00d324a497", + "rev": "68c9ed8bbed9dfce253cc91560bf9043297ef2fe", "type": "github" }, "original": { @@ -156,11 +156,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1720282526, - "narHash": "sha256-dudRkHPRivMNOhd04YI+v4sWvn2SnN5ODSPIu5IVbco=", + "lastModified": 1721524707, + "narHash": "sha256-5NctRsoE54N86nWd0psae70YSLfrOek3Kv1e8KoXe/0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "550ac3e955c30fe96dd8b2223e37e0f5d225c927", + "rev": "556533a23879fc7e5f98dd2e0b31a6911a213171", "type": "github" }, "original": { @@ -172,11 +172,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1720181791, - "narHash": "sha256-i4vJL12/AdyuQuviMMd1Hk2tsGt02hDNhA0Zj1m16N8=", + "lastModified": 1721466660, + "narHash": "sha256-pFSxgSZqZ3h+5Du0KvEL1ccDZBwu4zvOil1zzrPNb3c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4284c2b73c8bce4b46a6adf23e16d9e2ec8da4bb", + "rev": "6e14bbce7bea6c4efd7adfa88a40dac750d80100", "type": "github" }, "original": { @@ -201,11 +201,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1720479166, - "narHash": "sha256-jqvhLDXzTLTHq9ZviFOpcTmXXmnbLfz7mWhgMNipMN4=", + "lastModified": 1721688883, + "narHash": "sha256-9jsjsRKtJRqNSTXKj9zuDFRf2PGix30nMx9VKyPgD2U=", "owner": "Mic92", "repo": "sops-nix", - "rev": "67035a355b1d52d2d238501f8cc1a18706979760", + "rev": "aff2f88277dabe695de4773682842c34a0b7fd54", "type": "github" }, "original": {