From c8509fbf7b7c77e2e72a67cee89d97d02b1cdb8f Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Sat, 2 Nov 2024 22:48:20 +0100 Subject: [PATCH] feat(steveej-x13s and treewide): get most recent libcamera with fixes --- flake.lock | 268 ++++++++---------- flake.nix | 29 -- .../configuration/graphical-fullblown.nix | 47 ++- nix/home-manager/profiles/common.nix | 18 ++ nix/home-manager/profiles/sway-desktop.nix | 19 +- nix/home-manager/programs/firefox.nix | 7 +- nix/home-manager/programs/libreoffice.nix | 2 +- nix/os/devices/steveej-x13s/configuration.nix | 36 ++- nix/os/devices/steveej-x13s/flake.lock | 86 +++--- nix/os/devices/steveej-x13s/flake.nix | 59 +++- nix/os/snippets/holo-zerotier.nix | 2 +- nix/os/snippets/home-manager-with-zsh.nix | 1 + nix/os/snippets/sway-desktop.nix | 5 +- 13 files changed, 308 insertions(+), 271 deletions(-) diff --git a/flake.lock b/flake.lock index b92ef8e..5d64be7 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "aphorme_launcher": { "flake": false, "locked": { - "lastModified": 1713530567, - "narHash": "sha256-p1ZIMMDyQWVzoeyHb3sbeV6XQwbIDoQwJU8ynI8hGUI=", + "lastModified": 1719922896, + "narHash": "sha256-mOtCz42NFQn+0xPF3gBX4WHfo5UEClSsJ/tF8RdFQkY=", "owner": "Iaphetes", "repo": "aphorme_launcher", - "rev": "abc42c3d9e98dfd2c910cf348110232ff25129b4", + "rev": "c7c7ce9f91a31cced181fa501a2cad3c68035def", "type": "github" }, "original": { @@ -20,11 +20,11 @@ "ath11k-firmware": { "flake": false, "locked": { - "lastModified": 1720482684, - "narHash": "sha256-p6ifwtRNUOyQ2FN2VhSXS6dcrvrtiFZawu/iVXQ4uR0=", + "lastModified": 1729352325, + "narHash": "sha256-U2rdpaKV09mLDIt7MNdbolE8HBzXawXoo7uo3HY5gBk=", "ref": "refs/heads/main", - "rev": "bb527dcebac835c47ed4f5428a7687769fa9b1b2", - "revCount": 152, + "rev": "4c8ae2fb2b78d5b0bebed63fe8b0f348f9fbc33e", + "revCount": 160, "type": "git", "url": "https://git.codelinaro.org/clo/ath-firmware/ath11k-firmware.git" }, @@ -43,11 +43,11 @@ "stable": "stable" }, "locked": { - "lastModified": 1711386353, - "narHash": "sha256-gWEpb8Hybnoqb4O4tmpohGZk6+aerAbJpywKcFIiMlg=", + "lastModified": 1728263678, + "narHash": "sha256-gyUVsPAWY9AgVKjrNPoowrIr5BvK4gI0UkDXvv8iSxA=", "owner": "zhaofengli", "repo": "colmena", - "rev": "cd65ef7a25cdc75052fbd04b120aeb066c3881db", + "rev": "b0a62f234fae02a006123e661ff70e62af16106b", "type": "github" }, "original": { @@ -57,17 +57,12 @@ } }, "crane": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, "locked": { - "lastModified": 1720226507, - "narHash": "sha256-yHVvNsgrpyNTXZBEokL8uyB2J6gB1wEx0KOJzoeZi1A=", + "lastModified": 1730060262, + "narHash": "sha256-RMgSVkZ9H03sxC+Vh4jxtLTCzSjPq18UWpiM0gq6shQ=", "owner": "ipetkov", "repo": "crane", - "rev": "0aed560c5c0a61c9385bddff471a13036203e11c", + "rev": "498d9f122c413ee1154e8131ace5a35a80d8fa76", "type": "github" }, "original": { @@ -84,11 +79,11 @@ ] }, "locked": { - "lastModified": 1718008439, - "narHash": "sha256-nlh/2uD5p2SAdkn6Zuey20yaR5FFWvhL3poapDGNE4Y=", + "lastModified": 1727359191, + "narHash": "sha256-5PltTychnExFwzpEnY3WhOywaMV/M6NxYI/y3oXuUtw=", "owner": "nix-community", "repo": "disko", - "rev": "c1cfbfad7cb45f0c177b35b59ba67d1b5fc7ca82", + "rev": "67dc29be3036cc888f0b9d4f0a788ee0f6768700", "type": "github" }, "original": { @@ -123,11 +118,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1713421495, - "narHash": "sha256-5vVF9W1tJT+WdfpWAEG76KywktKDAW/71mVmNHEHjac=", + "lastModified": 1730442928, + "narHash": "sha256-U1DWb5c3EfkA7pqx5V1H4AWRA+EaE6UJ0lIRvK1RxgM=", "owner": "nix-community", "repo": "fenix", - "rev": "fd47b1f9404fae02a4f38bd9f4b12bad7833c96b", + "rev": "87b4d20f896c99018dde4702a9c6157b516f2a76", "type": "github" }, "original": { @@ -170,11 +165,11 @@ }, "flake-compat_3": { "locked": { - "lastModified": 1688025799, - "narHash": "sha256-ktpB4dRtnksm9F5WawoIkEneh1nrEvuxb5lJFt1iOyw=", + "lastModified": 1717312683, + "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=", "owner": "nix-community", "repo": "flake-compat", - "rev": "8bf105319d44f6b9f0d764efa4fdef9f1cc9ba1c", + "rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea", "type": "github" }, "original": { @@ -188,11 +183,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -209,11 +204,11 @@ ] }, "locked": { - "lastModified": 1717285511, - "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", + "lastModified": 1726153070, + "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", + "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", "type": "github" }, "original": { @@ -231,11 +226,11 @@ ] }, "locked": { - "lastModified": 1701473968, - "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=", + "lastModified": 1722555600, + "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5", + "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", "type": "github" }, "original": { @@ -282,11 +277,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -315,11 +310,11 @@ }, "get-flake": { "locked": { - "lastModified": 1694475786, - "narHash": "sha256-s5wDmPooMUNIAAsxxCMMh9g68AueGg63DYk2hVZJbc8=", + "lastModified": 1714237590, + "narHash": "sha256-9gtHdGbzFHaR20xORN8IYd67ROWS+1nqQ5CsPf9MD8I=", "owner": "ursi", "repo": "get-flake", - "rev": "ac54750e3b95dab6ec0726d77f440efe6045bec1", + "rev": "a6c57417d1b857b8be53aba4095869a0f438c502", "type": "github" }, "original": { @@ -331,11 +326,11 @@ "jay": { "flake": false, "locked": { - "lastModified": 1713529603, - "narHash": "sha256-PjHxMABsAbQ6ZkjsmdREQ5D4CTtxCF1aRlyEqKsXMls=", + "lastModified": 1730371037, + "narHash": "sha256-oMVScShS67LZz3BeZTABDQWHv8hZqBXuj+ng14OIr9E=", "owner": "mahkoh", "repo": "jay", - "rev": "670588fe4dc5ea1051e34d51c99282f6c8c4d2b2", + "rev": "f36993eb6eea000f386fbf5bfa3d08dac1bd43c1", "type": "github" }, "original": { @@ -350,11 +345,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1713105314, - "narHash": "sha256-X3URKbcgIy4UaQGrsy3DmY5x+fePQ5IYaa76YewoUE0=", + "lastModified": 1730031145, + "narHash": "sha256-GZz0LGkeduajnF7zUuPu5evNyoOATcSsRZCkG1OqiwY=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "f347ed9a1cab12c27541ed4d173e2f2d5c9bc0bb", + "rev": "7d235f23a84b54c39b1579b68b13e1ff83f5b1ad", "type": "github" }, "original": { @@ -383,11 +378,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1705242886, - "narHash": "sha256-TLj334vRwFtSym3m+NnKcNCnKKPNoTC/TDZL40vmOso=", + "lastModified": 1730389079, + "narHash": "sha256-g/CJ/KKe5MGsVx1oCBl0F9aCdcNSDeOw8H7e5QDGa2c=", "owner": "nix-community", "repo": "nix-eval-jobs", - "rev": "6b03a93296faf174b97546fd573c8b379f523a8d", + "rev": "7f9159a16584ee86eed077c8a73e845690b7d513", "type": "github" }, "original": { @@ -405,11 +400,11 @@ ] }, "locked": { - "lastModified": 1701208414, - "narHash": "sha256-xrQ0FyhwTZK6BwKhahIkUVZhMNk21IEI1nUcWSONtpo=", + "lastModified": 1720066371, + "narHash": "sha256-uPlLYH2S0ACj0IcgaK9Lsf4spmJoGejR9DotXiXSBZQ=", "owner": "nix-community", "repo": "nix-github-actions", - "rev": "93e39cc1a087d65bcf7a132e75a650c44dd2b734", + "rev": "622f829f5fe69310a866c8a6cd07e747c44ef820", "type": "github" }, "original": { @@ -425,11 +420,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1729216050, - "narHash": "sha256-eVfbrE7JnaxFeGndHjTGGxuFoqZ6+/CjS2qfvV1HsXg=", + "lastModified": 1730426202, + "narHash": "sha256-swwKpE3lrdvcSh6Hjyf/eSe/zPnsZgeVlSl+B4yBpeo=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "4dfd7581aaf0f25d3b7695a10dcfb1dfe4ebb953", + "rev": "96dcbddd24edc60ad47f41bb2a73e06099eba4af", "type": "github" }, "original": { @@ -450,11 +445,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1718803059, - "narHash": "sha256-MYvDgSPWdF0hP6vzOhpqY+2a66ZLELFj+MUP5S/+dBY=", + "lastModified": 1729496181, + "narHash": "sha256-LrCxIU6laEf4JD1QtOBNr+PASY6CbNPpUrjLIUizt+Y=", "owner": "numtide", "repo": "nixos-anywhere", - "rev": "ce18c086d8ca143d43ab20b3db20ab1e3e62c519", + "rev": "51d347d35caec995d36d1450cb5bb183318c7fb7", "type": "github" }, "original": { @@ -476,11 +471,11 @@ ] }, "locked": { - "lastModified": 1717994219, - "narHash": "sha256-ueTu01bYU5QXdL77psMkApYHpk339xNHg/M7ZzP3uPI=", + "lastModified": 1727367213, + "narHash": "sha256-7O4pi8MmcJpA0nYUQkdolvKGyu6zNjf2gFYD1Q0xppc=", "owner": "nix-community", "repo": "nixos-images", - "rev": "e2fd329c3a39a90bb43e1e2cf47c180ed57831bf", + "rev": "3e7978bab153f39f3fc329ad346d35a8871420f7", "type": "github" }, "original": { @@ -491,11 +486,11 @@ }, "nixos-stable": { "locked": { - "lastModified": 1717696253, - "narHash": "sha256-1+ua0ggXlYYPLTmMl3YeYYsBXDSCqT+Gw3u6l4gvMhA=", + "lastModified": 1727264057, + "narHash": "sha256-KQPI8CTTnB9CrJ7LrmLC4VWbKZfljEPBXOFGZFRpxao=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9b5328b7f761a7bbdc0e332ac4cf076a3eedb89b", + "rev": "759537f06e6999e141588ff1c9be7f3a5c060106", "type": "github" }, "original": { @@ -555,11 +550,11 @@ }, "nixpkgs-2311": { "locked": { - "lastModified": 1713344939, - "narHash": "sha256-jpHkAt0sG2/J7ueKnG7VvLLkBYUMQbXQ2L8OBpVG53s=", + "lastModified": 1720535198, + "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e402c3eb6d88384ca6c52ef1c53e61bdc9b84ddd", + "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5", "type": "github" }, "original": { @@ -571,11 +566,11 @@ }, "nixpkgs-2405": { "locked": { - "lastModified": 1717144377, - "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=", + "lastModified": 1730327045, + "narHash": "sha256-xKel5kd1AbExymxoIfQ7pgcX6hjw9jCgbiBjiUfSVJ8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "805a384895c696f802a9bf5bf4720f37385df547", + "rev": "080166c15633801df010977d9d7474b4a6c549d7", "type": "github" }, "original": { @@ -603,29 +598,23 @@ }, "nixpkgs-lib": { "locked": { - "dir": "lib", - "lastModified": 1711703276, - "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", - "type": "github" + "lastModified": 1727825735, + "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" }, "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" } }, "nixpkgs-lib_2": { "locked": { - "lastModified": 1713055793, - "narHash": "sha256-vIrZQykYW32RnlI2lT/gCcB59BOIqqrAmPirBdiirrc=", + "lastModified": 1729990941, + "narHash": "sha256-hUP9oxmnOmNnKcDOf5Y55HQ+NnoT0+bLWHLQWLLw9Ks=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "361d8a4f443bbfab20bd6d222f9022b8c6665906", + "rev": "7d68864343650322045894951602d6e82b5296d7", "type": "github" }, "original": { @@ -636,27 +625,27 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1713434076, - "narHash": "sha256-+/p5edwlkqKZc6GDAQl+92Hoe1f3NNbUF9uj+X9H3pU=", + "lastModified": 1729973466, + "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8494ae076b7878d61a7d2d25e89a847fe8f8364c", + "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-23.11", + "ref": "release-24.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1713297878, - "narHash": "sha256-hOkzkhLT59wR8VaMbh1ESjtZLbGi+XNaBN6h49SPqEc=", + "lastModified": 1730200266, + "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "66adc1e47f8784803f2deb6cacd5e07264ec2d5c", + "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", "type": "github" }, "original": { @@ -668,11 +657,11 @@ }, "nixpkgs-vscodium": { "locked": { - "lastModified": 1713297878, - "narHash": "sha256-hOkzkhLT59wR8VaMbh1ESjtZLbGi+XNaBN6h49SPqEc=", + "lastModified": 1730200266, + "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "66adc1e47f8784803f2deb6cacd5e07264ec2d5c", + "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", "type": "github" }, "original": { @@ -690,11 +679,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1713543674, - "narHash": "sha256-vQPF8Y36O99EuS0aVIZDlO9SuwlXzGfzQGNKeaBTFxg=", + "lastModified": 1730425081, + "narHash": "sha256-c8JK1Zuc9QjfLfbnAEtB3uHz5pd+RMgMiR263TEtwAs=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "ee21b656ea43b305c8f7e25ab2994aec375083eb", + "rev": "968d7a95604a2ec252ce9912199dfa9ec6410ff0", "type": "github" }, "original": { @@ -705,11 +694,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1703134684, - "narHash": "sha256-SQmng1EnBFLzS7WSRyPM9HgmZP2kLJcPAz+Ug/nug6o=", + "lastModified": 1723221148, + "narHash": "sha256-7pjpeQlZUNQ4eeVntytU3jkw9dFK3k1Htgk2iuXjaD8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d6863cbcbbb80e71cecfc03356db1cda38919523", + "rev": "154bcb95ad51bc257c2ce4043a725de6ca700ef6", "type": "github" }, "original": { @@ -721,11 +710,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1713297878, - "narHash": "sha256-hOkzkhLT59wR8VaMbh1ESjtZLbGi+XNaBN6h49SPqEc=", + "lastModified": 1730200266, + "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "66adc1e47f8784803f2deb6cacd5e07264ec2d5c", + "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", "type": "github" }, "original": { @@ -738,11 +727,11 @@ "ofi-pass": { "flake": false, "locked": { - "lastModified": 1691863924, - "narHash": "sha256-Vkm3QXjkLIu0RnM0w+upzAF9M7atKBPYqiV7f+eBKJY=", + "lastModified": 1723412133, + "narHash": "sha256-rOVbz4v1+DHPJMvRtxdOFWdOHlaxI7G2vm0bgEV/0Cg=", "owner": "sereinity", "repo": "ofi-pass", - "rev": "b20bd3440686429b113821c51a68b799675d5bb0", + "rev": "2b6aa6a3fc0504e63df4ac3449e0065a1a4d19d0", "type": "github" }, "original": { @@ -821,7 +810,6 @@ "nixpkgs-2211" ], "rperf": "rperf", - "salut": "salut", "sops-nix": "sops-nix", "srvos": "srvos", "x13s-bt-firmware": "x13s-bt-firmware", @@ -847,11 +835,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1713373173, - "narHash": "sha256-octd9BFY9G/Gbr4KfwK4itZp4Lx+qvJeRRcYnN+dEH8=", + "lastModified": 1730386175, + "narHash": "sha256-0Uq+/B8eu7pw8B8pxuGdFYKjcVLwNMcHfDxU9sXh7rg=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "46702ffc1a02a2ac153f1d1ce619ec917af8f3a6", + "rev": "0ba893e1a00d92557ac91efb771d72eee36ca687", "type": "github" }, "original": { @@ -861,22 +849,6 @@ "type": "github" } }, - "salut": { - "flake": false, - "locked": { - "lastModified": 1671283721, - "narHash": "sha256-W0lhhImSXtYJDeMbxyEioYu/Bh7ZclwR1/5DzNbxM8o=", - "owner": "snakedye", - "repo": "salut", - "rev": "aa57c4d190812908a9c32cd49cff14390c6dfdcb", - "type": "gitlab" - }, - "original": { - "owner": "snakedye", - "repo": "salut", - "type": "gitlab" - } - }, "sops-nix": { "inputs": { "nixpkgs": [ @@ -885,11 +857,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1713532771, - "narHash": "sha256-vfKxhYVMzG2tg48/1rewBoSLCrKIjQsG1j7Nm/Y2gf4=", + "lastModified": 1729999681, + "narHash": "sha256-qm0uCtM9bg97LeJTKQ8dqV/FvqRN+ompyW4GIJruLuw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "a929a011a09db735abc45a8a45d1ff7fdee62755", + "rev": "1666d16426abe79af5c47b7c0efa82fd31bf4c56", "type": "github" }, "original": { @@ -905,11 +877,11 @@ ] }, "locked": { - "lastModified": 1713533513, - "narHash": "sha256-nv5GmWaGryyZU8ihQIYLZWasqaXTZKGTjsypG0TRw9Q=", + "lastModified": 1730335989, + "narHash": "sha256-hG7H+EcNZfNa5tsUzMX+NBYpG4viCTvfRp5t7ZUnKW8=", "owner": "numtide", "repo": "srvos", - "rev": "d8945920cb8e98dc737d1fc2d42607f5916c34cf", + "rev": "b80b3ffabd20e39b579f45a33e638bbb1b297b60", "type": "github" }, "original": { @@ -920,16 +892,16 @@ }, "stable": { "locked": { - "lastModified": 1696039360, - "narHash": "sha256-g7nIUV4uq1TOVeVIDEZLb005suTWCUjSY0zYOlSBsyE=", + "lastModified": 1724316499, + "narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "32dcb45f66c0487e92db8303a798ebc548cadedc", + "rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } @@ -987,11 +959,11 @@ ] }, "locked": { - "lastModified": 1717850719, - "narHash": "sha256-npYqVg+Wk4oxnWrnVG7416fpfrlRhp/lQ6wQ4DHI8YE=", + "lastModified": 1727252110, + "narHash": "sha256-3O7RWiXpvqBcCl84Mvqa8dXudZ1Bol1ubNdSmQt7nF4=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "4fc1c45a5f50169f9f29f6a98a438fb910b834ed", + "rev": "1bff2ba6ec22bc90e9ad3f7e94cca0d37870afa3", "type": "github" }, "original": { @@ -1009,11 +981,11 @@ ] }, "locked": { - "lastModified": 1702979157, - "narHash": "sha256-RnFBbLbpqtn4AoJGXKevQMCGhra4h6G2MPcuTSZZQ+g=", + "lastModified": 1723303070, + "narHash": "sha256-krGNVA30yptyRonohQ+i9cnK+CfCpedg6z3qzqVJcTs=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "2961375283668d867e64129c22af532de8e77734", + "rev": "14c092e0326de759e16b37535161b3cb9770cea3", "type": "github" }, "original": { @@ -1042,11 +1014,11 @@ ] }, "locked": { - "lastModified": 1710356110, - "narHash": "sha256-dLYYHNiimcY5WMOnYs9zHVKdjqoPhdFhbEJa2h5hel0=", + "lastModified": 1725018627, + "narHash": "sha256-uBEU/aKl9jlJ8vIK556TaqSBEHx6/t6AE4fbt/AoRfA=", "owner": "l4l", "repo": "yofi", - "rev": "0d7af4653fa8f119a4aee0b7981edc88a6c7e892", + "rev": "09901e75cbdf2147553ab888adde480e57baa0d1", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 8d82517..1b33c04 100644 --- a/flake.nix +++ b/flake.nix @@ -73,11 +73,6 @@ flake = false; }; - salut = { - url = "gitlab:snakedye/salut"; - flake = false; - }; - prs = { # https://gitlab.com/timvisee/prs/-/merge_requests/42/ # $ find "$(dirname $(readlink $(which prs)))/.." -name "_prs" @@ -235,32 +230,8 @@ dcpj4110dwDriver = dcpj4110dw.driver; dcpj4110dwCupswrapper = dcpj4110dw.cupswrapper; - # broken as of 2023-04-27 because it doesn't load without a config - # aphorme_launcher = craneLib.buildPackage {src = inputs.aphorme_launcher;}; - # yofi = inputs'.yofi.packages.default; - # ofi-pass = craneLibOfiPass.buildPackage {src = inputs.ofi-pass;}; - inherit (inputs'.colmena.packages) colmena; - # jay = pkgs.callPackage (self + /nix/pkgs/jay.nix) { - # src = inputs.jay; - # rustPlatform = pkgs.makeRustPlatform { - # cargo = inputs'.fenix.packages.stable.toolchain; - # rustc = inputs'.fenix.packages.stable.toolchain; - # }; - # }; - - salut = craneLib.buildPackage { - src = inputs.salut; - nativeBuildInputs = [ - pkgs.pkg-config - ]; - buildInputs = [ - pkgs.libxkbcommon - pkgs.fontconfig - ]; - }; - prs = pkgs.callPackage ({ diff --git a/nix/home-manager/configuration/graphical-fullblown.nix b/nix/home-manager/configuration/graphical-fullblown.nix index e498f29..5798fac 100644 --- a/nix/home-manager/configuration/graphical-fullblown.nix +++ b/nix/home-manager/configuration/graphical-fullblown.nix @@ -50,6 +50,17 @@ in { "electron-27.3.11" ]; + nixpkgs.config.allowUnfree = [ + "electron-28.3.3" + "electron-27.3.11" + ]; + + # nixpkgs.config.allowUnfreePredicate = pkg: + # builtins.elem (lib.getName pkg) [ + # "smartgithg" + # "electron-27.3.11" + # ]; + home.packages = [] ++ (with pkgs; [ @@ -109,7 +120,7 @@ in { aspellDicts.de # skypeforlinux # pkgsUnstable.jitsi-meet-electron - thunderbird-115 + thunderbird-128 # betterbird # FIXME: depends on insecure openssl 1.1.1t @@ -118,8 +129,6 @@ in { # TODO: remove or reuse this depending on whether waydroid signal works pkgsUnstable.signal-desktop - # gnome.cheese - # Virtualization virt-manager @@ -136,6 +145,8 @@ in { yt-dlp (writeShellScriptBin "youtube-dl-audio" "${yt-dlp}/bin/yt-dlp --extract-audio --audio-format best --audio-quality 9 \${@:?}") libwebcam + libcamera + snapshot # Network Tools tcpdump @@ -200,7 +211,7 @@ in { # dex coreutils lsof - xdg_utils + xdg-utils xdg-user-dirs dconf picocom @@ -229,14 +240,26 @@ in { # libretro.snes9x2010 # retroarchFull - packages'.logseq - # (pkgs.runCommand "logseq-wrapper" - # { - # nativeBuildInputs = [ pkgs.makeWrapper ]; - # } '' - # makeWrapper ${pkgs.logseq}/bin/logseq $out/bin/logseq \ - # --set NIXOS_OZONE_WL "" - # '') + ( + pkgs.logseq.overrideAttrs ( + attrs: + lib.attrsets.recursiveUpdate + attrs + ( + lib.attrsets.optionalAttrs pkgs.stdenv.isAarch64 { + src = repoFlake.inputs.logseq_0_10_9_aarch64_appimage; + meta.platforms = ["aarch64-linux"]; + } + ) + ) + ) + + # ( + # pkgsUnstable.callPackage (repoFlake + "/nix/pkgs/logseq") + # (lib.attrsets.optionalAttrs pkgs.stdenv.isAarch64 { + # overrideSrc = repoFlake.inputs.logseq_0_10_9_aarch64_appimage; + # }) + # ) ]) ++ (lib.lists.optionals (!pkgs.stdenv.targetPlatform.isAarch64) [ ]) diff --git a/nix/home-manager/profiles/common.nix b/nix/home-manager/profiles/common.nix index 2f5b051..d5b0c7e 100644 --- a/nix/home-manager/profiles/common.nix +++ b/nix/home-manager/profiles/common.nix @@ -13,9 +13,27 @@ nixpkgs.config = { allowBroken = false; allowUnfree = true; + allowUnsupportedSystem = true; + + allowInsecurePredicate = pkg: + builtins.elem (lib.getName pkg) [ + "electron-28.3.3" + "electron-27.3.11" + "electron" + ]; permittedInsecurePackages = [ + "electron-28.3.3" + "electron-27.3.11" + "electron" ]; + + allowUnfreePredicate = pkg: + builtins.elem (lib.getName pkg) [ + "obsidian" + "vivaldi" + "aspell-dict-en-science" + ]; }; home.keyboard = { diff --git a/nix/home-manager/profiles/sway-desktop.nix b/nix/home-manager/profiles/sway-desktop.nix index 1acf089..8cfe85a 100644 --- a/nix/home-manager/profiles/sway-desktop.nix +++ b/nix/home-manager/profiles/sway-desktop.nix @@ -33,22 +33,8 @@ in { imports = [ ../profiles/wayland-desktop.nix ../programs/waybar.nix - # ../programs/salut.nix ]; - # TODO: autostart - # environment.loginShellInit = '' - # if [[ "$(tty)" == /dev/tty1 ]]; then - # echo starting sway.. - # exec sway - # fi - # ''; - - services = { - # TODO: doesn't work with 2 screens - # flameshot.enable = true; - }; - services.dunst = { enable = true; }; @@ -73,7 +59,6 @@ in { pkgs.ttf_bitstream_vera pkgs.noto-fonts - pkgs.noto-fonts-cjk pkgs.noto-fonts-cjk-sans pkgs.noto-fonts-cjk-serif pkgs.noto-fonts-emoji @@ -88,12 +73,12 @@ in { pkgs.dina-font pkgs.monoid pkgs.hermit - # found on colemickens' repo + ### found on colemickens' repo pkgs.gelasio # metric-compatible with Georgia pkgs.powerline-symbols pkgs.iosevka-comfy.comfy-fixed - # experimental stuff + ## experimental stuff pkgs.fuzzel ]; diff --git a/nix/home-manager/programs/firefox.nix b/nix/home-manager/programs/firefox.nix index 05beab4..993cbc4 100644 --- a/nix/home-manager/programs/firefox.nix +++ b/nix/home-manager/programs/firefox.nix @@ -1,6 +1,9 @@ {pkgs, ...}: { - programs.librewolf = {enable = true;}; - programs.firefox = {enable = true;}; + programs.librewolf = {enable = false;}; + programs.firefox = { + enable = true; + package = pkgs.firefox-esr-128; + }; # home.file.".mozilla/native-messaging-hosts/passff.json".source = "${pkgs.passff-host}/share/passff-host/passff.json"; } diff --git a/nix/home-manager/programs/libreoffice.nix b/nix/home-manager/programs/libreoffice.nix index f5921e2..17d0a24 100644 --- a/nix/home-manager/programs/libreoffice.nix +++ b/nix/home-manager/programs/libreoffice.nix @@ -1,3 +1,3 @@ {pkgs, ...}: { - home.packages = with pkgs; [libreoffice-fresh]; + home.packages = [pkgs.libreoffice]; } diff --git a/nix/os/devices/steveej-x13s/configuration.nix b/nix/os/devices/steveej-x13s/configuration.nix index c1c70b2..831f1f0 100644 --- a/nix/os/devices/steveej-x13s/configuration.nix +++ b/nix/os/devices/steveej-x13s/configuration.nix @@ -10,12 +10,7 @@ packages', ... }: { - nixpkgs.overlays = [ - (final: previous: { - # inherit (nodeFlake.inputs.nixpkgs-systemd256.legacyPackages.${system}) systemd systemdMinimal; - # inherit (nodeFlake.inputs.nixpkgs-unstable.legacyPackages.${system}) libcamera libcamera-qcam; - }) - ]; + nixpkgs.overlays = [nodeFlake.overlays.default]; nixos-x13s = { enable = true; @@ -114,27 +109,44 @@ protocol = "ssh-ng"; systems = [ "x86_64-linux" - # "aarch64-linux" ]; supportedFeatures = [ "big-parallel" "kvm" + "nixos-test" ]; maxJobs = 16; } + { + hostName = "aarch64-linux-builder-0.infra.holochain.org"; + sshUser = "nix-remote-builder"; + sshKey = config.sops.secrets.builder-private-key.path; + protocol = "ssh-ng"; + systems = [ + "aarch64-linux" + ]; + supportedFeatures = [ + "big-parallel" + "kvm" + "nixos-test" + ]; + maxJobs = 4; + } + { hostName = "x64-linux-dev-01.dev.infra.holochain.org"; sshUser = "nix-remote-builder"; sshKey = config.sops.secrets.builder-private-key.path; protocol = "ssh-ng"; systems = [ - "x86_64-linux" - # "aarch64-linux" + # "x86_64-linux" + "aarch64-linux" ]; supportedFeatures = [ "big-parallel" "kvm" + "nixos-test" ]; maxJobs = 0; } @@ -199,12 +211,14 @@ ../../../home-manager/configuration/graphical-fullblown.nix ]; + nixpkgs.overlays = [nodeFlake.overlays.default]; + home.sessionVariables = {}; home.packages = with pkgs; [ ]; - # TODO: currently unsupported + # TODO(upstream): currently unsupported on x13s services.gammastep.enable = true; }; @@ -250,4 +264,6 @@ programs.adb.enable = true; nix.settings.sandbox = lib.mkForce "relaxed"; + + systemd.user.services.wireplumber.environment.LIBCAMERA_IPA_PROXY_PATH = "${pkgs.libcamera}/libexec/libcamera"; } diff --git a/nix/os/devices/steveej-x13s/flake.lock b/nix/os/devices/steveej-x13s/flake.lock index 66da2af..5425600 100644 --- a/nix/os/devices/steveej-x13s/flake.lock +++ b/nix/os/devices/steveej-x13s/flake.lock @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1725377834, - "narHash": "sha256-tqoAO8oT6zEUDXte98cvA1saU9+1dLJQe3pMKLXv8ps=", + "lastModified": 1730190761, + "narHash": "sha256-o5m5WzvY6cGIDupuOvjgNSS8AN6yP2iI9MtUC6q/uos=", "owner": "nix-community", "repo": "disko", - "rev": "e55f9a8678adc02024a4877c2a403e3f6daf24fe", + "rev": "3979285062d6781525cded0f6c4ff92e71376b55", "type": "github" }, "original": { @@ -148,11 +148,11 @@ ] }, "locked": { - "lastModified": 1725703823, - "narHash": "sha256-tDgM4d8mLK0Hd6YMB2w1BqMto1XBXADOzPEaLl10VI4=", + "lastModified": 1726989464, + "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", "owner": "nix-community", "repo": "home-manager", - "rev": "208df2e558b73b6a1f0faec98493cb59a25f62ba", + "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", "type": "github" }, "original": { @@ -165,16 +165,16 @@ "linux-jhovold": { "flake": false, "locked": { - "lastModified": 1728631036, - "narHash": "sha256-1LnClVjY6WS+IR9eqPFA7gzXm0cio3mY23NXj9cKHHs=", + "lastModified": 1730186574, + "narHash": "sha256-QjStPt3c/v55lJUgn4Rdx/WTaQKdUxNL9nwkIKQ8O2Q=", "owner": "jhovold", "repo": "linux", - "rev": "6a97bc22fa36010400b91e6d5979741c391112c3", + "rev": "699d5b0ccdc1a343ded65aa876f0b720ca7dada9", "type": "github" }, "original": { "owner": "jhovold", - "ref": "wip/sc8280xp-6.12-rc2", + "ref": "wip/sc8280xp-6.12-rc5", "repo": "linux", "type": "github" } @@ -190,11 +190,11 @@ ] }, "locked": { - "lastModified": 1725529869, - "narHash": "sha256-ekEL4HrZbAeoZmopkxvZ4Z4ufkUEv09b4liGnIIiryc=", + "lastModified": 1730381857, + "narHash": "sha256-PbEoM+AnZTuo9xtwcDcTH9FZAzPzfBhX41+zVVTdgRo=", "owner": "threefoldtech", "repo": "mycelium", - "rev": "43c774cc1d5bae9558d0086e2be334812cafe2be", + "rev": "8a2b564c8e279d4afd0a10058b4481799a7513e1", "type": "github" }, "original": { @@ -247,17 +247,18 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1728680044, - "narHash": "sha256-kDqUDwEEv1KPOObmdnO3zb5mFthFDHoPgzVDpmRIq44=", - "ref": "refs/heads/remaintain", - "rev": "f691c125485b6764ebef0b9f148613d79de95525", - "revCount": 109, + "lastModified": 1730215039, + "narHash": "sha256-GxhtLAsdpZX2SndSu/AoKugk/vht5RZ47FTcrYILDew=", + "ref": "bump", + "rev": "ff41877fbdf32f2029ade902f10142afb053d2da", + "revCount": 116, "type": "git", - "url": "https://forgejo.www.stefanjunker.de/steveej/nixos-x13s.git?branch=remaintain" + "url": "https://forgejo.www.stefanjunker.de/steveej/nixos-x13s.git" }, "original": { + "ref": "bump", "type": "git", - "url": "https://forgejo.www.stefanjunker.de/steveej/nixos-x13s.git?branch=remaintain" + "url": "https://forgejo.www.stefanjunker.de/steveej/nixos-x13s.git" } }, "nixpkgs": { @@ -288,29 +289,13 @@ "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" } }, - "nixpkgs-unstable": { + "nixpkgs-stable": { "locked": { - "lastModified": 1728621521, - "narHash": "sha256-Fk8C/cywdAP//XjK1/CF2VMIRoQjhosCor71p84ff+c=", + "lastModified": 1730327045, + "narHash": "sha256-xKel5kd1AbExymxoIfQ7pgcX6hjw9jCgbiBjiUfSVJ8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7045aa75c71e90ae3bbb486d35414b08add9c424", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable-small", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1725826545, - "narHash": "sha256-L64N1rpLlXdc94H+F6scnrbuEu+utC03cDDVvvJGOME=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "f4c846aee8e1e29062aa8514d5e0ab270f4ec2f9", + "rev": "080166c15633801df010977d9d7474b4a6c549d7", "type": "github" }, "original": { @@ -320,6 +305,22 @@ "type": "github" } }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1730200266, + "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "disko": "disko", @@ -328,7 +329,10 @@ "mycelium": "mycelium", "nix-snapshotter": "nix-snapshotter", "nixos-x13s": "nixos-x13s", - "nixpkgs": "nixpkgs_2", + "nixpkgs": [ + "nixpkgs-stable" + ], + "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unstable": "nixpkgs-unstable" } }, diff --git a/nix/os/devices/steveej-x13s/flake.nix b/nix/os/devices/steveej-x13s/flake.nix index 61a760d..aa74be0 100644 --- a/nix/os/devices/steveej-x13s/flake.nix +++ b/nix/os/devices/steveej-x13s/flake.nix @@ -1,22 +1,21 @@ { inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; - # nixpkgs.follows = "nixpkgs-unstable"; - - # required for home-manager modules - nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable-small"; + nixpkgs.follows = "nixpkgs-stable"; + nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05"; + nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; get-flake.url = "github:ursi/get-flake"; disko.inputs.nixpkgs.follows = "nixpkgs"; home-manager = { + # url = "github:nix-community/home-manager/master"; url = "github:nix-community/home-manager/release-24.05"; inputs.nixpkgs.follows = "nixpkgs"; }; nixos-x13s.url = - "git+https://forgejo.www.stefanjunker.de/steveej/nixos-x13s.git?branch=remaintain" + "git+https://forgejo.www.stefanjunker.de/steveej/nixos-x13s.git?ref=bump" # 6.11.0 # "git+https://forgejo.www.stefanjunker.de/steveej/nixos-x13s.git?branch=remaintain&rev=6b9efe77ca80653354981c720af3c4241ac71490" # 6.12.0-rc6 @@ -75,7 +74,6 @@ # flake registry { - nixpkgs.overlays = builtins.attrValues self.overlays; nix.registry.nixpkgs.flake = nixpkgs; } ] @@ -87,7 +85,52 @@ inherit mkNixosConfiguration; }; - overlays = {}; + overlays.libcamera = final: previous: { + wireplumber = previous.wireplumber.overrideAttrs (_: { + version = "git"; + src = previous.fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "pipewire"; + repo = "wireplumber"; + rev = "71f868233792f10848644319dbdc97a4f147d554"; + hash = "sha256-VX3OFsBK9AbISm/XTx8p05ak+z/VcKXfUXhB9aI9ev8="; + }; + }); + + libcamera = previous.libcamera.overrideAttrs (_: { + postFixup = '' + ../src/ipa/ipa-sign-install.sh src/ipa-priv-key.pem $out/lib/libcamera/ipa_*.so + ''; + }); + + libcamera-qcam = previous.libcamera-qcam.overrideAttrs (_: { + postFixup = '' + ../src/ipa/ipa-sign-install.sh src/ipa-priv-key.pem $out/lib/libcamera/ipa_*.so + ''; + }); + }; + + overlays.default = final: previous: let + inherit (previous.stdenv) system; + pkgsUnstable = import self.inputs.nixpkgs-unstable.outPath { + inherit system; + overlays = [self.overlays.libcamera]; + }; + in { + inherit + (pkgsUnstable) + libcamera + ; + + webkitgtk = previous.webkitgtk.overrideAttrs (attrs: { + preConfigure = + attrs.preConfigure + + '' + export NIX_BUILD_CORES="$((NIX_BUILD_CORES > 8 ? 8 : NIX_BUILD_CORES))" + export NUMBER_OF_PROCESSORS="$NIX_BUILD_CORES" + ''; + }); + }; nixosConfigurations = { native = mkNixosConfiguration { diff --git a/nix/os/snippets/holo-zerotier.nix b/nix/os/snippets/holo-zerotier.nix index 8b09cea..8ea2be5 100644 --- a/nix/os/snippets/holo-zerotier.nix +++ b/nix/os/snippets/holo-zerotier.nix @@ -11,7 +11,7 @@ in { }; config = { - nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "zerotierone" ]; + nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) ["zerotierone"]; services.zerotierone = { enable = cfg.enable; diff --git a/nix/os/snippets/home-manager-with-zsh.nix b/nix/os/snippets/home-manager-with-zsh.nix index 63f4962..266a125 100644 --- a/nix/os/snippets/home-manager-with-zsh.nix +++ b/nix/os/snippets/home-manager-with-zsh.nix @@ -4,6 +4,7 @@ repoFlakeInputs', packages', pkgs, + lib, ... }: let # TODO: make this configurable diff --git a/nix/os/snippets/sway-desktop.nix b/nix/os/snippets/sway-desktop.nix index 71008cb..f8d21b0 100644 --- a/nix/os/snippets/sway-desktop.nix +++ b/nix/os/snippets/sway-desktop.nix @@ -18,7 +18,7 @@ in { services.gvfs = { enable = true; - package = lib.mkForce pkgs.gnome3.gvfs; + package = lib.mkForce pkgs.gnome.gvfs; }; environment.systemPackages = with pkgs; [ @@ -36,7 +36,7 @@ in { # FIXME: `true` breaks xdg-open from alacritty: # $ xdg-open "https://github.com/" # Error: GDBus.Error:org.freedesktop.DBus.Error.UnknownMethod: No such interface “org.freedesktop.portal.OpenURI” on object at path /org/freedesktop/portal/desktop - xdgOpenUsePortal = true; + xdgOpenUsePortal = false; wlr = { enable = true; @@ -89,6 +89,7 @@ in { alsa.enable = true; alsa.support32Bit = true; pulse.enable = true; + wireplumber.enable = true; # If you want to use JACK applications, uncomment this #jack.enable = true; };