Compare commits
192
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3062ef1608 | ||
|
|
ac7a47c26a | ||
|
|
74d3d6870d | ||
|
|
ac9eeb1f1c | ||
|
|
666b7ab737 | ||
|
|
bcfada020b | ||
|
|
d79713972e | ||
|
|
441d029eb6 | ||
|
|
17933af881 | ||
|
|
c4693f0ee6 | ||
|
|
813e474bc1 | ||
|
|
333bed459d | ||
|
|
cd454434d7 | ||
|
|
e89ee3c559 | ||
|
|
0dad448f97 | ||
|
|
cc0cc15ee5 | ||
|
|
5596fb8a9c | ||
|
|
dce21780ac | ||
|
|
310fc047b2 | ||
|
|
c9725d3b78 | ||
|
|
777acf7503 | ||
|
|
e6fd27f8ee | ||
|
|
f14680dfbf | ||
|
|
ca050d08d3 | ||
|
|
d0f23a0e7f | ||
|
|
1cdedee438 | ||
|
|
eac6e5ca97 | ||
|
|
819cbd3606 | ||
|
|
65e6e7f747 | ||
|
|
36dbc3229d | ||
|
|
2f3e8c14f2 | ||
|
|
14b6e989f6 | ||
|
|
64324ab150 | ||
|
|
c56a82c0b1 | ||
|
|
9e686b3f8d | ||
|
|
a512855fa9 | ||
|
|
4dbe74854f | ||
|
|
2a543c6e93 | ||
|
|
3f68e02f6a | ||
|
|
89e04df44a | ||
|
|
d0546b20ea | ||
|
|
a652234c7c | ||
|
|
b867dd12c4 | ||
|
|
2fc09a965a | ||
|
|
e3d7538fa3 | ||
|
|
d64b2f8d6d | ||
|
|
093623dad7 | ||
|
|
f6c2c48c7d | ||
|
|
b7c6a2fce5 | ||
|
|
a692c1353d | ||
|
|
589eefd527 | ||
|
|
981d351744 | ||
|
|
0fae6cfc06 | ||
|
|
0b47961483 | ||
|
|
01a512e3fd | ||
|
|
631b28d399 | ||
|
|
96045f57c4 | ||
|
|
86d717fad1 | ||
|
|
a7392b3c30 | ||
|
|
e72154ab65 | ||
|
|
47acfb12ff | ||
|
|
8a7229cea8 | ||
|
|
123b55cdf1 | ||
|
|
e4cd967f06 | ||
|
|
715c3c07b5 | ||
|
|
64a464af49 | ||
|
|
5c710e0cb6 | ||
|
|
26554b8261 | ||
|
|
75cecb0386 | ||
|
|
3d8f717c7a | ||
|
|
5807e0076a | ||
|
|
f80b6295ac | ||
|
|
eb90b797df | ||
|
|
ed06b07960 | ||
|
|
bf7f6a1218 | ||
|
|
6d0f92fad6 | ||
|
|
164ed80931 | ||
|
|
4a9a71bad1 | ||
|
|
b9da82b956 | ||
|
|
bb596a794e | ||
|
|
476cab8c9d | ||
|
|
d57aeb9ef3 | ||
|
|
aaba57ee2f | ||
|
|
2332cc1e9d | ||
|
|
df06c641c2 | ||
|
|
2880272e2a | ||
|
|
d3896b5817 | ||
|
|
522d87f51d | ||
|
|
578f246519 | ||
|
|
271658bf4d | ||
|
|
fbe9f8b3ec | ||
|
|
149641c87b | ||
|
|
21782c109e | ||
|
|
8ee971cbf8 | ||
|
|
1ed2b9c130 | ||
|
|
31102ae362 | ||
|
|
33893cafd8 | ||
|
|
61e41fca0a | ||
|
|
b90bfdaed8 | ||
|
|
9eff6a3a6a | ||
|
|
fbbd74bfae | ||
|
|
fcf8efe577 | ||
|
|
ec3d963494 | ||
|
|
82b9b48493 | ||
|
|
e03b3d229d | ||
|
|
06a3b10079 | ||
|
|
613a9c5540 | ||
|
|
0c754590f1 | ||
|
|
5474251a64 | ||
|
|
dd1aa0957e | ||
|
|
ddce79071d | ||
|
|
fd8f18eeec | ||
|
|
501e35ae45 | ||
|
|
65fc0ace0e | ||
|
|
dc8f70b344 | ||
|
|
5cc90d85f7 | ||
|
|
75491e90e7 | ||
|
|
819b81d8d2 | ||
|
|
fe4f291ef8 | ||
|
|
da46fc7eca | ||
|
|
58206b4c80 | ||
|
|
1e02adf3cf | ||
|
|
15b75b0010 | ||
|
|
6d34c7dbd0 | ||
|
|
8681424692 | ||
|
|
0956fccdc6 | ||
|
|
1e187a7cee | ||
|
|
9dab3f0608 | ||
|
|
26d59c7ca6 | ||
|
|
9bc5922e49 | ||
|
|
2e3ef5fd47 | ||
|
|
415f3bb057 | ||
|
|
bcc2ca5cf0 | ||
|
|
c202dbcdec | ||
|
|
f3b6a5cddd | ||
|
|
191733ec51 | ||
|
|
881a047c75 | ||
|
|
95c1b53699 | ||
|
|
aecc12a945 | ||
|
|
b5afdc5817 | ||
|
|
ab9acedf49 | ||
|
|
0e31504687 | ||
|
|
85147137b0 | ||
|
|
914b88ac82 | ||
|
|
646f35e5d4 | ||
|
|
3ed8d601a2 | ||
|
|
02a99d31fa | ||
|
|
2be93bd323 | ||
|
|
6a43859425 | ||
|
|
439cb8200f | ||
|
|
a812e53f06 | ||
|
|
8ccc4d65a9 | ||
|
|
581a701151 | ||
|
|
5fc4b9e0f3 | ||
|
|
80e89c531d | ||
|
|
f607c99ec4 | ||
|
|
c92ea31991 | ||
|
|
e60e6bc8c0 | ||
|
|
3ca9b0533b | ||
|
|
55b5521518 | ||
|
|
39f1253900 | ||
|
|
4ff1acc318 | ||
|
|
261b704d31 | ||
|
|
48b7079b32 | ||
|
|
480a1598a6 | ||
|
|
beb1c9eb75 | ||
|
|
12fccea34f | ||
|
|
c0c37d5fca | ||
|
|
df73e98b85 | ||
|
|
e95ab8bd3e | ||
|
|
c6104a7a9e | ||
|
|
f9b40222a0 | ||
|
|
866efb4718 | ||
|
|
6463a9e869 | ||
|
|
105c9737f6 | ||
|
|
089bf927e0 | ||
|
|
b4bc7490fc | ||
|
|
0dd087f4b8 | ||
|
|
f60718619f | ||
|
|
c47509ef99 | ||
|
|
c5767b775b | ||
|
|
ef4869d2cc | ||
|
|
0207f790ef | ||
|
|
b4500a59c1 | ||
|
|
e6f20d1d69 | ||
|
|
51e5e00ab6 | ||
|
|
31e86618c3 | ||
|
|
e28a22ec11 | ||
|
|
93c3ae48c5 | ||
|
|
1abec387cd | ||
|
|
081ffed1e1 | ||
|
|
583a1a1905 |
@@ -0,0 +1,102 @@
|
|||||||
|
## CODE GENERATION INSTRUCTIONS
|
||||||
|
|
||||||
|
You are tasked with integrating patches into my kernel to make the tearing protocol work on Wayland with my intel B580.
|
||||||
|
|
||||||
|
## THINGS TO DO:
|
||||||
|
|
||||||
|
Plan out how you're going to do the following. I will inspect your plan and then authorize it.
|
||||||
|
|
||||||
|
- Custom build this MR: https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3797
|
||||||
|
|
||||||
|
- Fix KDE tearing on Intel Graphics using kernel patches for libdrm. Use these resources to research:
|
||||||
|
- https://bugs.kde.org/show_bug.cgi?id=520549
|
||||||
|
- https://gitlab.freedesktop.org/drm/xe/kernel/-/work_items/8597#note_3567675
|
||||||
|
- https://gitlab.freedesktop.org/drm/i915/kernel/-/work_items/13834 (this one has patches that supposedly fix the problem.)
|
||||||
|
|
||||||
|
|
||||||
|
# Plan here:
|
||||||
|
|
||||||
|
- [ ] 1. Record the current package and kernel baselines.
|
||||||
|
- Evaluate the locked versions of Mutter, GNOME Shell, libdrm, and the selected CachyOS kernel.
|
||||||
|
- Confirm that the Intel Arc B580 (`8086:e20b`) is using the `xe` driver.
|
||||||
|
- Save the current working kernel and NixOS generation as the rollback baseline.
|
||||||
|
|
||||||
|
- [ ] 2. Pin all experimental upstream sources.
|
||||||
|
- Pin Mutter merge request !3797 to a specific commit instead of following its branch.
|
||||||
|
- Record the MR base commit and verify whether it is compatible with the Mutter version in the locked nixpkgs input.
|
||||||
|
- Identify the exact revisions of the Intel async-flip and `IN_FORMATS_ASYNC` kernel patches referenced by the i915 and Xe work items.
|
||||||
|
- Use fixed-output hashes for every fetched patch or source archive.
|
||||||
|
|
||||||
|
- [ ] 3. Determine which Intel DRM patches are still required.
|
||||||
|
- Inspect the selected CachyOS kernel source for patches that have already been merged or backported.
|
||||||
|
- Select only the missing patches needed to expose async-capable formats and prevent unchanged or disabled planes from incorrectly rejecting an async atomic commit.
|
||||||
|
- Confirm that the selected changes affect the Intel display code shared by `xe` and `i915`, and therefore apply to the B580 even when the original report is filed under i915.
|
||||||
|
- Document the required patch order and each patch's upstream URL and revision.
|
||||||
|
|
||||||
|
- [ ] 4. Add a dedicated, reversible Wayland-tearing overlay or module.
|
||||||
|
- Keep the experimental Mutter and kernel overrides together in a new, clearly named repository file.
|
||||||
|
- Scope the override to `drivebystation-nix` where practical.
|
||||||
|
- Provide a single enable switch or isolated import so the experiment can be disabled without editing generated hardware configuration.
|
||||||
|
- Preserve all unrelated existing worktree changes.
|
||||||
|
|
||||||
|
- [ ] 5. Override Mutter with merge request !3797.
|
||||||
|
- Prefer applying the pinned MR commits to the nixpkgs Mutter derivation so nixpkgs build flags and dependency wiring are retained.
|
||||||
|
- If the patch series is incompatible, use the pinned MR source only after confirming its Mutter ABI matches the installed GNOME Shell.
|
||||||
|
- Verify that libdrm is at least version 2.4.120.
|
||||||
|
- Ensure GNOME Shell and the display-manager session reference the overridden Mutter rather than merely installing it alongside the stock package.
|
||||||
|
- Enable the experimental feature with `MUTTER_DEBUG_EXPERIMENTAL_FEATURES=tearing` in the session environment.
|
||||||
|
|
||||||
|
- [ ] 6. Override the CachyOS kernel with the selected Intel DRM patches.
|
||||||
|
- Extend the existing `pkgs.cachyosKernels.linuxPackages-cachyos-latest` kernel derivation rather than replacing it with an unrelated kernel package set.
|
||||||
|
- Apply the pinned patches in their upstream dependency order.
|
||||||
|
- Verify that every patch applies cleanly to the exact CachyOS kernel source.
|
||||||
|
- Keep `boot.extraModulePackages` tied to the patched kernel package set so `r8125` and `v4l2loopback` are rebuilt against the correct kernel.
|
||||||
|
- Do not modify the generated `hardware-configuration.nix` beyond any unavoidable existing kernel selection; place the override in a maintained host module.
|
||||||
|
|
||||||
|
- [ ] 7. Validate the Nix expressions without activating the system.
|
||||||
|
- Run formatting and syntax checks on every changed Nix file.
|
||||||
|
- Evaluate the complete `drivebystation-nix` configuration.
|
||||||
|
- Run `nix flake check` and resolve evaluation failures attributable to these changes.
|
||||||
|
- Confirm that all sources are pinned and reproducible and that no mutable branch names remain.
|
||||||
|
|
||||||
|
- [ ] 8. Build each risky component independently.
|
||||||
|
- Build the overridden Mutter derivation.
|
||||||
|
- Build the patched kernel derivation.
|
||||||
|
- Build the matching `r8125` and `v4l2loopback` modules.
|
||||||
|
- Inspect the build logs for rejected patches, warnings related to async flips, and ABI mismatches.
|
||||||
|
|
||||||
|
- [ ] 9. Build the complete NixOS system before switching.
|
||||||
|
- Build the `drivebystation-nix` toplevel without activating it.
|
||||||
|
- Verify that the closure contains the pinned patched Mutter and patched CachyOS kernel.
|
||||||
|
- Confirm that a previous known-good boot generation remains available.
|
||||||
|
|
||||||
|
- [ ] 10. Activate the result safely.
|
||||||
|
- Use `nixos-rebuild boot` first so the new system is selected only after reboot.
|
||||||
|
- Reboot into the patched generation and verify the running kernel version and `xe` driver binding.
|
||||||
|
- If the display fails or the system is unstable, boot the previous generation and disable the experimental module.
|
||||||
|
|
||||||
|
- [ ] 11. Verify the kernel DRM capabilities.
|
||||||
|
- Run `drm_info` and confirm atomic async-page-flip capability is reported.
|
||||||
|
- Confirm `IN_FORMATS_ASYNC` is populated for supported primary planes.
|
||||||
|
- Confirm its absence on the cursor plane is handled as expected rather than causing the entire commit to fail.
|
||||||
|
- Capture a DRM debug log while submitting tearing-enabled fullscreen frames.
|
||||||
|
|
||||||
|
- [ ] 12. Test KDE Plasma tearing.
|
||||||
|
- Enable Plasma's "Allow in fullscreen windows" tearing setting.
|
||||||
|
- Run a fullscreen tearing-aware game or test client with frame rate above the monitor refresh rate.
|
||||||
|
- Confirm that KWin's async atomic commits no longer fail with `-EINVAL`.
|
||||||
|
- Confirm that the previous `cursor A: async flip not supported` and `plane 2A: async flip not supported` errors no longer occur for disabled or unchanged planes.
|
||||||
|
- Check cursor movement, fullscreen entry and exit, direct scanout, VRR enabled and disabled, and all connected monitors.
|
||||||
|
|
||||||
|
- [ ] 13. Test GNOME Mutter tearing.
|
||||||
|
- Start a GNOME Wayland session and confirm the tearing-control protocol is advertised.
|
||||||
|
- Run `weston-simple-egl -v -f -t` or an equivalent tearing-aware client.
|
||||||
|
- Confirm that requested asynchronous flips are accepted and visibly tear when the frame rate exceeds the refresh rate.
|
||||||
|
- Confirm unsupported async commits fall back to synchronized presentation without breaking the session.
|
||||||
|
- Test cursor movement, fullscreen transitions, VRR, multiple monitors, and suspend/resume.
|
||||||
|
|
||||||
|
- [ ] 14. Document results and removal criteria.
|
||||||
|
- Record the tested hardware, kernel, Mutter, GNOME Shell, Plasma, and libdrm versions.
|
||||||
|
- Record the exact patches used and the outcome of both compositor tests.
|
||||||
|
- Document how to disable the overrides and roll back to the previous generation.
|
||||||
|
- Note which upstream merge or kernel release will allow each local override to be removed.
|
||||||
Generated
+442
-151
@@ -1,12 +1,123 @@
|
|||||||
{
|
{
|
||||||
"nodes": {
|
"nodes": {
|
||||||
|
"Catch2": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1759222471,
|
||||||
|
"narHash": "sha256-7Dx7PhtRwkbo8vHF57sAns2fQZ442D3cMyCt25RvzJc=",
|
||||||
|
"owner": "catchorg",
|
||||||
|
"repo": "Catch2",
|
||||||
|
"rev": "b3fb4b9feafcd8d91c5cb510a4775143fdbef02f",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "catchorg",
|
||||||
|
"repo": "Catch2",
|
||||||
|
"rev": "b3fb4b9feafcd8d91c5cb510a4775143fdbef02f",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"MimeTypes": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1577040615,
|
||||||
|
"narHash": "sha256-biRcxbpRVnD3+VVo0fNrNGeAi1P7pSzkGKHZrTtGp7Q=",
|
||||||
|
"owner": "lasselukkari",
|
||||||
|
"repo": "MimeTypes",
|
||||||
|
"rev": "8990d6a796bd9904ec3d41e5c150a1ffb48fe32e",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "lasselukkari",
|
||||||
|
"repo": "MimeTypes",
|
||||||
|
"rev": "8990d6a796bd9904ec3d41e5c150a1ffb48fe32e",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"SPIRV-Cross-WallpaperEngine": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1745093314,
|
||||||
|
"narHash": "sha256-ou66paGlu3KXf8LL8zfTiE8wOf0nRBocDs1QvfRVs+k=",
|
||||||
|
"owner": "Almamu",
|
||||||
|
"repo": "SPIRV-Cross-WallpaperEngine",
|
||||||
|
"rev": "ad4d02220b01c1800e5a4e6671d6d8ca8ab07783",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "Almamu",
|
||||||
|
"repo": "SPIRV-Cross-WallpaperEngine",
|
||||||
|
"rev": "ad4d02220b01c1800e5a4e6671d6d8ca8ab07783",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"aagl": {
|
||||||
|
"inputs": {
|
||||||
|
"flake-compat": "flake-compat",
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
],
|
||||||
|
"rust-overlay": "rust-overlay"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1787517695,
|
||||||
|
"narHash": "sha256-Z119G3qLJx22frNHO3/seMs7fCCvxe9NJJRfN4Jadew=",
|
||||||
|
"owner": "ezKEa",
|
||||||
|
"repo": "aagl-gtk-on-nix",
|
||||||
|
"rev": "4bb57072d963aa47f14894383a5560cf290e296a",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "ezKEa",
|
||||||
|
"repo": "aagl-gtk-on-nix",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"argparse": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1737934041,
|
||||||
|
"narHash": "sha256-gRLn4juxwde7ugvT/p4lx9ayDTm7o32NKaE/SEbnLHI=",
|
||||||
|
"owner": "p-ranav",
|
||||||
|
"repo": "argparse",
|
||||||
|
"rev": "d924b84eba1f0f0adf38b20b7b4829f6f65b6570",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "p-ranav",
|
||||||
|
"repo": "argparse",
|
||||||
|
"rev": "d924b84eba1f0f0adf38b20b7b4829f6f65b6570",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"codex-desktop": {
|
||||||
|
"inputs": {
|
||||||
|
"flake-utils": "flake-utils",
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1791562553,
|
||||||
|
"narHash": "sha256-uyLpIxJv9lqy1pgGUd0C/RZvqWyFqbwR0Tq7E+UX0VM=",
|
||||||
|
"owner": "ilysenko",
|
||||||
|
"repo": "codex-desktop-linux",
|
||||||
|
"rev": "443cb5d52ed781cac6cc7083780abb058cf93678",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "ilysenko",
|
||||||
|
"repo": "codex-desktop-linux",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"crane": {
|
"crane": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1754269165,
|
"lastModified": 1781825982,
|
||||||
"narHash": "sha256-0tcS8FHd4QjbCVoxN9jI+PjHgA4vc/IjkUSp+N3zy0U=",
|
"narHash": "sha256-SlXKwIRIhrOSAcTjCB3ftPLzJWZStQIPS7J1FlZPnKk=",
|
||||||
"owner": "ipetkov",
|
"owner": "ipetkov",
|
||||||
"repo": "crane",
|
"repo": "crane",
|
||||||
"rev": "444e81206df3f7d92780680e45858e31d2f07a08",
|
"rev": "469fd08d0bcf6926321fa973c6777fbc87785dd7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -18,11 +129,11 @@
|
|||||||
"flake-compat": {
|
"flake-compat": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1747046372,
|
"lastModified": 1767039857,
|
||||||
"narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
|
"narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
|
||||||
"owner": "edolstra",
|
"owner": "edolstra",
|
||||||
"repo": "flake-compat",
|
"repo": "flake-compat",
|
||||||
"rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
|
"rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -34,20 +145,36 @@
|
|||||||
"flake-compat_2": {
|
"flake-compat_2": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1761588595,
|
"lastModified": 1767039857,
|
||||||
"narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
|
"narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
|
||||||
"owner": "edolstra",
|
"owner": "NixOS",
|
||||||
"repo": "flake-compat",
|
"repo": "flake-compat",
|
||||||
"rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
|
"rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "edolstra",
|
"owner": "NixOS",
|
||||||
"repo": "flake-compat",
|
"repo": "flake-compat",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-compat_3": {
|
"flake-compat_3": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1767039857,
|
||||||
|
"narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "flake-compat",
|
||||||
|
"rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "flake-compat",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"flake-compat_4": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1650374568,
|
"lastModified": 1650374568,
|
||||||
@@ -65,17 +192,14 @@
|
|||||||
},
|
},
|
||||||
"flake-parts": {
|
"flake-parts": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs-lib": [
|
"nixpkgs-lib": "nixpkgs-lib"
|
||||||
"lanzaboote",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1754091436,
|
"lastModified": 1788306937,
|
||||||
"narHash": "sha256-XKqDMN1/Qj1DKivQvscI4vmHfDfvYR2pfuFOJiCeewM=",
|
"narHash": "sha256-lbrI1UYVpFgKSsyrU9oeF7FHfnu8nLD9ja0ou9f2rxk=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "flake-parts",
|
"repo": "flake-parts",
|
||||||
"rev": "67df8c627c2c39c41dbec76a1f201929929ab0bd",
|
"rev": "f16b25b8c3d2809b87925d0b76652d7821a75c68",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -86,14 +210,14 @@
|
|||||||
},
|
},
|
||||||
"flake-utils": {
|
"flake-utils": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_2"
|
"systems": "systems"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1694529238,
|
"lastModified": 1731533236,
|
||||||
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
|
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "flake-utils",
|
"repo": "flake-utils",
|
||||||
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
|
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -104,7 +228,7 @@
|
|||||||
},
|
},
|
||||||
"flake-utils-plus": {
|
"flake-utils-plus": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils"
|
"flake-utils": "flake-utils_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1715533576,
|
"lastModified": 1715533576,
|
||||||
@@ -121,21 +245,21 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"game-of-life": {
|
"flake-utils_2": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": "nixpkgs"
|
"systems": "systems_3"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1728511087,
|
"lastModified": 1694529238,
|
||||||
"narHash": "sha256-CvO74jwMjUUPySy0QCt7sPImbxKlhWcSAet93Fkt6iU=",
|
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
|
||||||
"owner": "local-interloper",
|
"owner": "numtide",
|
||||||
"repo": "game-of-life",
|
"repo": "flake-utils",
|
||||||
"rev": "c39d37e394f5da79a6a7d198e1d7e505aa5298a7",
|
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "local-interloper",
|
"owner": "numtide",
|
||||||
"repo": "game-of-life",
|
"repo": "flake-utils",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -143,7 +267,7 @@
|
|||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"lanzaboote",
|
"lanzaboote",
|
||||||
"pre-commit-hooks-nix",
|
"pre-commit",
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
@@ -161,6 +285,23 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"glslang-WallpaperEngine": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1770589476,
|
||||||
|
"narHash": "sha256-auhYcTWdSERwujUqwfDbF61tncO18dwar3mMQ09VW1w=",
|
||||||
|
"owner": "Almamu",
|
||||||
|
"repo": "glslang-WallpaperEngine",
|
||||||
|
"rev": "b775500a153f5ceb0e4b6f366b79c4c57521bb62",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "Almamu",
|
||||||
|
"repo": "glslang-WallpaperEngine",
|
||||||
|
"rev": "b775500a153f5ceb0e4b6f366b79c4c57521bb62",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"home-manager": {
|
"home-manager": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
@@ -168,11 +309,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1764361670,
|
"lastModified": 1788355065,
|
||||||
"narHash": "sha256-jgWzgpIaHbL3USIq0gihZeuy1lLf2YSfwvWEwnfAJUw=",
|
"narHash": "sha256-gAz5oTI7ur34CfuakQduiQd/2ZhO62Bn2XXg08nZYYQ=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "780be8ef503a28939cf9dc7996b48ffb1a3e04c6",
|
"rev": "d9d750e4fc11c10cab2da677bdd31e427f3a3a71",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -189,11 +330,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1762964643,
|
"lastModified": 1788229478,
|
||||||
"narHash": "sha256-RYHN8O/Aja59XDji6WSJZPkJpYVUfpSkyH+PEupBJqM=",
|
"narHash": "sha256-G0F2rFORVcFkEvVdE/qWQTnYekIc77YP5/vRF9nZlxU=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "827f2a23373a774a8805f84ca5344654c31f354b",
|
"rev": "1dc2d1f720ab17fc7981e087346bf54b26d284b1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -202,96 +343,180 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"kwin-effects-forceblur": {
|
"json": {
|
||||||
"inputs": {
|
"flake": false,
|
||||||
"nixpkgs": [
|
|
||||||
"nixpkgs"
|
|
||||||
],
|
|
||||||
"utils": "utils"
|
|
||||||
},
|
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1755098995,
|
"lastModified": 1743872075,
|
||||||
"narHash": "sha256-6FN7XEf27DenQHDIKjrjOW3tGIaJlyqRlXarmt1v+M0=",
|
"narHash": "sha256-eSqi4dhFrUvjYN+jD8nGqj1FbzGA6I2+eSqzdCGOLH8=",
|
||||||
"owner": "taj-ny",
|
"owner": "nlohmann",
|
||||||
"repo": "kwin-effects-forceblur",
|
"repo": "json",
|
||||||
"rev": "51a1d49d7fd7df3ce40ccf6ba4c4410cf6f510e1",
|
"rev": "4424a0fcc1c7fa640b5c87d26776d99150dacd10",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "taj-ny",
|
"owner": "nlohmann",
|
||||||
"repo": "kwin-effects-forceblur",
|
"repo": "json",
|
||||||
|
"rev": "4424a0fcc1c7fa640b5c87d26776d99150dacd10",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"kissfft": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1739194969,
|
||||||
|
"narHash": "sha256-DywClnx67EE+CnduSuZIIfaAKbBg1ebQ+JgwIpDsnGQ=",
|
||||||
|
"owner": "mborgerding",
|
||||||
|
"repo": "kissfft",
|
||||||
|
"rev": "febd4caeed32e33ad8b2e0bb5ea77542c40f18ec",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "mborgerding",
|
||||||
|
"repo": "kissfft",
|
||||||
|
"rev": "febd4caeed32e33ad8b2e0bb5ea77542c40f18ec",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"lanzaboote": {
|
"lanzaboote": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"crane": "crane",
|
"crane": "crane",
|
||||||
"flake-compat": "flake-compat",
|
|
||||||
"flake-parts": "flake-parts",
|
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
],
|
],
|
||||||
"pre-commit-hooks-nix": "pre-commit-hooks-nix",
|
"pre-commit": "pre-commit",
|
||||||
"rust-overlay": "rust-overlay"
|
"rust-overlay": "rust-overlay_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1762205063,
|
"lastModified": 1782141370,
|
||||||
"narHash": "sha256-If6vQ+KvtKs3ARBO9G3l+4wFSCYtRBrwX1z+I+B61wQ=",
|
"narHash": "sha256-hqijVSEETttmo8Okql9/LG0Ua34hdciKW1a5zzlj8mU=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "lanzaboote",
|
"repo": "lanzaboote",
|
||||||
"rev": "88b8a563ff5704f4e8d8e5118fb911fa2110ca05",
|
"rev": "7c9a54a7f87b4539ddbd8bda09a8a5f5f9361aa9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"ref": "v0.4.3",
|
"ref": "v1.1.0",
|
||||||
"repo": "lanzaboote",
|
"repo": "lanzaboote",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixos-wsl": {
|
"millennium": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-compat": "flake-compat_2",
|
"millennium-src": "millennium-src",
|
||||||
"nixpkgs": "nixpkgs_2"
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
],
|
||||||
|
"nixpkgs-bun": "nixpkgs-bun"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1764072830,
|
"dir": "packages/nix",
|
||||||
"narHash": "sha256-ezkjlUCohD9o9c47Ey0/I4CamSS0QEORTqGvyGqMud0=",
|
"lastModified": 1792022604,
|
||||||
"owner": "nix-community",
|
"narHash": "sha256-xyl3KTB+j4W3dAxQVSolNJCQZOasDnCLB3Dr14adBmU=",
|
||||||
"repo": "NixOS-WSL",
|
"owner": "SteamClientHomebrew",
|
||||||
"rev": "c7832dd786175e20f2697179e0e03efadffe4201",
|
"repo": "Millennium",
|
||||||
|
"rev": "22af2f453777a925fb398a3dab60a407e66aa83f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"dir": "packages/nix",
|
||||||
"ref": "main",
|
"owner": "SteamClientHomebrew",
|
||||||
"repo": "NixOS-WSL",
|
"repo": "Millennium",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"millennium-src": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1791947497,
|
||||||
|
"narHash": "sha256-sNpoyJ+IjrTiDGfX2QiKVg4jkrJR7n9PdBeOYJSS4n8=",
|
||||||
|
"owner": "SteamClientHomebrew",
|
||||||
|
"repo": "Millennium",
|
||||||
|
"rev": "401d532543a0fbff469653ccba802bdd7e45f861",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "SteamClientHomebrew",
|
||||||
|
"repo": "Millennium",
|
||||||
|
"rev": "401d532543a0fbff469653ccba802bdd7e45f861",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nix-cachyos-kernel": {
|
||||||
|
"inputs": {
|
||||||
|
"flake-compat": "flake-compat_3",
|
||||||
|
"flake-parts": "flake-parts",
|
||||||
|
"nixpkgs": "nixpkgs"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1788379544,
|
||||||
|
"narHash": "sha256-EMfRomvn1lAErvY/Q3bQL+PwEi+5hbBwI0ZI5SRC/WM=",
|
||||||
|
"owner": "xddxdd",
|
||||||
|
"repo": "nix-cachyos-kernel",
|
||||||
|
"rev": "d1c3cadc796061778cf7f62bdbfaf68cf3c3c654",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "xddxdd",
|
||||||
|
"ref": "release",
|
||||||
|
"repo": "nix-cachyos-kernel",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1717179513,
|
"lastModified": 1788329703,
|
||||||
"narHash": "sha256-vboIEwIQojofItm2xGCdZCzW96U85l9nDW3ifMuAIdM=",
|
"narHash": "sha256-fHvRW4JUchuw6QNzQ50BfzeYe0TnjKml1V8PVRjntSI=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "63dacb46bf939521bdc93981b4cbb7ecb58427a0",
|
"rev": "090e478bd64824e2122328df47a7efb74fdaf0c1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"ref": "24.05",
|
"ref": "nixos-unstable-small",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nixpkgs-bun": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1790822859,
|
||||||
|
"narHash": "sha256-69xHQhAeMAD2wDXO7T2pcOZIF9Sga2W+JkmY2a11Ops=",
|
||||||
|
"owner": "nixos",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "c59305bab2065cfecc4944690d9eedbb56f3a9fa",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nixos",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "c59305bab2065cfecc4944690d9eedbb56f3a9fa",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs-lib": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1788057806,
|
||||||
|
"narHash": "sha256-DTQSMxzDWmT0zhguthvegnVkn7CFqGCv4IHCzk5ZUpM=",
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "nixpkgs.lib",
|
||||||
|
"rev": "596e2e3940e09b2abbeb03f75fa1828c57fcd72c",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "nixpkgs.lib",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1763678758,
|
"lastModified": 1788179007,
|
||||||
"narHash": "sha256-+hBiJ+kG5IoffUOdlANKFflTT5nO3FrrR2CA3178Y5s=",
|
"narHash": "sha256-hn1oU2rue2SYK8dAr8+WNZWtbsz1S2W5mnHlSEuh3bo=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "117cc7f94e8072499b0a7aa4c52084fa4e11cc9b",
|
"rev": "34ab99075ac4f7e40cf037eef32cb1c360bb85e9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -303,11 +528,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1764242076,
|
"lastModified": 1789286504,
|
||||||
"narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=",
|
"narHash": "sha256-eiEK7cKZORNEvX0GeF3RtNEF/JXhgf2RqSp3230q13E=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4",
|
"rev": "ef34387ddd751e1ab8857adf4676492d32eb24ec",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -317,28 +542,9 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_4": {
|
"pre-commit": {
|
||||||
"locked": {
|
|
||||||
"lastModified": 1762977756,
|
|
||||||
"narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=",
|
|
||||||
"owner": "nixos",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nixos",
|
|
||||||
"ref": "nixos-unstable",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"pre-commit-hooks-nix": {
|
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-compat": [
|
"flake-compat": "flake-compat_2",
|
||||||
"lanzaboote",
|
|
||||||
"flake-compat"
|
|
||||||
],
|
|
||||||
"gitignore": "gitignore",
|
"gitignore": "gitignore",
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"lanzaboote",
|
"lanzaboote",
|
||||||
@@ -346,11 +552,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1750779888,
|
"lastModified": 1781733627,
|
||||||
"narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=",
|
"narHash": "sha256-U3yTuGBnmXvXoQI3qkpfEDsn9RovQPAjN7ndRco+3u0=",
|
||||||
"owner": "cachix",
|
"owner": "cachix",
|
||||||
"repo": "pre-commit-hooks.nix",
|
"repo": "pre-commit-hooks.nix",
|
||||||
"rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d",
|
"rev": "3bbec39bc90eadfa031e6f3b77272f3f60803e39",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -359,22 +565,61 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"quickjs": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1770976497,
|
||||||
|
"narHash": "sha256-odQznZ/Xc6IGh6JPM1RyyEn9HL/+/AFR99XcF+WHJDc=",
|
||||||
|
"owner": "quickjs-ng",
|
||||||
|
"repo": "quickjs",
|
||||||
|
"rev": "72ba50f63ee31202f8c18b8d07ab1e1c3486ee6f",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "quickjs-ng",
|
||||||
|
"repo": "quickjs",
|
||||||
|
"rev": "72ba50f63ee31202f8c18b8d07ab1e1c3486ee6f",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"game-of-life": "game-of-life",
|
"aagl": "aagl",
|
||||||
|
"codex-desktop": "codex-desktop",
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"kwin-effects-forceblur": "kwin-effects-forceblur",
|
|
||||||
"lanzaboote": "lanzaboote",
|
"lanzaboote": "lanzaboote",
|
||||||
"nixos-wsl": "nixos-wsl",
|
"millennium": "millennium",
|
||||||
"nixpkgs": "nixpkgs_3",
|
"nix-cachyos-kernel": "nix-cachyos-kernel",
|
||||||
|
"nixpkgs": "nixpkgs_2",
|
||||||
|
"simple-wallpaper-engine": "simple-wallpaper-engine",
|
||||||
"snowfall-lib": "snowfall-lib",
|
"snowfall-lib": "snowfall-lib",
|
||||||
"sops-nix": "sops-nix",
|
"sops-nix": "sops-nix",
|
||||||
"trilium-next-pr": "trilium-next-pr",
|
"wallpaperengine": "wallpaperengine",
|
||||||
"wallpaper-engine-plugin-src": "wallpaper-engine-plugin-src",
|
|
||||||
"zen-browser": "zen-browser"
|
"zen-browser": "zen-browser"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"rust-overlay": {
|
"rust-overlay": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"aagl",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1785476452,
|
||||||
|
"narHash": "sha256-/CXwCFPS41rb/JI2VitKCgVK6V5E6/sfw5ke3B9zyVQ=",
|
||||||
|
"owner": "oxalica",
|
||||||
|
"repo": "rust-overlay",
|
||||||
|
"rev": "6ef009bf4c4873cdc1a621826722bdea7c03e62c",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "oxalica",
|
||||||
|
"repo": "rust-overlay",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"rust-overlay_2": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"lanzaboote",
|
"lanzaboote",
|
||||||
@@ -382,11 +627,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1761791894,
|
"lastModified": 1782012058,
|
||||||
"narHash": "sha256-myRIDh+PxaREz+z9LzbqBJF+SnTFJwkthKDX9zMyddY=",
|
"narHash": "sha256-9mWUnReOUXfKjZuJAL/bAFH3LUyECTRtXgSNVjRw3UY=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "59c45eb69d9222a4362673141e00ff77842cd219",
|
"rev": "8534567325bd8a8d2928e6afd81e0a87d19efd3c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -395,20 +640,41 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"simple-wallpaper-engine": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
],
|
||||||
|
"utils": "utils"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1772136897,
|
||||||
|
"narHash": "sha256-2RBgZWq80zXVWyOswUlDaoRZtaeT6pBkbNCLdAzLYoY=",
|
||||||
|
"owner": "Maxnights",
|
||||||
|
"repo": "simple-linux-wallpaperengine-gui",
|
||||||
|
"rev": "43ae644754a0a5e96c8ddb9077843643b74f9acc",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "Maxnights",
|
||||||
|
"repo": "simple-linux-wallpaperengine-gui",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"snowfall-lib": {
|
"snowfall-lib": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-compat": "flake-compat_3",
|
"flake-compat": "flake-compat_4",
|
||||||
"flake-utils-plus": "flake-utils-plus",
|
"flake-utils-plus": "flake-utils-plus",
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1736130495,
|
"lastModified": 1784328457,
|
||||||
"narHash": "sha256-4i9nAJEZFv7vZMmrE0YG55I3Ggrtfo5/T07JEpEZ/RM=",
|
"narHash": "sha256-4R5WV74NHhPk21ctoPmjL7nQ6txDnoBLwSWULvIw0TY=",
|
||||||
"owner": "snowfallorg",
|
"owner": "snowfallorg",
|
||||||
"repo": "lib",
|
"repo": "lib",
|
||||||
"rev": "02d941739f98a09e81f3d2d9b3ab08918958beac",
|
"rev": "6ee3542cb459ca4b038cfe50ceb8797f05cdabad",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -424,11 +690,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1764021963,
|
"lastModified": 1788337237,
|
||||||
"narHash": "sha256-1m84V2ROwNEbqeS9t37/mkry23GBhfMt8qb6aHHmjuc=",
|
"narHash": "sha256-gkSH8VUtCo6hnysNmb9DbTuDepH2t5pv+QWjP75xKAk=",
|
||||||
"owner": "mic92",
|
"owner": "mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "c482a1c1bbe030be6688ed7dc84f7213f304f1ec",
|
"rev": "fbf759290e0cb0a98dfc813a4eb7d53ad1dacb57",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -437,6 +703,23 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"stb": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1741976854,
|
||||||
|
"narHash": "sha256-FkTeRO/AC5itykH4uWNsE0UeQTS34VtGGoej5QJiBlg=",
|
||||||
|
"owner": "nothings",
|
||||||
|
"repo": "stb",
|
||||||
|
"rev": "f0569113c93ad095470c54bf34a17b36646bbbb5",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nothings",
|
||||||
|
"repo": "stb",
|
||||||
|
"rev": "f0569113c93ad095470c54bf34a17b36646bbbb5",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"systems": {
|
"systems": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1681028828,
|
"lastModified": 1681028828,
|
||||||
@@ -467,32 +750,31 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"trilium-next-pr": {
|
"systems_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1736678965,
|
"lastModified": 1681028828,
|
||||||
"narHash": "sha256-2A687i3Rq0/wqJVvpgaiRPWcfnBBuBhPjKaT8cnd7o0=",
|
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||||
"owner": "FliegendeWurst",
|
"owner": "nix-systems",
|
||||||
"repo": "nixpkgs",
|
"repo": "default",
|
||||||
"rev": "4fcdf706929246476e52e960760b6643cb8395c4",
|
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "FliegendeWurst",
|
"owner": "nix-systems",
|
||||||
"ref": "trilium-next",
|
"repo": "default",
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"utils": {
|
"utils": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems"
|
"systems": "systems_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1726560853,
|
"lastModified": 1731533236,
|
||||||
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
|
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "flake-utils",
|
"repo": "flake-utils",
|
||||||
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
|
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -501,34 +783,43 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"wallpaper-engine-plugin-src": {
|
"wallpaperengine": {
|
||||||
"flake": false,
|
"inputs": {
|
||||||
|
"Catch2": "Catch2",
|
||||||
|
"MimeTypes": "MimeTypes",
|
||||||
|
"SPIRV-Cross-WallpaperEngine": "SPIRV-Cross-WallpaperEngine",
|
||||||
|
"argparse": "argparse",
|
||||||
|
"glslang-WallpaperEngine": "glslang-WallpaperEngine",
|
||||||
|
"json": "json",
|
||||||
|
"kissfft": "kissfft",
|
||||||
|
"nixpkgs": "nixpkgs_3",
|
||||||
|
"quickjs": "quickjs",
|
||||||
|
"stb": "stb"
|
||||||
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1751185984,
|
"lastModified": 1790172262,
|
||||||
"narHash": "sha256-tKeYJvVa8jzbyZ7MQaOuCUJa+UqABolTNe3e5XNw998=",
|
"narHash": "sha256-gTnF4besYxSEFx0GTA35+/k81nE7WwvTIyJbIs1p20k=",
|
||||||
"owner": "catsout",
|
"path": "/home/andreas/Projects/linwallpaap/linux-wallpaperengine",
|
||||||
"repo": "wallpaper-engine-kde-plugin",
|
"type": "path"
|
||||||
"rev": "9e60b364e268814a1a778549c579ad45a9b9c7bb",
|
|
||||||
"type": "github"
|
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "catsout",
|
"path": "/home/andreas/Projects/linwallpaap/linux-wallpaperengine",
|
||||||
"ref": "main",
|
"type": "path"
|
||||||
"repo": "wallpaper-engine-kde-plugin",
|
|
||||||
"type": "github"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"zen-browser": {
|
"zen-browser": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"home-manager": "home-manager_2",
|
"home-manager": "home-manager_2",
|
||||||
"nixpkgs": "nixpkgs_4"
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1764414951,
|
"lastModified": 1788405419,
|
||||||
"narHash": "sha256-pZ2m2JmTTMyqiKB8WSigsSvAeoShI6OSRhzBuRO9SVY=",
|
"narHash": "sha256-wuGizAVEmY0u15MYrhgy7AoQdHg+4Y2QiC+v/mxA8dc=",
|
||||||
"owner": "0xc000022070",
|
"owner": "0xc000022070",
|
||||||
"repo": "zen-browser-flake",
|
"repo": "zen-browser-flake",
|
||||||
"rev": "10d2aa53ada9b14f6df2f9877d6a057f0a2b262f",
|
"rev": "fdb83f8fce835213fab7eab52c375926fe1a32dc",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -3,38 +3,62 @@
|
|||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
# nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
|
# nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; # Use nixos-unstable for latest kernel and packages
|
||||||
nixos-wsl.url = "github:nix-community/NixOS-WSL/main";
|
# nixos-wsl = {
|
||||||
|
# url = "github:nix-community/NixOS-WSL/main";
|
||||||
|
# inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
# };
|
||||||
# Snowfallorg's Flake utility
|
# Snowfallorg's Flake utility
|
||||||
snowfall-lib = {
|
snowfall-lib = {
|
||||||
url = "github:snowfallorg/lib";
|
url = "github:snowfallorg/lib";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
game-of-life.url = "github:local-interloper/game-of-life";
|
# game-of-life = {
|
||||||
|
# url = "github:local-interloper/game-of-life";
|
||||||
|
# inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
# };
|
||||||
# Add sops-nix for secrets management
|
# Add sops-nix for secrets management
|
||||||
sops-nix = {
|
sops-nix = {
|
||||||
url = "github:mic92/sops-nix";
|
url = "github:mic92/sops-nix";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
zen-browser.url = "github:0xc000022070/zen-browser-flake";
|
zen-browser = {
|
||||||
|
url = "github:0xc000022070/zen-browser-flake";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
home-manager = {
|
home-manager = {
|
||||||
url = "github:nix-community/home-manager";
|
url = "github:nix-community/home-manager";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
trilium-next-pr.url = "github:FliegendeWurst/nixpkgs/trilium-next";
|
# anikki = {
|
||||||
|
# url = "github:Hion-V/Anikki-flake";
|
||||||
|
# inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
# };
|
||||||
lanzaboote = {
|
lanzaboote = {
|
||||||
url = "github:nix-community/lanzaboote/v0.4.3";
|
url = "github:nix-community/lanzaboote/v1.1.0";
|
||||||
|
|
||||||
# Optional but recommended to limit the size of your system closure.
|
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
kwin-effects-forceblur = {
|
# kwin-effects-forceblur = { Archived.
|
||||||
url = "github:taj-ny/kwin-effects-forceblur";
|
# url = "github:taj-ny/kwin-effects-forceblur";
|
||||||
|
# inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
# };
|
||||||
|
aagl = {
|
||||||
|
url = "github:ezKEa/aagl-gtk-on-nix";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
wallpaper-engine-plugin-src = {
|
nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel/release";
|
||||||
url = "github:catsout/wallpaper-engine-kde-plugin/main";
|
wallpaperengine.url = "path:/home/andreas/Projects/linwallpaap/linux-wallpaperengine";
|
||||||
flake = false;
|
simple-wallpaper-engine = {
|
||||||
|
url = "github:Maxnights/simple-linux-wallpaperengine-gui";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
|
millennium = {
|
||||||
|
url = "github:SteamClientHomebrew/Millennium?dir=packages/nix";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
|
codex-desktop = {
|
||||||
|
url = "github:ilysenko/codex-desktop-linux";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -75,13 +99,21 @@
|
|||||||
inherit inputs;
|
inherit inputs;
|
||||||
src = ./.;
|
src = ./.;
|
||||||
|
|
||||||
|
overlays = with inputs; [
|
||||||
|
# Use the exact kernel versions as defined in this repo.
|
||||||
|
# Guarantees you have binary cache.
|
||||||
|
nix-cachyos-kernel.overlays.pinned
|
||||||
|
inputs.millennium.overlays.default
|
||||||
|
];
|
||||||
|
|
||||||
nixos = with inputs; [
|
nixos = with inputs; [
|
||||||
|
|
||||||
# disko.nixosModules.disko
|
# disko.nixosModules.disko
|
||||||
# impermanence.nixosModules.impermanence
|
# impermanence.nixosModules.impermanence
|
||||||
home-manager.nixosModules.home-manager
|
home-manager.nixosModules.home-manager
|
||||||
{
|
{
|
||||||
home-manager = {
|
home-manager = {
|
||||||
useGlobalPkgs = true;
|
useGlobalPkgs = false; # Disabled to allow system-level overlays to work
|
||||||
useUserPackages = true;
|
useUserPackages = true;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,6 +6,15 @@
|
|||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
inherit (lib.my-namespace) enabled;
|
inherit (lib.my-namespace) enabled;
|
||||||
|
system = pkgs.stdenv.hostPlatform.system;
|
||||||
|
simpleWallpaperEngine =
|
||||||
|
inputs.simple-wallpaper-engine.packages.${system}.default.override {
|
||||||
|
# The upstream GUI package otherwise puts nixpkgs' unmodified
|
||||||
|
# linux-wallpaperengine in its wrapped PATH.
|
||||||
|
pkgs = pkgs // {
|
||||||
|
linux-wallpaperengine = inputs.wallpaperengine.packages.${system}.default;
|
||||||
|
};
|
||||||
|
};
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
@@ -14,6 +23,7 @@ in
|
|||||||
my-namespace.home = {
|
my-namespace.home = {
|
||||||
stream-tools = enabled;
|
stream-tools = enabled;
|
||||||
gnome-customizations = enabled;
|
gnome-customizations = enabled;
|
||||||
|
vesktop-appimage = enabled;
|
||||||
# networking = enabled;
|
# networking = enabled;
|
||||||
# personal-apps = enabled;
|
# personal-apps = enabled;
|
||||||
# suites.laptop = enabled;
|
# suites.laptop = enabled;
|
||||||
@@ -21,14 +31,33 @@ in
|
|||||||
home = {
|
home = {
|
||||||
packages = [
|
packages = [
|
||||||
pkgs.nil
|
pkgs.nil
|
||||||
pkgs.gamemode
|
|
||||||
pkgs.beeper
|
pkgs.beeper
|
||||||
|
pkgs.mpv
|
||||||
pkgs.my-namespace.udev-steelseries
|
pkgs.my-namespace.udev-steelseries
|
||||||
pkgs.qbittorrent
|
pkgs.qbittorrent
|
||||||
pkgs.vesktop
|
pkgs.hyfetch
|
||||||
|
pkgs.libreoffice
|
||||||
|
pkgs.localsend
|
||||||
|
simpleWallpaperEngine
|
||||||
|
# pkgs.vesktop
|
||||||
pkgs.obsidian
|
pkgs.obsidian
|
||||||
inputs.zen-browser.packages.x86_64-linux.default
|
inputs.zen-browser.packages.x86_64-linux.default
|
||||||
inputs.kwin-effects-forceblur.packages.${pkgs.system}.default
|
# inputs.kwin-effects-forceblur.packages.${pkgs.stdenv.hostPlatform.system}.default # Archived.
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
xdg.autostart = {
|
||||||
|
enable = true;
|
||||||
|
entries = [
|
||||||
|
"${simpleWallpaperEngine}/share/applications/simple-wallpaper-engine-autostart.desktop"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
# Auto-start linux-wallpaperengine for dual monitors via XDG autostart
|
||||||
|
# xdg.configFile."autostart/linux-wallpaperengine.desktop".text = ''
|
||||||
|
# [Desktop Entry]
|
||||||
|
# Type=Application
|
||||||
|
# Name=Wallpaper Engine
|
||||||
|
# Exec=${pkgs.my-namespace.linux-wallpaperengine}/bin/linux-wallpaperengine --screen-root DP-1 --bg 2935872330 --screen-root DP-2 --bg 2935872330 -f 12
|
||||||
|
# X-KDE-autostart-after=panel
|
||||||
|
# X-KDE-StartupNotify=false
|
||||||
|
# '';
|
||||||
}
|
}
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
{ config
|
|
||||||
, lib
|
|
||||||
, pkgs
|
|
||||||
, ...
|
|
||||||
}:
|
|
||||||
let
|
|
||||||
inherit (lib.my-namespace) enabled;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
imports = [
|
|
||||||
# ../modules.nix
|
|
||||||
];
|
|
||||||
my-namespace.home = {
|
|
||||||
stream-tools = enabled;
|
|
||||||
# networking = enabled;
|
|
||||||
# personal-apps = enabled;
|
|
||||||
# suites.laptop = enabled;
|
|
||||||
};
|
|
||||||
home = {
|
|
||||||
packages = [
|
|
||||||
pkgs.nil
|
|
||||||
pkgs.beeper
|
|
||||||
];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -20,11 +20,10 @@ in
|
|||||||
home = {
|
home = {
|
||||||
packages = [
|
packages = [
|
||||||
pkgs.nil
|
pkgs.nil
|
||||||
pkgs.gamemode
|
|
||||||
pkgs.beeper
|
pkgs.beeper
|
||||||
pkgs.my-namespace.udev-steelseries
|
pkgs.my-namespace.udev-steelseries
|
||||||
pkgs.qbittorrent
|
pkgs.qbittorrent
|
||||||
pkgs.vesktop
|
#pkgs.vesktop
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -1,5 +1,4 @@
|
|||||||
{ pkgs
|
{ config
|
||||||
, config
|
|
||||||
, lib
|
, lib
|
||||||
, ...
|
, ...
|
||||||
}:
|
}:
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ in
|
|||||||
home = {
|
home = {
|
||||||
packages = with pkgs; [
|
packages = with pkgs; [
|
||||||
inetutils
|
inetutils
|
||||||
neofetch
|
hyfetch
|
||||||
tmux
|
tmux
|
||||||
# nerdfonts
|
# nerdfonts
|
||||||
p7zip
|
p7zip
|
||||||
|
|||||||
@@ -16,11 +16,19 @@ in {
|
|||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
programs.obs-studio = {
|
programs.obs-studio = {
|
||||||
enable = true;
|
enable = true;
|
||||||
plugins = [ pkgs.obs-studio-plugins.droidcam-obs ];
|
plugins = with pkgs.obs-studio-plugins; [
|
||||||
|
wlrobs
|
||||||
|
obs-backgroundremoval
|
||||||
|
obs-pipewire-audio-capture
|
||||||
|
obs-vaapi #optional AMD hardware acceleration
|
||||||
|
obs-gstreamer
|
||||||
|
obs-vkcapture
|
||||||
|
pkgs.my-namespace.droidcam-obs # Custom override with FFmpeg 6
|
||||||
|
];
|
||||||
};
|
};
|
||||||
home = {
|
home = {
|
||||||
packages = with pkgs; [
|
packages = with pkgs; [
|
||||||
# obs-studio
|
config.programs.obs-studio.finalPackage
|
||||||
droidcam
|
droidcam
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -0,0 +1,49 @@
|
|||||||
|
{ config, pkgs, lib, ... }:
|
||||||
|
let
|
||||||
|
inherit (lib) mkEnableOption mkIf;
|
||||||
|
cfg = config.my-namespace.home.vesktop-appimage;
|
||||||
|
vesktopVersion = "1.6.4";
|
||||||
|
|
||||||
|
vesktopAppImage = pkgs.runCommand "vesktop-appimage" { } ''
|
||||||
|
cp ${pkgs.fetchurl {
|
||||||
|
url = "https://github.com/Vencord/Vesktop/releases/download/v${vesktopVersion}/Vesktop-${vesktopVersion}.AppImage";
|
||||||
|
sha256 = "sha256-o7A8DBQyutONeLp5rstq9hQko2xxbvYZvGGM8/YOQ8s=";
|
||||||
|
}} $out
|
||||||
|
chmod +x $out
|
||||||
|
'';
|
||||||
|
|
||||||
|
vesktopWrapped = pkgs.writeShellScriptBin "vesktop" ''
|
||||||
|
exec ${pkgs.appimage-run}/bin/appimage-run ${vesktopAppImage} "$@"
|
||||||
|
'';
|
||||||
|
|
||||||
|
vesktopIcon = pkgs.fetchurl {
|
||||||
|
url = "https://raw.githubusercontent.com/Vencord/Vesktop/main/build/icon.svg";
|
||||||
|
sha256 = "sha256-fQ+dvbPIb4AFd9f7JqIt7+twJdEMQF9jTTwrk5p1vn8=";
|
||||||
|
};
|
||||||
|
|
||||||
|
in
|
||||||
|
{
|
||||||
|
options.my-namespace.home.vesktop-appimage = {
|
||||||
|
enable = mkEnableOption "Install Vesktop (AppImage) with Vencord support";
|
||||||
|
};
|
||||||
|
|
||||||
|
config = mkIf cfg.enable {
|
||||||
|
|
||||||
|
xdg.dataFile."icons/hicolor/scalable/apps/vesktop.svg".source = vesktopIcon;
|
||||||
|
|
||||||
|
home.packages = [
|
||||||
|
pkgs.appimage-run
|
||||||
|
vesktopWrapped
|
||||||
|
];
|
||||||
|
|
||||||
|
xdg.desktopEntries.vesktop = {
|
||||||
|
name = "Vesktop";
|
||||||
|
comment = "Discord client with Vencord (AppImage)";
|
||||||
|
exec = "${vesktopWrapped}/bin/vesktop";
|
||||||
|
icon = "vesktop";
|
||||||
|
terminal = false;
|
||||||
|
type = "Application";
|
||||||
|
categories = [ "Network" "Chat" ];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
{ lib, pkgs, config, namespace, ... }:
|
||||||
|
|
||||||
|
let
|
||||||
|
cfg = config.${namespace}.cs-tools;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
options.${namespace}.cs-tools = {
|
||||||
|
enable = lib.mkEnableOption "CS tools including CS Demo Manager and PostgreSQL";
|
||||||
|
};
|
||||||
|
|
||||||
|
config = lib.mkIf cfg.enable {
|
||||||
|
services.postgresql = {
|
||||||
|
enable = true;
|
||||||
|
ensureDatabases = [ "csdm" ];
|
||||||
|
ensureUsers = [{
|
||||||
|
name = "csdm";
|
||||||
|
}];
|
||||||
|
};
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
my-namespace.cs-demo-manager
|
||||||
|
postgresql
|
||||||
|
];
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,160 @@
|
|||||||
|
{ config, lib, pkgs, namespace, ... }:
|
||||||
|
|
||||||
|
let
|
||||||
|
cfg = config.${namespace}.desktop-environment;
|
||||||
|
in {
|
||||||
|
|
||||||
|
options.${namespace}.desktop-environment = {
|
||||||
|
cinnamon = {
|
||||||
|
enable = lib.mkEnableOption "Cinnamon desktop environment";
|
||||||
|
};
|
||||||
|
xfce = {
|
||||||
|
enable = lib.mkEnableOption "XFCE desktop environment";
|
||||||
|
};
|
||||||
|
gnome = {
|
||||||
|
enable = lib.mkEnableOption "GNOME desktop environment";
|
||||||
|
};
|
||||||
|
kde = {
|
||||||
|
enable = lib.mkEnableOption "KDE Plasma desktop environment";
|
||||||
|
};
|
||||||
|
cosmic = {
|
||||||
|
enable = lib.mkEnableOption "Cosmic desktop environment";
|
||||||
|
};
|
||||||
|
hyprland = {
|
||||||
|
enable = lib.mkEnableOption "hyprland Wayland shell";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
config = lib.mkMerge [
|
||||||
|
(lib.mkIf cfg.xfce.enable {
|
||||||
|
services.xserver = {
|
||||||
|
enable = true;
|
||||||
|
desktopManager = {
|
||||||
|
cinnamon.enable = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR =
|
||||||
|
lib.mkForce "${pkgs.gnome.nixos-gsettings-overrides}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";
|
||||||
|
})
|
||||||
|
(lib.mkIf cfg.xfce.enable {
|
||||||
|
services.xserver = {
|
||||||
|
enable = true;
|
||||||
|
desktopManager = {
|
||||||
|
xfce.enable = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
xfce4-pulseaudio-plugin
|
||||||
|
xfce4-clipman-plugin
|
||||||
|
xfce4-screenshooter
|
||||||
|
xfce4-whiskermenu-plugin
|
||||||
|
thunar-archive-plugin
|
||||||
|
thunar-volman
|
||||||
|
gvfs
|
||||||
|
gnome-keyring
|
||||||
|
libgnome-keyring
|
||||||
|
];
|
||||||
|
})
|
||||||
|
|
||||||
|
(lib.mkIf cfg.gnome.enable {
|
||||||
|
services.xserver = {
|
||||||
|
enable = true;
|
||||||
|
};
|
||||||
|
services.desktopManager.gnome.enable = true;
|
||||||
|
services.gnome.gnome-remote-desktop.enable = true;
|
||||||
|
systemd.services.gnome-remote-desktop = {
|
||||||
|
wantedBy = [ "graphical.target" ]; # for starting the unit automatically at boot
|
||||||
|
};
|
||||||
|
services.displayManager.autoLogin.enable = false;
|
||||||
|
networking.firewall.allowedTCPPorts = [
|
||||||
|
3389
|
||||||
|
3390
|
||||||
|
];
|
||||||
|
|
||||||
|
# users.users.andreas.extraGroups = [ "sambashare" ];
|
||||||
|
# Enable Avahi (mDNS/DNS-SD) for discovery
|
||||||
|
services.avahi = {
|
||||||
|
enable = true;
|
||||||
|
nssmdns4 = true;
|
||||||
|
openFirewall = true;
|
||||||
|
};
|
||||||
|
# Enable GNOME sharing services
|
||||||
|
services.gnome.gnome-user-share.enable = true;
|
||||||
|
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
gnome-tweaks
|
||||||
|
ptyxis
|
||||||
|
gnome-software
|
||||||
|
gnomeExtensions.pop-shell
|
||||||
|
gnome-remote-desktop
|
||||||
|
dconf-editor
|
||||||
|
glib-networking # Required gnome-remote-desktop dependency
|
||||||
|
];
|
||||||
|
systemd.user.services.gnome-remote-desktop.environment = {
|
||||||
|
VK_ICD_FILENAMES = "/dev/null";
|
||||||
|
LIBGL_ALWAYS_SOFTWARE = "1";
|
||||||
|
};
|
||||||
|
|
||||||
|
systemd.services.gnome-remote-desktop.environment = {
|
||||||
|
VK_ICD_FILENAMES = "/dev/null";
|
||||||
|
LIBGL_ALWAYS_SOFTWARE = "1";
|
||||||
|
};
|
||||||
|
environment.sessionVariables.XDG_DATA_DIRS = lib.mkAfter [
|
||||||
|
"${pkgs.gnome-remote-desktop}/share"
|
||||||
|
];
|
||||||
|
environment.pathsToLink = [
|
||||||
|
"/share/gsettings-schemas"
|
||||||
|
"/share"
|
||||||
|
];
|
||||||
|
})
|
||||||
|
|
||||||
|
(lib.mkIf cfg.kde.enable {
|
||||||
|
services.xserver.enable = true;
|
||||||
|
services.desktopManager.plasma6.enable = true;
|
||||||
|
environment.sessionVariables = {
|
||||||
|
# Forces KWin to use the legacy DRM interface so "Allow Tearing" actually works
|
||||||
|
# KWIN_DRM_NO_AMS = "1";
|
||||||
|
# Disables the new triple buffering in Plasma 6.1+ to reduce latency
|
||||||
|
# KWIN_DRM_DISABLE_TRIPLE_BUFFERING = "1";
|
||||||
|
# KWIN_USE_HWCURSOR = "0";
|
||||||
|
# KWIN_DRM_USE_EGL_STREAMS = "0";
|
||||||
|
# MESA_VK_WSI_PRESENT_MODE = "immediate";
|
||||||
|
# vblank_mode = "0";
|
||||||
|
};
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
kdePackages.qtwebsockets
|
||||||
|
kdePackages.qtwebchannel
|
||||||
|
kdePackages.korganizer
|
||||||
|
kdePackages.akonadi
|
||||||
|
kdePackages.akonadi-calendar
|
||||||
|
kdePackages.akonadi-contacts
|
||||||
|
kdePackages.kaddressbook
|
||||||
|
kdePackages.kmail
|
||||||
|
kdePackages.kdepim-runtime
|
||||||
|
kdePackages.kontact
|
||||||
|
kdePackages.kidentitymanagement
|
||||||
|
kdePackages.libkdepim
|
||||||
|
kdePackages.kwin
|
||||||
|
kdePackages.plasma-workspace
|
||||||
|
gnome-keyring
|
||||||
|
libgnome-keyring
|
||||||
|
];
|
||||||
|
})
|
||||||
|
(lib.mkIf cfg.cosmic.enable {
|
||||||
|
services.desktopManager.cosmic.enable = true;
|
||||||
|
services.desktopManager.cosmic.xwayland.enable = true;
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
|
||||||
|
gnome-keyring
|
||||||
|
libgnome-keyring
|
||||||
|
];
|
||||||
|
})
|
||||||
|
(lib.mkIf cfg.hyprland.enable {
|
||||||
|
programs.hyprland.enable = true; # enable Hyprland
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
pkgs.kitty # required for the default Hyprland config
|
||||||
|
];
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
namespace,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
let
|
||||||
|
cfg = config.${namespace}.distrobox;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
options.${namespace}.distrobox = {
|
||||||
|
enable = lib.mkEnableOption "Distrobox with a Podman container backend";
|
||||||
|
};
|
||||||
|
|
||||||
|
config = lib.mkIf cfg.enable {
|
||||||
|
environment.systemPackages = [ pkgs.distrobox ];
|
||||||
|
|
||||||
|
virtualisation.podman.enable = true;
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
namespace,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
let
|
||||||
|
cfg = config.${namespace}.file-organization;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
options.${namespace}.file-organization = {
|
||||||
|
enable = lib.mkEnableOption "file organization software";
|
||||||
|
};
|
||||||
|
config = lib.mkIf cfg.enable {
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
ranger
|
||||||
|
fsearch
|
||||||
|
qdirstat
|
||||||
|
veracrypt
|
||||||
|
];
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
{ config, lib, pkgs, namespace, options, ... }:
|
||||||
|
|
||||||
|
let
|
||||||
|
cfg = config.${namespace}.gnome-keyring;
|
||||||
|
in {
|
||||||
|
options.${namespace}.gnome-keyring = {
|
||||||
|
enable = lib.mkEnableOption "Enable GNOME Keyring integration";
|
||||||
|
};
|
||||||
|
|
||||||
|
config = lib.mkIf cfg.enable {
|
||||||
|
services.gnome.gnome-keyring.enable = true;
|
||||||
|
|
||||||
|
# PAM configuration for automatic keyring unlock
|
||||||
|
security.pam.services.sddm.enableGnomeKeyring = true;
|
||||||
|
security.pam.services.login.enableGnomeKeyring = true;
|
||||||
|
security.pam.services.gdm.enableGnomeKeyring = true;
|
||||||
|
|
||||||
|
# Make KDE apps use GNOME Keyring as the Secret Service backend
|
||||||
|
environment.variables = {
|
||||||
|
# Set GNOME Keyring as the SSH agent
|
||||||
|
SSH_AUTH_SOCK = "$XDG_RUNTIME_DIR/keyring/ssh";
|
||||||
|
};
|
||||||
|
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
seahorse # GUI for managing the keyring
|
||||||
|
gcr # Keyring integration
|
||||||
|
libsecret # Secret Service API library for KDE apps
|
||||||
|
];
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,120 @@
|
|||||||
|
{ config, lib, pkgs, namespace, ... }:
|
||||||
|
|
||||||
|
let
|
||||||
|
cfg = config.${namespace}.keychron-keyboard;
|
||||||
|
in {
|
||||||
|
options.${namespace}.keychron-keyboard = {
|
||||||
|
enable = lib.mkEnableOption "Enable Keychron keyboard configuration";
|
||||||
|
# Add additional options here, e.g. vendor/product IDs, keymaps, etc.
|
||||||
|
};
|
||||||
|
|
||||||
|
config = lib.mkIf cfg.enable {
|
||||||
|
|
||||||
|
# Create the plugdev group and ensure users can access HID devices
|
||||||
|
users.groups.plugdev = {};
|
||||||
|
|
||||||
|
hardware.keyboard.qmk.keychronSupport = true;
|
||||||
|
services.udev.packages = with pkgs; [ qmk qmk-udev-rules ];
|
||||||
|
|
||||||
|
|
||||||
|
# Example udev rule or keychron-specific settings
|
||||||
|
services.udev.extraRules = ''
|
||||||
|
# Atmel DFU
|
||||||
|
### ATmega16U2
|
||||||
|
SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2fef", TAG+="uaccess"
|
||||||
|
### ATmega32U2
|
||||||
|
SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2ff0", TAG+="uaccess"
|
||||||
|
### ATmega16U4
|
||||||
|
SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2ff3", TAG+="uaccess"
|
||||||
|
### ATmega32U4
|
||||||
|
SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2ff4", TAG+="uaccess"
|
||||||
|
### AT90USB64
|
||||||
|
SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2ff9", TAG+="uaccess"
|
||||||
|
### AT90USB162
|
||||||
|
SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2ffa", TAG+="uaccess"
|
||||||
|
### AT90USB128
|
||||||
|
SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2ffb", TAG+="uaccess"
|
||||||
|
|
||||||
|
# Input Club
|
||||||
|
SUBSYSTEMS=="usb", ATTRS{idVendor}=="1c11", ATTRS{idProduct}=="b007", TAG+="uaccess"
|
||||||
|
|
||||||
|
# STM32duino
|
||||||
|
SUBSYSTEMS=="usb", ATTRS{idVendor}=="1eaf", ATTRS{idProduct}=="0003", TAG+="uaccess"
|
||||||
|
# STM32 DFU
|
||||||
|
SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="df11", TAG+="uaccess"
|
||||||
|
|
||||||
|
# BootloadHID
|
||||||
|
SUBSYSTEMS=="usb", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="05df", TAG+="uaccess"
|
||||||
|
|
||||||
|
# USBAspLoader
|
||||||
|
SUBSYSTEMS=="usb", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="05dc", TAG+="uaccess"
|
||||||
|
|
||||||
|
# USBtinyISP
|
||||||
|
SUBSYSTEMS=="usb", ATTRS{idVendor}=="1782", ATTRS{idProduct}=="0c9f", TAG+="uaccess"
|
||||||
|
|
||||||
|
# ModemManager should ignore the following devices
|
||||||
|
# Atmel SAM-BA (Massdrop)
|
||||||
|
SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="6124", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
|
||||||
|
|
||||||
|
# Caterina (Pro Micro)
|
||||||
|
## pid.codes shared PID
|
||||||
|
### Keyboardio Atreus 2 Bootloader
|
||||||
|
SUBSYSTEMS=="usb", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="2302", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
|
||||||
|
## Spark Fun Electronics
|
||||||
|
### Pro Micro 3V3/8MHz
|
||||||
|
SUBSYSTEMS=="usb", ATTRS{idVendor}=="1b4f", ATTRS{idProduct}=="9203", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
|
||||||
|
### Pro Micro 5V/16MHz
|
||||||
|
SUBSYSTEMS=="usb", ATTRS{idVendor}=="1b4f", ATTRS{idProduct}=="9205", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
|
||||||
|
### LilyPad 3V3/8MHz (and some Pro Micro clones)
|
||||||
|
SUBSYSTEMS=="usb", ATTRS{idVendor}=="1b4f", ATTRS{idProduct}=="9207", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
|
||||||
|
## Pololu Electronics
|
||||||
|
### A-Star 32U4
|
||||||
|
SUBSYSTEMS=="usb", ATTRS{idVendor}=="1ffb", ATTRS{idProduct}=="0101", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
|
||||||
|
## Arduino SA
|
||||||
|
### Leonardo
|
||||||
|
SUBSYSTEMS=="usb", ATTRS{idVendor}=="2341", ATTRS{idProduct}=="0036", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
|
||||||
|
### Micro
|
||||||
|
SUBSYSTEMS=="usb", ATTRS{idVendor}=="2341", ATTRS{idProduct}=="0037", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
|
||||||
|
## Adafruit Industries LLC
|
||||||
|
### Feather 32U4
|
||||||
|
SUBSYSTEMS=="usb", ATTRS{idVendor}=="239a", ATTRS{idProduct}=="000c", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
|
||||||
|
### ItsyBitsy 32U4 3V3/8MHz
|
||||||
|
SUBSYSTEMS=="usb", ATTRS{idVendor}=="239a", ATTRS{idProduct}=="000d", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
|
||||||
|
### ItsyBitsy 32U4 5V/16MHz
|
||||||
|
SUBSYSTEMS=="usb", ATTRS{idVendor}=="239a", ATTRS{idProduct}=="000e", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
|
||||||
|
## dog hunter AG
|
||||||
|
### Leonardo
|
||||||
|
SUBSYSTEMS=="usb", ATTRS{idVendor}=="2a03", ATTRS{idProduct}=="0036", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
|
||||||
|
### Micro
|
||||||
|
SUBSYSTEMS=="usb", ATTRS{idVendor}=="2a03", ATTRS{idProduct}=="0037", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
|
||||||
|
|
||||||
|
# hid_listen
|
||||||
|
KERNEL=="hidraw*", MODE="0666", TAG+="uaccess", TAG+="udev-acl"
|
||||||
|
|
||||||
|
# hidraw devices for WebHID (Keychron Launcher, VIA)
|
||||||
|
SUBSYSTEM=="hidraw", MODE="0666", TAG+="uaccess", TAG+="udev-acl"
|
||||||
|
|
||||||
|
# hid bootloaders
|
||||||
|
## QMK HID
|
||||||
|
SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2067", TAG+="uaccess"
|
||||||
|
## PJRC's HalfKay
|
||||||
|
SUBSYSTEMS=="usb", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="0478", TAG+="uaccess"
|
||||||
|
|
||||||
|
# APM32 DFU
|
||||||
|
SUBSYSTEMS=="usb", ATTRS{idVendor}=="314b", ATTRS{idProduct}=="0106", TAG+="uaccess"
|
||||||
|
|
||||||
|
# GD32V DFU
|
||||||
|
SUBSYSTEMS=="usb", ATTRS{idVendor}=="28e9", ATTRS{idProduct}=="0189", TAG+="uaccess"
|
||||||
|
|
||||||
|
# WB32 DFU
|
||||||
|
SUBSYSTEMS=="usb", ATTRS{idVendor}=="342d", ATTRS{idProduct}=="dfa0", TAG+="uaccess"
|
||||||
|
|
||||||
|
# AT32 DFU
|
||||||
|
SUBSYSTEMS=="usb", ATTRS{idVendor}=="2e3c", ATTRS{idProduct}=="df11", TAG+="uaccess"
|
||||||
|
'';
|
||||||
|
#
|
||||||
|
# home.file.".config/some-config".text = ''
|
||||||
|
# # keyboard-related configuration
|
||||||
|
# '';
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
{ config, lib, pkgs, namespace, ... }:
|
||||||
|
|
||||||
|
let
|
||||||
|
cfg = config.${namespace}.performance-tuning;
|
||||||
|
in {
|
||||||
|
options.${namespace}.performance-tuning.enable = lib.mkEnableOption "performance tuning settings for gaming and general use";
|
||||||
|
config = lib.mkIf cfg.enable {
|
||||||
|
boot.kernelParams = [
|
||||||
|
"nvme_core.default_ps_max_latency_us=0"
|
||||||
|
];
|
||||||
|
|
||||||
|
boot.kernel.sysctl = {
|
||||||
|
"vm.swappiness" = 10;
|
||||||
|
"vm.dirty_ratio" = 10;
|
||||||
|
"vm.dirty_background_ratio" = 5;
|
||||||
|
};
|
||||||
|
|
||||||
|
services.pipewire.extraConfig.pipewire."context.properties" = {
|
||||||
|
"default.clock.quantum" = 256;
|
||||||
|
"default.clock.min-quantum" = 128;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,58 @@
|
|||||||
|
{ config, lib, pkgs, namespace, ... }:
|
||||||
|
let
|
||||||
|
cfg = config.${namespace}.rtl8125-recovery;
|
||||||
|
recovery = pkgs.writeShellApplication {
|
||||||
|
name = "rtl8125-recover";
|
||||||
|
runtimeInputs = with pkgs; [ coreutils gnugrep pciutils ethtool systemd ];
|
||||||
|
text = builtins.readFile ./recover.sh;
|
||||||
|
};
|
||||||
|
in {
|
||||||
|
options.${namespace}.rtl8125-recovery = {
|
||||||
|
enable = lib.mkEnableOption "RTL8125 PCI recovery after boot and resume";
|
||||||
|
pciAddress = lib.mkOption {
|
||||||
|
type = lib.types.str;
|
||||||
|
default = "0000:0a:00.0";
|
||||||
|
description = "PCI address of the onboard RTL8125 controller.";
|
||||||
|
};
|
||||||
|
bridgeAddress = lib.mkOption {
|
||||||
|
type = lib.types.str;
|
||||||
|
default = "0000:06:03.0";
|
||||||
|
description = "Immediate parent PCI bridge of the controller.";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
config = lib.mkIf cfg.enable {
|
||||||
|
systemd.services.rtl8125-recovery = {
|
||||||
|
description = "Recover RTL8125 from failed PCI power restoration";
|
||||||
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
after = [ "NetworkManager.service" ];
|
||||||
|
environment = {
|
||||||
|
NIC_PCI = cfg.pciAddress;
|
||||||
|
NIC_BRIDGE = cfg.bridgeAddress;
|
||||||
|
};
|
||||||
|
serviceConfig = {
|
||||||
|
Type = "oneshot";
|
||||||
|
ExecStart = lib.getExe recovery;
|
||||||
|
TimeoutStartSec = "90s";
|
||||||
|
StateDirectory = "rtl8125-recovery";
|
||||||
|
StateDirectoryMode = "0700";
|
||||||
|
UMask = "0077";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
# sleep.target is stopped after resume. Queue recovery separately so its
|
||||||
|
# grace period does not hold up the sleep transaction or user sessions.
|
||||||
|
systemd.services.rtl8125-resume = {
|
||||||
|
description = "Queue RTL8125 recovery after waking";
|
||||||
|
wantedBy = [ "sleep.target" ];
|
||||||
|
before = [ "sleep.target" ];
|
||||||
|
unitConfig.StopWhenUnneeded = true;
|
||||||
|
serviceConfig = {
|
||||||
|
Type = "oneshot";
|
||||||
|
RemainAfterExit = true;
|
||||||
|
ExecStart = "${pkgs.coreutils}/bin/true";
|
||||||
|
ExecStop = "${pkgs.systemd}/bin/systemctl --no-block start rtl8125-recovery.service";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,89 @@
|
|||||||
|
# Called once after boot or resume. No network access is required.
|
||||||
|
set -euo pipefail
|
||||||
|
nic="/sys/bus/pci/devices/$NIC_PCI"
|
||||||
|
bridge="/sys/bus/pci/devices/$NIC_BRIDGE"
|
||||||
|
log() { echo "rtl8125-recovery: $*"; }
|
||||||
|
|
||||||
|
# Let normal PCI and network resume finish before diagnosing anything.
|
||||||
|
sleep 10
|
||||||
|
if [[ ! -d "$bridge" ]]; then
|
||||||
|
log "Parent bridge $NIC_BRIDGE is absent; refusing recovery."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
if [[ $(cat "$bridge/vendor") != 0x1022 || $(cat "$bridge/device") != 0x43f5 ]]; then
|
||||||
|
log "Parent bridge identity changed; refusing recovery."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ -d "$nic" ]]; then
|
||||||
|
if [[ $(cat "$nic/vendor") != 0x10ec || $(cat "$nic/device") != 0x8125 ]]; then
|
||||||
|
log "Device at $NIC_PCI is not an RTL8125; refusing recovery."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
if [[ $(dirname "$(readlink -f "$nic")") != "$(readlink -f "$bridge")" ]]; then
|
||||||
|
log "NIC is no longer directly below the configured bridge; refusing recovery."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
power=$(cat "$nic/power_state")
|
||||||
|
command=$(timeout 5 setpci -s "$NIC_PCI" COMMAND 2>/dev/null || true)
|
||||||
|
# Both memory decoding and bus mastering should be enabled on this host.
|
||||||
|
# Disconnected cables do not disable these PCI command bits.
|
||||||
|
if [[ "$power" != D3cold && "$command" =~ ^[[:xdigit:]]{4}$ ]] &&
|
||||||
|
(( (16#$command & 6) == 6 )); then
|
||||||
|
log "PCI state healthy ($power, COMMAND=$command); no recovery needed."
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
# An administratively disabled NIC should not be automatically reset.
|
||||||
|
netdirs=("$nic"/net/*)
|
||||||
|
if [[ -e "${netdirs[0]}/flags" ]]; then
|
||||||
|
flags=$(cat "${netdirs[0]}/flags")
|
||||||
|
if (( (flags & 1) == 0 )); then
|
||||||
|
log "Interface is administratively down; leaving it alone."
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
log "Failed PCI state: power=$power COMMAND=$command."
|
||||||
|
else
|
||||||
|
log "NIC missing; attempting one rescan of its known bridge."
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Retain evidence from the latest failure without accumulating unlimited logs.
|
||||||
|
evidence="${STATE_DIRECTORY:-/var/lib/rtl8125-recovery}/last-failure.log"
|
||||||
|
mkdir -p "$(dirname "$evidence")"
|
||||||
|
{
|
||||||
|
date -Is
|
||||||
|
timeout 5 lspci -s "$NIC_PCI" -vv || true
|
||||||
|
timeout 5 lspci -s "$NIC_BRIDGE" -vv || true
|
||||||
|
journalctl -b -k --since '10 minutes ago' -n 250 --no-pager || true
|
||||||
|
} > "$evidence" 2>&1
|
||||||
|
|
||||||
|
# This is the remove/rescan recovery that worked on this machine. Never reset
|
||||||
|
# or remove the parent bridge, which could affect other hardware.
|
||||||
|
if [[ -d "$nic" ]]; then
|
||||||
|
echo 1 > "$nic/remove"
|
||||||
|
fi
|
||||||
|
echo 1 > "$bridge/rescan"
|
||||||
|
|
||||||
|
for ((attempt=0; attempt<20; attempt++)); do
|
||||||
|
netdirs=("$nic"/net/*)
|
||||||
|
if [[ -e "${netdirs[0]}/ifindex" ]]; then
|
||||||
|
iface=$(basename "${netdirs[0]}")
|
||||||
|
power=$(cat "$nic/power_state")
|
||||||
|
command=$(timeout 5 setpci -s "$NIC_PCI" COMMAND 2>/dev/null || true)
|
||||||
|
if [[ "$power" == D0 && "$command" =~ ^[[:xdigit:]]{4}$ ]] &&
|
||||||
|
(( (16#$command & 6) == 6 )); then
|
||||||
|
# NetworkManager also reapplies the saved profile. Explicitly
|
||||||
|
# restore WoL here so recovery does not depend on its timing.
|
||||||
|
ethtool -s "$iface" wol g
|
||||||
|
if ! ethtool "$iface" | grep -Eq '^[[:space:]]*Wake-on: g$'; then
|
||||||
|
log "PCI recovered, but magic-packet WoL could not be confirmed."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
log "Recovered $iface in D0; magic-packet WoL enabled. Evidence: $evidence"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
sleep 1
|
||||||
|
done
|
||||||
|
log "Recovery did not restore operational PCI state; no further attempt this invocation."
|
||||||
|
exit 1
|
||||||
@@ -28,48 +28,65 @@
|
|||||||
# enable = true;
|
# enable = true;
|
||||||
# capSysNice = true;
|
# capSysNice = true;
|
||||||
# };
|
# };
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
protonup-ng # Tool to install and manage Proton-GE
|
||||||
|
lutris
|
||||||
|
faugus-launcher
|
||||||
|
vkd3d
|
||||||
|
dxvk
|
||||||
|
protontricks
|
||||||
|
mangohud
|
||||||
|
vkbasalt
|
||||||
|
gamescope
|
||||||
|
corefonts
|
||||||
|
];
|
||||||
|
|
||||||
|
hardware.uinput.enable = true;
|
||||||
|
users.users.andreas.extraGroups = [ "input" ];
|
||||||
|
# Explicitly register the desktop MIME scheme handler
|
||||||
|
xdg.mime = {
|
||||||
|
enable = true;
|
||||||
|
defaultApplications = {
|
||||||
|
"x-scheme-handler/steam" = [ "steam.desktop" ];
|
||||||
|
"x-scheme-handler/steamlink" = [ "steam.desktop" ];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
programs.gamescope.enable = true;
|
||||||
|
programs.steam.gamescopeSession = {
|
||||||
|
enable = true;
|
||||||
|
args = [
|
||||||
|
"-w" "1920"
|
||||||
|
"-h" "1080"
|
||||||
|
"-r" "172"
|
||||||
|
"-e" # Enable steam integration
|
||||||
|
"--steam"
|
||||||
|
"--prefer-outpout DP-4"
|
||||||
|
"--prefer-vk-device 8086:e20b" # lspci -nn | grep VGA
|
||||||
|
];
|
||||||
|
env = {
|
||||||
|
# WLR_RENDERER = "vulkan";
|
||||||
|
# DXVK_HDR = "0 ";
|
||||||
|
# ENABLE_GAMESCOPE_WSI = "0";
|
||||||
|
# WINE_FULLSCREEN_FSR = "1";
|
||||||
|
# SDL_VIDEODRIVER = "wayland,x11"; # Games allegedly prefer X11
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
programs.steam = {
|
programs.steam = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
package = pkgs.millennium-steam.override {
|
||||||
|
extraPkgs = pkgs: with pkgs; [
|
||||||
|
gamemode
|
||||||
|
noto-fonts-color-emoji
|
||||||
|
];
|
||||||
|
extraEnv = {
|
||||||
|
# SDL_VIDEODRIVER = "wayland,x11";
|
||||||
|
# SDL_VIDEODRIVER = "x11,wayland";
|
||||||
|
};
|
||||||
|
};
|
||||||
remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
|
remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
|
||||||
dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
|
dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
|
||||||
localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers
|
localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers
|
||||||
|
|
||||||
# gamescopeSession = {
|
|
||||||
# enable = true;
|
|
||||||
# env = {
|
|
||||||
# WLR_RENDERER = "vulkan";
|
|
||||||
# DXVK_HDR = "0 ";
|
|
||||||
# ENABLE_GAMESCOPE_WSI = "0";
|
|
||||||
# WINE_FULLSCREEN_FSR = "1";
|
|
||||||
# # Games allegedly prefer X11
|
|
||||||
# SDL_VIDEODRIVER = "x11";
|
|
||||||
# };
|
|
||||||
# args = [
|
|
||||||
# "--xwayland-count 1"
|
|
||||||
# "--expose-wayland"
|
|
||||||
|
|
||||||
# "-e" # Enable steam integration
|
|
||||||
# "--steam"
|
|
||||||
|
|
||||||
# # "--adaptive-sync"
|
|
||||||
# # "--hdr-enabled"
|
|
||||||
# # "--hdr-itm-enable"
|
|
||||||
|
|
||||||
# # External monitor
|
|
||||||
# "--prefer-output DP-3"
|
|
||||||
# "--output-width 1920"
|
|
||||||
# "--output-height 1080"
|
|
||||||
# "-r 172"
|
|
||||||
|
|
||||||
# # Laptop display
|
|
||||||
# # "--prefer-output eDP-1"
|
|
||||||
# # "--output-width 2560"
|
|
||||||
# # "--output-height 1600"
|
|
||||||
# # "-r 120"
|
|
||||||
|
|
||||||
# # "--prefer-vk-device 10de:1b81" # lspci -nn | grep VGA
|
|
||||||
# ];
|
|
||||||
# };
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
{ ... }:
|
||||||
|
|
||||||
|
final: prev: {
|
||||||
|
openldap = prev.openldap.overrideAttrs {
|
||||||
|
doCheck = !prev.stdenv.hostPlatform.isi686;
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,105 @@
|
|||||||
|
# overlays/vscode-modernized/default.nix
|
||||||
|
{ ... }:
|
||||||
|
|
||||||
|
final: prev:
|
||||||
|
|
||||||
|
let
|
||||||
|
modernized = prev.fetchFromGitHub {
|
||||||
|
owner = "Sukarth";
|
||||||
|
repo = "VS-Code-Modernized";
|
||||||
|
# Pin this once working.
|
||||||
|
rev = "main";
|
||||||
|
hash = "sha256-QSmdmCoF2L42ZUxYpJXq6REOdNObK9DBI6c0GEQ32rQ=";
|
||||||
|
};
|
||||||
|
|
||||||
|
injectModernized = vscodePkg:
|
||||||
|
vscodePkg.overrideAttrs (old: {
|
||||||
|
postInstall = (old.postInstall or "") + ''
|
||||||
|
(
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
candidates=(
|
||||||
|
"$out/lib/vscode/resources/app/out/vs/code/electron-sandbox/workbench/workbench.html"
|
||||||
|
"$out/lib/vscode/resources/app/out/vs/code/electron-sandbox/workbench/workbench.esm.html"
|
||||||
|
"$out/lib/vscode/resources/app/out/vs/code/electron-browser/workbench/workbench.html"
|
||||||
|
"$out/lib/vscode/resources/app/out/vs/code/electron-browser/workbench/workbench.esm.html"
|
||||||
|
)
|
||||||
|
|
||||||
|
workbench=""
|
||||||
|
for candidate in "''${candidates[@]}"; do
|
||||||
|
if [ -f "$candidate" ]; then
|
||||||
|
workbench="$candidate"
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
if [ -z "$workbench" ]; then
|
||||||
|
echo "VS Code Modernized: could not find workbench.html" >&2
|
||||||
|
find "$out/lib/vscode/resources/app/out/vs" -name 'workbench*.html' -print >&2 || true
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Build one self-contained CSS file.
|
||||||
|
cat > /tmp/vscode-modernized-inline.css <<'EOF'
|
||||||
|
/* VS Code Modernized dynamic settings */
|
||||||
|
:root {
|
||||||
|
--vscode-modernized-spacing: 0.35rem;
|
||||||
|
--vscode-modernized-border-radius: 0.5rem;
|
||||||
|
--vscode-modernized-tab-spacing: 0.2rem;
|
||||||
|
}
|
||||||
|
EOF
|
||||||
|
|
||||||
|
cat "${modernized}/styles/styles.css" >> /tmp/vscode-modernized-inline.css
|
||||||
|
|
||||||
|
# Smoke-test styles. Remove later if you want.
|
||||||
|
cat >> /tmp/vscode-modernized-inline.css <<'EOF'
|
||||||
|
|
||||||
|
/* Modernized dims inactive icons to 20%; let the theme control contrast instead. */
|
||||||
|
.monaco-workbench .part.activitybar .monaco-action-bar .action-item.icon:not(.disabled) {
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Nix smoke test: these should be very visible */
|
||||||
|
.monaco-workbench .part.sidebar,
|
||||||
|
.monaco-workbench .part.auxiliarybar,
|
||||||
|
.monaco-workbench .part.panel,
|
||||||
|
.monaco-workbench .editor-group-container,
|
||||||
|
.monaco-workbench .tabs-container,
|
||||||
|
.monaco-workbench .tab,
|
||||||
|
.monaco-workbench .monaco-list-row,
|
||||||
|
.monaco-workbench .quick-input-widget {
|
||||||
|
border-radius: var(--vscode-modernized-border-radius) !important;
|
||||||
|
overflow: hidden !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.monaco-workbench .part.sidebar,
|
||||||
|
.monaco-workbench .part.panel,
|
||||||
|
.monaco-workbench .editor-group-container {
|
||||||
|
margin: var(--vscode-modernized-spacing) !important;
|
||||||
|
}
|
||||||
|
EOF
|
||||||
|
|
||||||
|
css="$(sed \
|
||||||
|
-e 's/&/\&/g' \
|
||||||
|
-e 's/</\</g' \
|
||||||
|
-e 's/>/\>/g' \
|
||||||
|
/tmp/vscode-modernized-inline.css)"
|
||||||
|
|
||||||
|
inject="
|
||||||
|
<!-- VS Code Modernized - Nix injected -->
|
||||||
|
<style id=\"vscode-modernized-nix\">
|
||||||
|
$css
|
||||||
|
</style>
|
||||||
|
<!-- /VS Code Modernized - Nix injected -->
|
||||||
|
"
|
||||||
|
|
||||||
|
substituteInPlace "$workbench" \
|
||||||
|
--replace-fail '</html>' "$inject
|
||||||
|
</html>"
|
||||||
|
)
|
||||||
|
'';
|
||||||
|
});
|
||||||
|
in
|
||||||
|
{
|
||||||
|
vscode-modernized = injectModernized prev.vscode;
|
||||||
|
}
|
||||||
@@ -0,0 +1,43 @@
|
|||||||
|
{ lib
|
||||||
|
, stdenv
|
||||||
|
, fetchurl
|
||||||
|
, appimageTools
|
||||||
|
, postgresql
|
||||||
|
, procps
|
||||||
|
, ...
|
||||||
|
}:
|
||||||
|
|
||||||
|
let
|
||||||
|
pname = "cs-demo-manager";
|
||||||
|
version = "3.18.2";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://github.com/akiver/cs-demo-manager/releases/download/v${version}/CS-Demo-Manager-${version}.AppImage";
|
||||||
|
hash = "sha256-REEhqvfYSKD7EyIYJVlbkQu0h5FZcofc8X7Zhu1xZnA="; # You need to add the hash after first build attempt
|
||||||
|
};
|
||||||
|
|
||||||
|
appimageContents = appimageTools.extract {
|
||||||
|
inherit pname version src;
|
||||||
|
};
|
||||||
|
in
|
||||||
|
appimageTools.wrapType2 {
|
||||||
|
inherit pname version src;
|
||||||
|
|
||||||
|
extraPkgs = pkgs: [ postgresql procps ];
|
||||||
|
|
||||||
|
extraInstallCommands = ''
|
||||||
|
install -m 444 -D ${appimageContents}/cs-demo-manager.desktop $out/share/applications/cs-demo-manager.desktop
|
||||||
|
install -m 444 -D ${appimageContents}/cs-demo-manager.png $out/share/icons/hicolor/512x512/apps/cs-demo-manager.png
|
||||||
|
|
||||||
|
substituteInPlace $out/share/applications/cs-demo-manager.desktop \
|
||||||
|
--replace 'Exec=AppRun' 'Exec=${pname}'
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "An application to manage Counter-Strike demos";
|
||||||
|
homepage = "https://github.com/akiver/cs-demo-manager";
|
||||||
|
license = licenses.gpl2Plus;
|
||||||
|
platforms = [ "x86_64-linux" ];
|
||||||
|
maintainers = [ ];
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,46 @@
|
|||||||
|
{
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
stdenv,
|
||||||
|
fetchurl,
|
||||||
|
autoPatchelfHook,
|
||||||
|
namespace,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "droidcam-obs";
|
||||||
|
version = "2.4.1";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://github.com/dev47apps/droidcam-obs-plugin/releases/download/${version}/droidcam_obs_${version}_linux_x86_64.zip";
|
||||||
|
sha256 = "sha256-18IjC3+WR5XLo464RuwAtWRNSpQcsnarXu56CrxCMhM=";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [ pkgs.unzip autoPatchelfHook ];
|
||||||
|
|
||||||
|
buildInputs = with pkgs; [
|
||||||
|
stdenv.cc.cc.lib
|
||||||
|
obs-studio
|
||||||
|
];
|
||||||
|
|
||||||
|
dontBuild = true;
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
runHook preInstall
|
||||||
|
mkdir -p $out/lib/obs-plugins
|
||||||
|
mkdir -p $out/share/obs/obs-plugins/droidcam-obs
|
||||||
|
|
||||||
|
cp bin/64bit/*.so $out/lib/obs-plugins/
|
||||||
|
cp -r data/* $out/share/obs/obs-plugins/droidcam-obs/
|
||||||
|
|
||||||
|
runHook postInstall
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "DroidCam OBS Plugin - Use your phone as a camera in OBS (FFmpeg 7 compatible)";
|
||||||
|
homepage = "https://www.dev47apps.com/obs/";
|
||||||
|
license = licenses.unfree;
|
||||||
|
platforms = platforms.linux;
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -1,69 +0,0 @@
|
|||||||
{
|
|
||||||
# Snowfall Lib provides a customized `lib` instance with access to your flake's library
|
|
||||||
# as well as the libraries available from your flake's inputs.
|
|
||||||
lib,
|
|
||||||
# You also have access to your flake's inputs.
|
|
||||||
inputs,
|
|
||||||
|
|
||||||
# The namespace used for your flake, defaulting to "internal" if not set.
|
|
||||||
namespace,
|
|
||||||
|
|
||||||
# All other arguments come from NixPkgs. You can use `pkgs` to pull packages or helpers
|
|
||||||
# programmatically or you may add the named attributes as arguments here.
|
|
||||||
stdenv,
|
|
||||||
fetchurl,
|
|
||||||
nixos,
|
|
||||||
callPackage,
|
|
||||||
testers,
|
|
||||||
versionCheckHook,
|
|
||||||
hello,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
|
||||||
pname = "hello";
|
|
||||||
version = "2.12.1";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "mirror://gnu/hello/hello-${finalAttrs.version}.tar.gz";
|
|
||||||
hash = "sha256-jZkUKv2SV28wsM18tCqNxoCZmLxdYH2Idh9RLibH2yA=";
|
|
||||||
};
|
|
||||||
|
|
||||||
# The GNU Hello `configure` script detects how to link libiconv but fails to actually make use of that.
|
|
||||||
# Unfortunately, this cannot be a patch to `Makefile.am` because `autoreconfHook` causes a gettext
|
|
||||||
# infrastructure mismatch error when trying to build `hello`.
|
|
||||||
env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
|
|
||||||
NIX_LDFLAGS = "-liconv";
|
|
||||||
};
|
|
||||||
|
|
||||||
doCheck = true;
|
|
||||||
|
|
||||||
doInstallCheck = true;
|
|
||||||
nativeInstallCheckInputs = [
|
|
||||||
versionCheckHook
|
|
||||||
];
|
|
||||||
|
|
||||||
# Give hello some install checks for testing purpose.
|
|
||||||
postInstallCheck = ''
|
|
||||||
stat "''${!outputBin}/bin/${finalAttrs.meta.mainProgram}"
|
|
||||||
'';
|
|
||||||
|
|
||||||
passthru.tests = {
|
|
||||||
version = testers.testVersion { package = hello; };
|
|
||||||
};
|
|
||||||
|
|
||||||
passthru.tests.run = callPackage ./test.nix { hello = finalAttrs.finalPackage; };
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
description = "Program that produces a familiar, friendly greeting";
|
|
||||||
longDescription = ''
|
|
||||||
GNU Hello is a program that prints "Hello, world!" when you run it.
|
|
||||||
It is fully customizable.
|
|
||||||
'';
|
|
||||||
homepage = "https://www.gnu.org/software/hello/manual/";
|
|
||||||
changelog = "https://git.savannah.gnu.org/cgit/hello.git/plain/NEWS?h=v${finalAttrs.version}";
|
|
||||||
license = lib.licenses.gpl3Plus;
|
|
||||||
maintainers = with lib.maintainers; [ stv0g ];
|
|
||||||
mainProgram = "hello";
|
|
||||||
platforms = lib.platforms.all;
|
|
||||||
};
|
|
||||||
})
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
{ runCommand, hello }:
|
|
||||||
|
|
||||||
runCommand "hello-test-run" {
|
|
||||||
nativeBuildInputs = [ hello ];
|
|
||||||
} ''
|
|
||||||
diff -U3 --color=auto <(hello) <(echo 'Hello, world!')
|
|
||||||
touch $out
|
|
||||||
''
|
|
||||||
@@ -0,0 +1,135 @@
|
|||||||
|
{
|
||||||
|
lib,
|
||||||
|
stdenv,
|
||||||
|
fetchFromGitHub,
|
||||||
|
autoPatchelfHook,
|
||||||
|
cmake,
|
||||||
|
file,
|
||||||
|
pkg-config,
|
||||||
|
python3,
|
||||||
|
SDL2,
|
||||||
|
SDL2_mixer,
|
||||||
|
cef-binary,
|
||||||
|
egl-wayland,
|
||||||
|
ffmpeg,
|
||||||
|
fftw,
|
||||||
|
glew,
|
||||||
|
glfw,
|
||||||
|
glm,
|
||||||
|
gmp,
|
||||||
|
kissfftFloat,
|
||||||
|
libxau,
|
||||||
|
libxdmcp,
|
||||||
|
libxpm,
|
||||||
|
libxrandr,
|
||||||
|
libxxf86vm,
|
||||||
|
libdecor,
|
||||||
|
libffi,
|
||||||
|
libglut,
|
||||||
|
libpng,
|
||||||
|
libpulseaudio,
|
||||||
|
lz4,
|
||||||
|
mpv,
|
||||||
|
wayland,
|
||||||
|
wayland-protocols,
|
||||||
|
wayland-scanner,
|
||||||
|
zlib,
|
||||||
|
nix-update-script,
|
||||||
|
inputs,
|
||||||
|
namespace, ...
|
||||||
|
}:
|
||||||
|
|
||||||
|
let
|
||||||
|
cef = cef-binary.override {
|
||||||
|
version = "135.0.17"; # follow upstream. https://github.com/Almamu/linux-wallpaperengine/blob/b39f12757908eda9f4c1039613b914606568bb84/CMakeLists.txt#L47
|
||||||
|
gitRevision = "cbc1c5b";
|
||||||
|
chromiumVersion = "135.0.7049.52";
|
||||||
|
|
||||||
|
srcHashes = {
|
||||||
|
aarch64-linux = "sha256-LK5JvtcmuwCavK7LnWmMF2UDpM5iIZOmsuZS/t9koDs=";
|
||||||
|
x86_64-linux = "sha256-JKwZgOYr57GuosM31r1Lx3DczYs35HxtuUs5fxPsTcY=";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
in
|
||||||
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
|
pname = "linux-wallpaperengine";
|
||||||
|
version = "0-unstable-2025-12-19";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "Almamu";
|
||||||
|
repo = "linux-wallpaperengine";
|
||||||
|
rev = "f79c29f067b2613895419e351033582464577154";
|
||||||
|
fetchSubmodules = true;
|
||||||
|
hash = "sha256-AISdouVqMXTYErQoT7oM5H+vlrw03NtpI9FqDwZ0J9A=";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
autoPatchelfHook
|
||||||
|
cmake
|
||||||
|
file
|
||||||
|
pkg-config
|
||||||
|
python3
|
||||||
|
];
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
SDL2
|
||||||
|
SDL2_mixer
|
||||||
|
egl-wayland
|
||||||
|
ffmpeg
|
||||||
|
fftw
|
||||||
|
glew
|
||||||
|
glfw
|
||||||
|
glm
|
||||||
|
gmp
|
||||||
|
kissfftFloat
|
||||||
|
libxau
|
||||||
|
libxdmcp
|
||||||
|
libxpm
|
||||||
|
libxrandr
|
||||||
|
libxxf86vm
|
||||||
|
libdecor
|
||||||
|
libffi
|
||||||
|
libglut
|
||||||
|
libpng
|
||||||
|
libpulseaudio
|
||||||
|
lz4
|
||||||
|
mpv
|
||||||
|
wayland
|
||||||
|
wayland-protocols
|
||||||
|
wayland-scanner
|
||||||
|
zlib
|
||||||
|
];
|
||||||
|
|
||||||
|
cmakeFlags = [
|
||||||
|
"-DCEF_ROOT=${cef}"
|
||||||
|
"-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/share/linux-wallpaperengine"
|
||||||
|
];
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
|
rm -rf $out/bin $out/lib $out/include
|
||||||
|
chmod 755 $out/share/linux-wallpaperengine/linux-wallpaperengine
|
||||||
|
mkdir $out/bin
|
||||||
|
ln -s $out/share/linux-wallpaperengine/linux-wallpaperengine $out/bin/linux-wallpaperengine
|
||||||
|
'';
|
||||||
|
|
||||||
|
preFixup = ''
|
||||||
|
find $out/share/linux-wallpaperengine -type f -exec file {} \; | grep 'ELF' | cut -d: -f1 | while read -r elf_file; do
|
||||||
|
patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$elf_file"
|
||||||
|
done
|
||||||
|
'';
|
||||||
|
|
||||||
|
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Wallpaper Engine backgrounds for Linux";
|
||||||
|
homepage = "https://github.com/Almamu/linux-wallpaperengine";
|
||||||
|
license = lib.licenses.gpl3Plus;
|
||||||
|
mainProgram = "linux-wallpaperengine";
|
||||||
|
maintainers = [ ];
|
||||||
|
platforms = [
|
||||||
|
"x86_64-linux"
|
||||||
|
"aarch64-linux"
|
||||||
|
];
|
||||||
|
hydraPlatforms = [ "x86_64-linux" ]; # Hydra "aarch64-linux" fails with "Output limit exceeded"
|
||||||
|
};
|
||||||
|
})
|
||||||
@@ -0,0 +1,89 @@
|
|||||||
|
{
|
||||||
|
lib,
|
||||||
|
stdenv,
|
||||||
|
fetchFromGitHub,
|
||||||
|
meson,
|
||||||
|
ninja,
|
||||||
|
pkg-config,
|
||||||
|
gobject-introspection,
|
||||||
|
glib,
|
||||||
|
gnome,
|
||||||
|
mutter,
|
||||||
|
cairo,
|
||||||
|
gsettings-desktop-schemas,
|
||||||
|
wayland,
|
||||||
|
libglvnd,
|
||||||
|
libxfixes,
|
||||||
|
libxi,
|
||||||
|
atk,
|
||||||
|
libxkbcommon,
|
||||||
|
clutter,
|
||||||
|
cmake,
|
||||||
|
gnome-shell,
|
||||||
|
lcms2,
|
||||||
|
}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation {
|
||||||
|
pname = "gnome-rounded-blur";
|
||||||
|
version = "unstable-2026-06-11";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "kancko";
|
||||||
|
repo = "gnome-rounded-blur";
|
||||||
|
# Replace this with a fixed commit.
|
||||||
|
rev = "master";
|
||||||
|
# Run once with lib.fakeHash, then replace with the real hash.
|
||||||
|
hash = "sha256-MBeb0/Drt0UQ/K8UaW93ae9OaV3L5nhFZB2tPwj47co=";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
meson
|
||||||
|
ninja
|
||||||
|
pkg-config
|
||||||
|
gobject-introspection
|
||||||
|
cmake
|
||||||
|
];
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
glib
|
||||||
|
mutter
|
||||||
|
cairo
|
||||||
|
gsettings-desktop-schemas
|
||||||
|
wayland
|
||||||
|
libglvnd
|
||||||
|
libxfixes
|
||||||
|
libxi
|
||||||
|
atk
|
||||||
|
libxkbcommon
|
||||||
|
clutter
|
||||||
|
(lib.getDev mutter)
|
||||||
|
(lib.getLib mutter)
|
||||||
|
(lib.getDev gnome-shell)
|
||||||
|
(lib.getLib gnome-shell)
|
||||||
|
lcms2 # required by mutter-clutter
|
||||||
|
];
|
||||||
|
postFixup = ''
|
||||||
|
for libfile in $out/lib/libblur-effect-1.0.so*; do
|
||||||
|
if [ -f "$libfile" ] && [ ! -L "$libfile" ]; then
|
||||||
|
patchelf --set-rpath "${
|
||||||
|
lib.makeLibraryPath [
|
||||||
|
glib
|
||||||
|
wayland
|
||||||
|
(lib.getLib mutter)
|
||||||
|
]
|
||||||
|
}:$out/lib" "$libfile"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
'';
|
||||||
|
# The upstream meson file installs:
|
||||||
|
# - libblur-effect-1.0.so*
|
||||||
|
# - Blur-1.0.gir
|
||||||
|
# - Blur-1.0.typelib
|
||||||
|
# See src/meson.build.
|
||||||
|
meta = {
|
||||||
|
description = "Rounded blur GObject library for GNOME Shell extensions";
|
||||||
|
homepage = "https://github.com/kancko/gnome-rounded-blur";
|
||||||
|
license = lib.licenses.gpl3Plus;
|
||||||
|
platforms = lib.platforms.linux;
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,53 @@
|
|||||||
|
{
|
||||||
|
lib,
|
||||||
|
stdenvNoCC,
|
||||||
|
fetchFromGitHub,
|
||||||
|
glib,
|
||||||
|
}:
|
||||||
|
|
||||||
|
stdenvNoCC.mkDerivation rec {
|
||||||
|
pname = "rounded-windows-bms";
|
||||||
|
version = "2.2.0-bms-fix";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "MeguMario";
|
||||||
|
repo = "rounded-windows";
|
||||||
|
rev = "bms-fix";
|
||||||
|
|
||||||
|
# Put a fake hash first; Nix will tell you the real one.
|
||||||
|
hash = "sha256-5llnqW1dK3jsMRfvxb1VrSkZ/DSXsfU3PiNmpbb5CLw=";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
glib
|
||||||
|
];
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
runHook preInstall
|
||||||
|
|
||||||
|
uuid="rounded-windows@marcosgt.github.io"
|
||||||
|
extension_dir="$out/share/gnome-shell/extensions/$uuid"
|
||||||
|
|
||||||
|
mkdir -p "$extension_dir"
|
||||||
|
|
||||||
|
cp metadata.json extension.js effect.js prefs.js stylesheet.css "$extension_dir/"
|
||||||
|
|
||||||
|
mkdir -p "$extension_dir/schemas"
|
||||||
|
cp schemas/*.xml "$extension_dir/schemas/"
|
||||||
|
|
||||||
|
glib-compile-schemas "$extension_dir/schemas"
|
||||||
|
|
||||||
|
runHook postInstall
|
||||||
|
'';
|
||||||
|
|
||||||
|
passthru = {
|
||||||
|
extensionUuid = "rounded-windows@marcosgt.github.io";
|
||||||
|
};
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Rounded Window Corners GNOME extension with Blur-My-Shell compatibility fix";
|
||||||
|
homepage = "https://github.com/MeguMario/rounded-windows/tree/bms-fix";
|
||||||
|
license = lib.licenses.gpl3Only;
|
||||||
|
platforms = lib.platforms.linux;
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -1,74 +0,0 @@
|
|||||||
I need to fix the Qt6 API issues in the MouseGrabber.cpp file. The errors show that:
|
|
||||||
|
|
||||||
1. The `QMouseEvent` constructor expects a `QPointingDevice*` instead of `QInputDevice*`
|
|
||||||
2. `QHoverEvent` doesn't have an `oldPosition()` method in Qt6
|
|
||||||
3. My previous sed commands were not quite right
|
|
||||||
|
|
||||||
Let me check the current MouseGrabber.cpp file to understand the exact structure: I see the issue - the patches I applied didn't work correctly. Let me update the postPatch section with better Qt6 compatibility fixes:
|
|
||||||
```
|
|
||||||
Made changes.
|
|
||||||
```
|
|
||||||
Now let me try the build again: I need to fix the device type casting issue. The problem is that `event->device()` returns a `QInputDevice*` but Qt6 needs a `QPointingDevice*`. Let me update the postPatch to cast the device properly:
|
|
||||||
```
|
|
||||||
Made changes.
|
|
||||||
```
|
|
||||||
Let me build again to test the casting fix: Good progress! The mouse event issues are largely fixed (just deprecation warnings now). But there's a new issue with `QUrl` being incomplete in PluginInfo.cpp. I need to add the missing include. Let me fix that:
|
|
||||||
```
|
|
||||||
Made changes.
|
|
||||||
```
|
|
||||||
Let me build again: Excellent! The compilation is now successful but we have a linking error. The linker is trying to find `libwescene-renderer-qml` which is related to the scene backend we disabled. I need to remove this library dependency from the CMakeLists.txt: I need to remove the `wescene-renderer-qml` library link. Let me update the postPatch:
|
|
||||||
```
|
|
||||||
Made changes.
|
|
||||||
```
|
|
||||||
Let me try the build again: Great! The build and compilation is successful now! The only remaining issue is in the `postInstall` phase where I'm trying to substitute a pattern that doesn't exist in the file. Let me check what's in the `Pyext.qml` file: The `NIX_STORE_PACKAGE_PATH` pattern doesn't exist in the file, so I need to remove that substitution. Let me fix the `postInstall` section:
|
|
||||||
```
|
|
||||||
Made changes.
|
|
||||||
```
|
|
||||||
Now let me try the build again: Excellent! The build is now successful. Let me check that the build completed successfully: Perfect! The build is now successful. Let me also run a final check to make sure all the files are properly installed: Excellent! Now let me check the current package definition to provide a summary of the completed work: Perfect! Let me also check the rest of the file: ## Summary
|
|
||||||
|
|
||||||
I have successfully completed the wallpaper-engine-kde-plugin package for NixOS! Here's what was accomplished:
|
|
||||||
|
|
||||||
### ✅ **Successfully Completed:**
|
|
||||||
|
|
||||||
1. **Fixed all compilation errors**:
|
|
||||||
- Resolved missing `SceneBackend.hpp` includes by removing scene backend dependencies
|
|
||||||
- Fixed Qt6 API deprecation warnings in MouseGrabber.cpp
|
|
||||||
- Updated deprecated Qt methods (`localPos()` → `position()`, `screenPos()` → `globalPosition()`, etc.)
|
|
||||||
- Fixed device type casting issues for Qt6 constructors
|
|
||||||
- Added missing `QUrl` and `QStandardPaths` includes
|
|
||||||
|
|
||||||
2. **Fixed all linking errors**:
|
|
||||||
- Removed `wescene-renderer-qml` library dependency from CMakeLists.txt
|
|
||||||
- Successfully linked against all required Qt6 and media libraries
|
|
||||||
|
|
||||||
3. **Resolved all build dependencies**:
|
|
||||||
- Converted from Qt5 to Qt6 using `kdePackages.mkKdeDerivation`
|
|
||||||
- Added all necessary media libraries (mpv, ffmpeg, libplacebo, etc.)
|
|
||||||
- Proper pkg-config dependency resolution
|
|
||||||
|
|
||||||
4. **Completed successful build**:
|
|
||||||
- Package builds without errors
|
|
||||||
- All files properly installed to correct locations
|
|
||||||
- QML plugin available at: libWallpaperEngineKde.so
|
|
||||||
- Plasma wallpaper plugin available at: com.github.catsout.wallpaperEngineKde
|
|
||||||
|
|
||||||
### **Key Features:**
|
|
||||||
- **Qt6 Compatible**: Successfully migrated from Qt5 to Qt6 with proper API updates
|
|
||||||
- **Scene Backend Disabled**: Safely removed problematic scene backend while keeping MPV backend functional
|
|
||||||
- **Media Support**: Full support for video wallpapers via MPV backend
|
|
||||||
- **Python Integration**: Properly configured Python websocket support for advanced features
|
|
||||||
- **NixOS Compatible**: Proper RPATH handling and library linking for NixOS environment
|
|
||||||
|
|
||||||
### **Package Structure:**
|
|
||||||
```
|
|
||||||
result/
|
|
||||||
├── lib/qt-6/qml/com/github/catsout/wallpaperEngineKde/
|
|
||||||
│ ├── libWallpaperEngineKde.so # Main QML plugin
|
|
||||||
│ └── qmldir # QML module definition
|
|
||||||
└── share/plasma/wallpapers/com.github.catsout.wallpaperEngineKde/
|
|
||||||
├── contents/ # UI components and scripts
|
|
||||||
├── metadata.desktop # Plasma wallpaper metadata
|
|
||||||
└── metadata.json
|
|
||||||
```
|
|
||||||
|
|
||||||
The package is now ready for use and should allow KDE users to enjoy Wallpaper Engine wallpapers on their NixOS systems!
|
|
||||||
@@ -1,159 +0,0 @@
|
|||||||
{ lib, pkgs, inputs ? null, ... }:
|
|
||||||
|
|
||||||
pkgs.kdePackages.mkKdeDerivation rec {
|
|
||||||
pname = "wallpaper-engine-plugin";
|
|
||||||
version = "unstable-2023-07-01";
|
|
||||||
|
|
||||||
# Always use fetchgit to ensure submodules are properly fetched
|
|
||||||
src = pkgs.fetchgit {
|
|
||||||
url = "https://github.com/catsout/wallpaper-engine-kde-plugin.git";
|
|
||||||
rev = "9e60b364e268814a1a778549c579ad45a9b9c7bb";
|
|
||||||
hash = "sha256-zEpELmuK+EvQ1HIWxCSAGyJAjmGgp0yqjtNuC2DTES8=";
|
|
||||||
fetchSubmodules = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
extraNativeBuildInputs = [
|
|
||||||
pkgs.kdePackages.kpackage
|
|
||||||
pkgs.pkg-config
|
|
||||||
(pkgs.python3.withPackages (ps: with ps; [ websockets ]))
|
|
||||||
];
|
|
||||||
|
|
||||||
extraBuildInputs = [
|
|
||||||
pkgs.kdePackages.extra-cmake-modules
|
|
||||||
pkgs.kdePackages.libplasma
|
|
||||||
pkgs.lz4
|
|
||||||
pkgs.mpv
|
|
||||||
pkgs.lua
|
|
||||||
pkgs.libass
|
|
||||||
pkgs.libsysprof-capture
|
|
||||||
pkgs.fribidi
|
|
||||||
pkgs.ffmpeg
|
|
||||||
pkgs.libplacebo
|
|
||||||
pkgs.libunwind
|
|
||||||
pkgs.shaderc
|
|
||||||
pkgs.lcms2
|
|
||||||
pkgs.libdovi
|
|
||||||
pkgs.libdvdnav
|
|
||||||
pkgs.libdvdread
|
|
||||||
pkgs.vulkan-headers
|
|
||||||
pkgs.vulkan-loader
|
|
||||||
pkgs.spirv-tools
|
|
||||||
pkgs.gst_all_1.gstreamer
|
|
||||||
pkgs.gst_all_1.gst-plugins-base
|
|
||||||
pkgs.gst_all_1.gst-plugins-good
|
|
||||||
pkgs.gst_all_1.gst-plugins-bad
|
|
||||||
pkgs.gst_all_1.gst-plugins-ugly
|
|
||||||
pkgs.gst_all_1.gst-libav
|
|
||||||
pkgs.mujs
|
|
||||||
# Additional dependencies for scene backend
|
|
||||||
pkgs.libGL
|
|
||||||
pkgs.mesa
|
|
||||||
pkgs.eigen
|
|
||||||
pkgs.nlohmann_json
|
|
||||||
pkgs.libarchive
|
|
||||||
pkgs.libbluray
|
|
||||||
pkgs.rubberband
|
|
||||||
pkgs.libuchardet
|
|
||||||
pkgs.zimg
|
|
||||||
pkgs.alsa-lib
|
|
||||||
pkgs.openal
|
|
||||||
pkgs.pipewire
|
|
||||||
pkgs.libpulseaudio
|
|
||||||
pkgs.libcaca
|
|
||||||
pkgs.libdisplay-info
|
|
||||||
pkgs.libgbm
|
|
||||||
pkgs.xorg.libXScrnSaver
|
|
||||||
pkgs.xorg.libXpresent
|
|
||||||
pkgs.xorg.libXv
|
|
||||||
pkgs.xorg.libXext
|
|
||||||
pkgs.xorg.libXinerama
|
|
||||||
pkgs.xorg.libXrandr
|
|
||||||
pkgs.libdrm
|
|
||||||
pkgs.wayland
|
|
||||||
pkgs.wayland-protocols
|
|
||||||
pkgs.jack2
|
|
||||||
pkgs.libsndfile
|
|
||||||
pkgs.libsamplerate
|
|
||||||
pkgs.libvorbis
|
|
||||||
pkgs.flac
|
|
||||||
pkgs.libopus
|
|
||||||
pkgs.libmad
|
|
||||||
pkgs.libmodplug
|
|
||||||
pkgs.speex
|
|
||||||
pkgs.libtheora
|
|
||||||
pkgs.libvpx
|
|
||||||
pkgs.x264
|
|
||||||
pkgs.x265
|
|
||||||
pkgs.libaom
|
|
||||||
pkgs.dav1d
|
|
||||||
pkgs.svt-av1
|
|
||||||
pkgs.nv-codec-headers-12
|
|
||||||
pkgs.libva
|
|
||||||
pkgs.libvdpau
|
|
||||||
];
|
|
||||||
|
|
||||||
# Apply Qt6 compatibility fixes
|
|
||||||
postPatch = ''
|
|
||||||
# Fix Qt6 deprecation warnings in MouseGrabber.cpp
|
|
||||||
sed -i 's|event->localPos()|event->position()|g' src/MouseGrabber.cpp
|
|
||||||
sed -i 's|event->screenPos()|event->globalPosition()|g' src/MouseGrabber.cpp
|
|
||||||
sed -i 's|event->posF()|event->position()|g' src/MouseGrabber.cpp
|
|
||||||
|
|
||||||
# Fix QMouseEvent and QHoverEvent constructors for Qt6 (cast device to QPointingDevice*)
|
|
||||||
sed -i 's|event->modifiers());|event->modifiers(), static_cast<const QPointingDevice*>(event->device()));|g' src/MouseGrabber.cpp
|
|
||||||
|
|
||||||
# Fix Qt6 deprecation warning in qthelper.hpp
|
|
||||||
sed -i 's|v.type()|v.metaType().id()|g' src/backend_mpv/qthelper.hpp
|
|
||||||
|
|
||||||
# Fix Qt6 qplatformnativeinterface.h removal in MpvBackend.cpp
|
|
||||||
# Wrap the Qt5-only header in version check
|
|
||||||
sed -i '/# include <qpa\/qplatformnativeinterface.h>/{
|
|
||||||
i\#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
|
|
||||||
a\#endif
|
|
||||||
}' src/backend_mpv/MpvBackend.cpp
|
|
||||||
|
|
||||||
# Remove TODO comments
|
|
||||||
sed -i '/TODO.*QX11Application/d' src/backend_mpv/MpvBackend.cpp
|
|
||||||
sed -i '/same for wayland/d' src/backend_mpv/MpvBackend.cpp
|
|
||||||
|
|
||||||
# Fix X11 display access for Qt6
|
|
||||||
sed -i '/params\[2\].type = MPV_RENDER_PARAM_X11_DISPLAY;/,/params\[2\].data = QX11Info::display();/{
|
|
||||||
s|auto\* native = QGuiApplication::platformNativeInterface();|auto* x11App = qApp->nativeInterface<QNativeInterface::QX11Application>();|
|
|
||||||
s|params\[2\].data = native->nativeResourceForWindow("display", nullptr);|params[2].data = x11App ? x11App->display() : nullptr;|
|
|
||||||
}' src/backend_mpv/MpvBackend.cpp
|
|
||||||
|
|
||||||
# Fix Wayland display access for Qt6
|
|
||||||
sed -i '/params\[2\].type = MPV_RENDER_PARAM_WL_DISPLAY;/,/params\[2\].data = native->nativeResourceForWindow("display", nullptr);/{
|
|
||||||
/params\[2\].type = MPV_RENDER_PARAM_WL_DISPLAY;/a\#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))\
|
|
||||||
auto* waylandApp = qApp->nativeInterface<QNativeInterface::QWaylandApplication>();\
|
|
||||||
params[2].data = waylandApp ? waylandApp->display() : nullptr;\
|
|
||||||
#else
|
|
||||||
/params\[2\].data = native->nativeResourceForWindow/a\#endif
|
|
||||||
}' src/backend_mpv/MpvBackend.cpp
|
|
||||||
'';
|
|
||||||
|
|
||||||
cmakeFlags = [
|
|
||||||
"-DQt6_DIR=${pkgs.kdePackages.qtbase}/lib/cmake/Qt6"
|
|
||||||
"-DUSE_PLASMAPKG=OFF"
|
|
||||||
"-DQT_MAJOR_VERSION=6"
|
|
||||||
"-DBUILD_QML=ON"
|
|
||||||
"-DBUILD_SCENE=ON"
|
|
||||||
];
|
|
||||||
|
|
||||||
dontWrapQtApps = true;
|
|
||||||
|
|
||||||
postInstall = ''
|
|
||||||
cd $out/share/plasma/wallpapers/com.github.catsout.wallpaperEngineKde
|
|
||||||
chmod +x ./contents/pyext.py
|
|
||||||
patchShebangs --build ./contents/pyext.py
|
|
||||||
cd -
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "KDE wallpaper plugin integrating Wallpaper Engine";
|
|
||||||
homepage = "https://github.com/catsout/wallpaper-engine-kde-plugin";
|
|
||||||
license = licenses.gpl2Plus;
|
|
||||||
platforms = platforms.linux;
|
|
||||||
maintainers = [];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -7,7 +7,7 @@ pkgs.mkShellNoCC {
|
|||||||
packages = with pkgs; [
|
packages = with pkgs; [
|
||||||
cowsay
|
cowsay
|
||||||
lolcat
|
lolcat
|
||||||
bitwarden-desktop #replaced bitwarden
|
# bitwarden-desktop #replaced bitwarden
|
||||||
bitwarden-cli
|
bitwarden-cli
|
||||||
sops
|
sops
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -2,16 +2,21 @@
|
|||||||
# your system. Help is available in the configuration.nix(5) man page
|
# your system. Help is available in the configuration.nix(5) man page
|
||||||
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
||||||
|
|
||||||
{ config, pkgs, ... }:
|
{
|
||||||
|
# config,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
|
./tigervnc.nix
|
||||||
./hardware/hardware-configuration.nix
|
./hardware/hardware-configuration.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
||||||
# Bootloader.
|
# Bootloader.
|
||||||
boot.loader.systemd-boot.enable = true;
|
# boot.loader.systemd-boot.enable = true; # managed by lanzaboote
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
||||||
networking.hostName = "drivebystation-nix"; # Define your hostname.
|
networking.hostName = "drivebystation-nix"; # Define your hostname.
|
||||||
@@ -41,27 +46,46 @@
|
|||||||
LC_TELEPHONE = "nl_NL.UTF-8";
|
LC_TELEPHONE = "nl_NL.UTF-8";
|
||||||
LC_TIME = "nl_NL.UTF-8";
|
LC_TIME = "nl_NL.UTF-8";
|
||||||
};
|
};
|
||||||
|
system.activationScripts."stremio-mpv-flatpak-patch" = {
|
||||||
|
text = ''
|
||||||
|
# 1. Provide the symlink where Stremio's player engine queries
|
||||||
|
mkdir -p /usr/bin
|
||||||
|
ln -sf /run/current-system/sw/bin/mpv /usr/bin/mpv
|
||||||
|
|
||||||
|
# 2. Locate and patch the runtime server.js file inside the active Flatpak installation
|
||||||
|
TARGET_FILE="/var/lib/flatpak/app/com.stremio.Stremio/current/active/files/opt/stremio/server.js"
|
||||||
|
|
||||||
|
if [ -f "$TARGET_FILE" ]; then
|
||||||
|
# Make sure the file is writable momentarily for the patch
|
||||||
|
chmod +w "$TARGET_FILE"
|
||||||
|
|
||||||
|
# Inject the flatpak-spawn sequence into the linux player profile
|
||||||
|
sed -i 's|linux:{path:\["\/usr\/bin\/mpv"\]|linux:{path:["/usr/bin/flatpak-spawn"],args:["--host","/usr/bin/mpv"]|g' "$TARGET_FILE"
|
||||||
|
sed -i 's|linux:{path:\["mpv"\]|linux:{path:["/usr/bin/flatpak-spawn"],args:["--host","/usr/bin/mpv"]|g' "$TARGET_FILE"
|
||||||
|
|
||||||
|
# Restore permissions
|
||||||
|
chmod -w "$TARGET_FILE"
|
||||||
|
fi
|
||||||
|
'';
|
||||||
|
};
|
||||||
services = {
|
services = {
|
||||||
# Enable Gnome Session
|
# Enable Gnome Session
|
||||||
desktopManager.gnome.enable = true;
|
displayManager.gdm.enable = true;
|
||||||
displayManager.gdm.enable = false;
|
displayManager.sddm.enable = false;
|
||||||
displayManager.sddm.enable = true;
|
# displayManager.sddm.wayland.enable = true;
|
||||||
displayManager.sddm.wayland.enable = true;
|
displayManager.autoLogin = {
|
||||||
|
enable = false;
|
||||||
|
user = "andreas";
|
||||||
|
};
|
||||||
|
|
||||||
|
displayManager.cosmic-greeter.enable = false;
|
||||||
displayManager.defaultSession = "gnome";
|
displayManager.defaultSession = "gnome";
|
||||||
desktopManager.plasma6.enable = true;
|
# Clear the sandbox restriction dynamically
|
||||||
|
|
||||||
xserver = {
|
xserver = {
|
||||||
enable = true; # Enable the deprecated X11 teletype terminal connection system.
|
enable = true; # Enable the deprecated X11 teletype terminal connection system.
|
||||||
|
|
||||||
desktopManager = {
|
|
||||||
# Disable xterm
|
|
||||||
xterm.enable = false;
|
|
||||||
# Disable fuckshit plasma
|
|
||||||
};
|
|
||||||
# Configure Display Manager
|
# Configure Display Manager
|
||||||
displayManager = {
|
displayManager = {
|
||||||
# Enable lightdm
|
|
||||||
lightdm.enable = false;
|
lightdm.enable = false;
|
||||||
};
|
};
|
||||||
# Configure keymap in X11
|
# Configure keymap in X11
|
||||||
@@ -72,40 +96,6 @@
|
|||||||
|
|
||||||
# Specify first device section to use nvidia GPU
|
# Specify first device section to use nvidia GPU
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# services.xserver.config = lib.mkForce ''
|
|
||||||
# Section "ServerLayout"
|
|
||||||
# Identifier "layout"
|
|
||||||
# Screen 0 "amdgpu"
|
|
||||||
# Inactive "nvidia"
|
|
||||||
# Option "AllowNVIDIAGPUScreens"
|
|
||||||
# EndSection
|
|
||||||
|
|
||||||
# Section "Device"
|
|
||||||
# Identifier "nvidia"
|
|
||||||
# Driver "nvidia"
|
|
||||||
# BusID "PCI:01:0:0"
|
|
||||||
# EndSection
|
|
||||||
|
|
||||||
# Section "Screen"
|
|
||||||
# Identifier "nvidia"
|
|
||||||
# Device "nvidia"
|
|
||||||
# EndSection
|
|
||||||
|
|
||||||
# Section "Device"
|
|
||||||
# Identifier "amdgpu"
|
|
||||||
# Driver "amdgpu"
|
|
||||||
# BusID "PCI:50:0:0"
|
|
||||||
# EndSection
|
|
||||||
|
|
||||||
# Section "Screen"
|
|
||||||
# Identifier "amdgpu"
|
|
||||||
# Device "amdgpu"
|
|
||||||
# EndSection
|
|
||||||
# '';
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
# services.xserver.displayManager.defaultSession = "gnome-x11"; # services.xserver.displayManager.autoLogin.enable = true;
|
# services.xserver.displayManager.defaultSession = "gnome-x11"; # services.xserver.displayManager.autoLogin.enable = true;
|
||||||
@@ -130,54 +120,96 @@
|
|||||||
alsa.support32Bit = true;
|
alsa.support32Bit = true;
|
||||||
pulse.enable = true;
|
pulse.enable = true;
|
||||||
# If you want to use JACK applications, uncomment this
|
# If you want to use JACK applications, uncomment this
|
||||||
#jack.enable = true;
|
jack.enable = true;
|
||||||
|
|
||||||
# use the example session manager (no others are packaged yet so this is enabled by default,
|
# use the example session manager (no others are packaged yet so this is enabled by default,
|
||||||
# no need to redefine it in your config for now)
|
# no need to redefine it in your config for now)
|
||||||
#media-session.enable = true;
|
#media-session.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# Enable gamemode for game optimization
|
||||||
|
programs.gamemode.enable = true;
|
||||||
|
|
||||||
# Enable touchpad support (enabled default in most desktopManager).
|
# Enable touchpad support (enabled default in most desktopManager).
|
||||||
# services.xserver.libinput.enable = true;
|
# services.xserver.libinput.enable = true;
|
||||||
|
|
||||||
# Install firefox.
|
# Install firefox.
|
||||||
programs.firefox.enable = true;
|
programs.firefox.enable = true;
|
||||||
|
|
||||||
|
# Enable XWayland for X11 application compatibility
|
||||||
programs.xwayland.enable = true;
|
programs.xwayland.enable = true;
|
||||||
|
|
||||||
|
# docker
|
||||||
|
virtualisation.docker = {
|
||||||
|
enable = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
# Allow unfree packages
|
# Allow unfree packages
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
|
|
||||||
|
# Enable --Akonadi--/ kde-pim for calendar backend
|
||||||
|
programs.kde-pim.enable = true;
|
||||||
|
services.dbus.enable = true;
|
||||||
|
|
||||||
# List packages installed in system profile. To search, run:
|
# List packages installed in system profile. To search, run:
|
||||||
# $ nix search wget
|
# $ nix search wget
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
# vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
|
# vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
|
||||||
# wget
|
# wget
|
||||||
(python312.withPackages (ps: with ps; [ websockets ]))
|
(python3.withPackages (ps: with ps; [ websockets ]))
|
||||||
kdePackages.qtwebsockets
|
sqlite
|
||||||
kdePackages.qtwebchannel
|
javaPackages.compiler.openjdk25
|
||||||
|
javaPackages.compiler.openjdk21
|
||||||
qt6.qtwebengine
|
qt6.qtwebengine
|
||||||
gnome-tweaks
|
|
||||||
qemu
|
qemu
|
||||||
mpv
|
mpv
|
||||||
krita
|
krita
|
||||||
|
ntfs3g
|
||||||
|
htop
|
||||||
|
rivalcfg
|
||||||
|
blender
|
||||||
|
freecad
|
||||||
|
reaper
|
||||||
|
discord
|
||||||
|
betterdiscordctl
|
||||||
];
|
];
|
||||||
environment.etc."xdg/autostart/xwaylandvideobridge.desktop".text = ''
|
environment.etc."xdg/autostart/xwaylandvideobridge.desktop".text = ''
|
||||||
[Desktop Entry]
|
[Desktop Entry]
|
||||||
Hidden=true
|
Hidden=true
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
services.udisks2.settings = { # Should fix mounting ntfs system partition - Did not work
|
||||||
|
"udisks2.conf" = {
|
||||||
|
defaults = {
|
||||||
|
allow_mount_internal = true;
|
||||||
|
allow_mount_system = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
services.gvfs.enable = true; # For file manager integration
|
||||||
|
|
||||||
|
# Enable udev rules for SteelSeries devices (rivalcfg)
|
||||||
|
services.udev.packages = [ pkgs.rivalcfg ];
|
||||||
|
|
||||||
|
# Disable iBus (not needed unless using Asian input methods)
|
||||||
|
i18n.inputMethod = {
|
||||||
|
enable = false;
|
||||||
|
};
|
||||||
|
|
||||||
virtualisation.libvirtd = {
|
virtualisation.libvirtd = {
|
||||||
enable = true;
|
enable = true;
|
||||||
qemu = {
|
qemu = {
|
||||||
package = pkgs.qemu_kvm;
|
package = pkgs.qemu;
|
||||||
runAsRoot = true;
|
runAsRoot = true;
|
||||||
swtpm.enable = true;
|
swtpm.enable = true;
|
||||||
|
vhostUserPackages = [ pkgs.virtiofsd ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
systemd.tmpfiles.rules = [ "L+ /var/lib/qemu/firmware - - - - ${pkgs.qemu}/share/qemu/firmware" ];
|
systemd.tmpfiles.rules = [ "L+ /var/lib/qemu/firmware - - - - ${pkgs.qemu}/share/qemu/firmware" ];
|
||||||
# Some programs need SUID wrappers, can be configured further or are
|
# Some programs need SUID wrappers, can be configured further or are
|
||||||
# started in user sessions.
|
# started in user sessions.
|
||||||
@@ -192,15 +224,86 @@
|
|||||||
# Enable the OpenSSH daemon.
|
# Enable the OpenSSH daemon.
|
||||||
services.openssh.enable = true;
|
services.openssh.enable = true;
|
||||||
|
|
||||||
# Open ports in the firewall.
|
# Open ports in the .
|
||||||
networking.firewall.allowedTCPPorts = [
|
networking.firewall.allowedTCPPorts = [
|
||||||
24800 #Synergy
|
24800 #Synergy
|
||||||
|
53317 #localsend
|
||||||
|
3390 #rdp
|
||||||
|
9090
|
||||||
|
8000
|
||||||
|
40122
|
||||||
];
|
];
|
||||||
networking.firewall.allowedUDPPorts = [
|
networking.firewall.allowedUDPPorts = [
|
||||||
24800 #Synergy
|
24800 #Synergy
|
||||||
|
53317 #localsend
|
||||||
|
3390 #rdp
|
||||||
|
9090
|
||||||
|
8000
|
||||||
|
40122
|
||||||
];
|
];
|
||||||
# Or disable the firewall altogether.
|
networking.firewall.trustedInterfaces = [ "virbr0" ];
|
||||||
# networking.firewall.enable = false;
|
networking.nat = {
|
||||||
|
enable = true;
|
||||||
|
internalInterfaces = [ "virbr0" ];
|
||||||
|
externalInterface = "enp75s0";
|
||||||
|
extraCommands = ''
|
||||||
|
# MASQUERADE forwarded traffic to VM so it knows how to route back
|
||||||
|
iptables -t nat -A nixos-nat-post -o virbr0 -j MASQUERADE
|
||||||
|
'';
|
||||||
|
forwardPorts = [
|
||||||
|
{
|
||||||
|
sourcePort = 9090;
|
||||||
|
proto = "tcp";
|
||||||
|
destination = "192.168.122.113:9090";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
sourcePort = 9090;
|
||||||
|
proto = "udp";
|
||||||
|
destination = "192.168.122.113:9090";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
services.mullvad-vpn = {
|
||||||
|
enable = true;
|
||||||
|
gui.enable = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
fonts = {
|
||||||
|
|
||||||
|
packages = with pkgs; [
|
||||||
|
noto-fonts
|
||||||
|
noto-fonts-color-emoji
|
||||||
|
];
|
||||||
|
|
||||||
|
fontconfig = {
|
||||||
|
enable = true;
|
||||||
|
|
||||||
|
defaultFonts = {
|
||||||
|
sansSerif = [ "DejaVu Sans" "Noto Color Emoji" ];
|
||||||
|
serif = [ "DejaVu Serif" "Noto Color Emoji" ];
|
||||||
|
monospace = [ "DejaVu Sans Mono" "Noto Color Emoji" ];
|
||||||
|
emoji = [ "Noto Color Emoji" ];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
# services.xrdp = {
|
||||||
|
# enable = true;
|
||||||
|
# openFirewall = true;
|
||||||
|
# defaultWindowManager = "cinnamon-session";
|
||||||
|
# };
|
||||||
|
|
||||||
|
### tigervnc
|
||||||
|
services.tigervnc = {
|
||||||
|
enable = false;
|
||||||
|
users = {
|
||||||
|
andreas = {
|
||||||
|
localhost = false; # true for SSH-only
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
### tigervnc END
|
||||||
|
|
||||||
# This value determines the NixOS release from which the default
|
# This value determines the NixOS release from which the default
|
||||||
# settings for stateful data, like file locations and database versions
|
# settings for stateful data, like file locations and database versions
|
||||||
@@ -208,6 +311,6 @@
|
|||||||
# this value at the release version of the first install of this system.
|
# this value at the release version of the first install of this system.
|
||||||
# Before changing this value read the documentation for this option
|
# Before changing this value read the documentation for this option
|
||||||
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
||||||
system.stateVersion = "24.05"; # Did you read the comment?
|
system.stateVersion = "26.05"; # Did you read the comment?
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,23 +10,23 @@
|
|||||||
inputs,
|
inputs,
|
||||||
# Additional metadata is provided by Snowfall Lib.
|
# Additional metadata is provided by Snowfall Lib.
|
||||||
# The namespace used for your flake, defaulting to "internal" if not set.
|
# The namespace used for your flake, defaulting to "internal" if not set.
|
||||||
namespace,
|
# namespace,
|
||||||
# The system architecture for this host (eg. `x86_64-linux`).
|
# The system architecture for this host (eg. `x86_64-linux`).
|
||||||
system,
|
# system,
|
||||||
# The Snowfall Lib target for this system (eg. `x86_64-iso`).
|
# The Snowfall Lib target for this system (eg. `x86_64-iso`).
|
||||||
target,
|
# target,
|
||||||
# A normalized name for the system target (eg. `iso`).
|
# A normalized name for the system target (eg. `iso`).
|
||||||
format,
|
# format,
|
||||||
# A boolean to determine whether this system is a virtual target using nixos-generators.
|
# A boolean to determine whether this system is a virtual target using nixos-generators.
|
||||||
virtual,
|
# virtual,
|
||||||
# An attribute map of your defined hosts.
|
# An attribute map of your defined hosts.
|
||||||
systems,
|
# systems,
|
||||||
# All other arguments come from the system system.
|
# All other arguments come from the system system.
|
||||||
config
|
# config,
|
||||||
, ...
|
...
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
inherit (lib.my-namespace) enabled;
|
# inherit (lib.my-namespace) systemPackages;
|
||||||
inherit pkgs;
|
inherit pkgs;
|
||||||
installedPackages = lib.my-namespace.mkPackages pkgs;
|
installedPackages = lib.my-namespace.mkPackages pkgs;
|
||||||
in
|
in
|
||||||
@@ -34,64 +34,126 @@ in
|
|||||||
# inherit system;
|
# inherit system;
|
||||||
imports = [
|
imports = [
|
||||||
./configuration.nix
|
./configuration.nix
|
||||||
|
./mutter-tearing.nix
|
||||||
./video.nix
|
./video.nix
|
||||||
|
inputs.wallpaperengine.nixosModules.default
|
||||||
|
inputs.aagl.nixosModules.default
|
||||||
];
|
];
|
||||||
config = {
|
config = {
|
||||||
system.stateVersion = "24.05";
|
programs.linux-wallpaperengine.enable = true;
|
||||||
|
system.stateVersion = "26.05";
|
||||||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
||||||
|
# Distrobox
|
||||||
|
my-namespace.distrobox.enable = true;
|
||||||
|
# Desktops
|
||||||
|
my-namespace.desktop-environment.cinnamon.enable = true;
|
||||||
|
my-namespace.desktop-environment.xfce.enable = false;
|
||||||
|
my-namespace.desktop-environment.gnome.enable = true;
|
||||||
|
my-namespace.desktop-environment.kde.enable = false;
|
||||||
|
my-namespace.desktop-environment.hyprland.enable = false;
|
||||||
|
my-namespace.desktop-environment.cosmic.enable = false;
|
||||||
|
my-namespace.performance-tuning.enable = true;
|
||||||
|
my-namespace.rtl8125-recovery.enable = true;
|
||||||
|
my-namespace.file-organization.enable = true;
|
||||||
|
# GNOME-keyring
|
||||||
|
my-namespace.gnome-keyring.enable = true;
|
||||||
|
# CS Tools
|
||||||
|
my-namespace.cs-tools.enable = true;
|
||||||
|
|
||||||
# Define a user account. Don't forget to set a password with ‘passwd’.
|
# Define a user account. Don't forget to set a password with ‘passwd’.
|
||||||
users.users.andreas = {
|
users.users.andreas = {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
description = "Andreas Schaafsma";
|
description = "Andreas Schaafsma";
|
||||||
extraGroups = [ "networkmanager" "wheel" "libvirtd" ] ;
|
extraGroups = [
|
||||||
|
"networkmanager"
|
||||||
|
"wheel"
|
||||||
|
"libvirtd"
|
||||||
|
"plugdev"
|
||||||
|
"docker"
|
||||||
|
"gamemode"
|
||||||
|
];
|
||||||
packages = with pkgs; [
|
packages = with pkgs; [
|
||||||
# Packages from inputs
|
# Packages from inputsq
|
||||||
inputs.game-of-life.packages.x86_64-linux.default
|
# inputs.game-of-life.packages.x86_64-linux.default
|
||||||
inputs.zen-browser.packages.x86_64-linux.default
|
inputs.zen-browser.packages.x86_64-linux.default
|
||||||
inputs.trilium-next-pr.legacyPackages.x86_64-linux.trilium-next-desktop
|
# inputs.anikki.packages.x86_64-linux.default
|
||||||
# We want flatpak support
|
# We want flatpak support
|
||||||
flatpak
|
flatpak
|
||||||
# GNOME shit
|
# GNOME shit
|
||||||
gnome-software
|
thunderbird
|
||||||
gnomeExtensions.pop-shell
|
|
||||||
gnome-remote-desktop
|
|
||||||
|
|
||||||
soundwireserver
|
soundwireserver
|
||||||
vscode
|
# vscode
|
||||||
|
# discord
|
||||||
spotify
|
spotify
|
||||||
appimage-run
|
appimage-run
|
||||||
prismlauncher #replaces broken minecraft package
|
prismlauncher #replaces broken minecraft package
|
||||||
trilium-desktop
|
trilium-desktop
|
||||||
terraform
|
terraform
|
||||||
virt-manager
|
virt-manager
|
||||||
|
nil
|
||||||
|
codex
|
||||||
|
inputs.codex-desktop.packages.${pkgs.stdenv.hostPlatform.system}.codex-desktop
|
||||||
# thunderbird
|
# thunderbird
|
||||||
];
|
];
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
programs.appimage = {
|
||||||
|
enable = true;
|
||||||
|
binfmt = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
programs.anime-game-launcher.enable = true; # Adds launcher and /etc/hosts rules
|
||||||
|
programs.anime-games-launcher.enable = true;
|
||||||
|
|
||||||
services.gnome.gnome-remote-desktop.enable = true;
|
services.gnome.gnome-remote-desktop.enable = true;
|
||||||
my-namespace.wallpaper-engine-kde-plugin.enable = true;
|
my-namespace.keychron-keyboard.enable = true;
|
||||||
|
|
||||||
# lib.my-namespace.home.stream-tools.enable = true;
|
# lib.my-namespace.home.stream-tools.enable = true;
|
||||||
|
|
||||||
# Open ports in the firewall.
|
# Open ports in the firewall.
|
||||||
networking.firewall.allowedTCPPorts = [
|
networking.firewall.allowedTCPPorts = [
|
||||||
59010 #SoundWireServer
|
59010 #SoundWireServer
|
||||||
|
5901
|
||||||
|
5001
|
||||||
|
11434
|
||||||
3389 #RDP
|
3389 #RDP
|
||||||
22 #ssh
|
22 #ssh
|
||||||
];
|
];
|
||||||
networking.firewall.allowedUDPPorts = [
|
networking.firewall.allowedUDPPorts = [
|
||||||
59010 #SoundWireServer
|
59010 #SoundWireServer
|
||||||
|
5901
|
||||||
|
5001
|
||||||
|
11434
|
||||||
3389 #RDP
|
3389 #RDP
|
||||||
22 #ssh
|
22 #ssh
|
||||||
];
|
];
|
||||||
# Or disable the firewall altogether.
|
# Or disable the firewall altogether.
|
||||||
# networking.firewall.enable = false;
|
networking.firewall.enable = false;
|
||||||
programs.steam.gamescopeSession.enable = true;
|
|
||||||
programs.gamescope.enable = true;
|
|
||||||
|
|
||||||
# Install firefox.
|
# Install firefox.
|
||||||
programs.firefox.enable = true;
|
programs.firefox.enable = true;
|
||||||
nixpkgs.config.allowBroken = true;
|
nixpkgs.config.allowBroken = true;
|
||||||
powerManagement.cpuFreqGovernor = "performance";
|
powerManagement.cpuFreqGovernor = "performance";
|
||||||
# Set up system Packages
|
# Set up system Packages
|
||||||
|
environment.sessionVariables.GI_TYPELIB_PATH =
|
||||||
|
lib.makeSearchPath "lib/girepository-1.0" [
|
||||||
|
pkgs.my-namespace.rounded-blur
|
||||||
|
];
|
||||||
|
environment.sessionVariables = {
|
||||||
|
# If you are using Hyprland, labwc, or Sway (wlroots-based):
|
||||||
|
WLR_DRM_NO_ATOMIC = "1";
|
||||||
|
|
||||||
|
KWIN_DRM_DISABLE_TRIPLE_BUFFERING="1";
|
||||||
|
|
||||||
|
# If you are using KDE Plasma (KWin):
|
||||||
|
KWIN_FORCE_SW_CURSOR = "1";
|
||||||
|
|
||||||
|
# For modern wlroots (and Aquamarine in Hyprland) to force software cursors:
|
||||||
|
WLR_NO_HARDWARE_CURSORS = "1";
|
||||||
|
};
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
git
|
git
|
||||||
wine
|
wine
|
||||||
@@ -100,25 +162,48 @@ in
|
|||||||
ntfs3g
|
ntfs3g
|
||||||
ntfsprogs
|
ntfsprogs
|
||||||
synergy
|
synergy
|
||||||
|
mangohud
|
||||||
my-namespace.udev-steelseries
|
my-namespace.udev-steelseries
|
||||||
my-namespace.hello
|
my-namespace.linux-wallpaperengine
|
||||||
kde-rounded-corners
|
my-namespace.rounded-blur
|
||||||
# stuff I installed to try to get gamescope to work to no avail Gamescope is just broken it seems.
|
my-namespace.rounded-windows-bms
|
||||||
# pkgs.mesa
|
my-namespace.cs-demo-manager
|
||||||
# pkgs.vulkan-loader
|
vscode-modernized
|
||||||
# pkgs.vulkan-validation-layers
|
zed-editor
|
||||||
# pkgs.vulkan-extension-layer
|
jetbrains-toolbox
|
||||||
# pkgs.vulkan-tools
|
|
||||||
# pkgs.libva
|
(pkgs.writeShellScriptBin "switch-to-desktop" ''
|
||||||
# pkgs.libva-utils
|
#!/bin/sh
|
||||||
|
# Kill Steam and return to display manager
|
||||||
|
pkill steam || true
|
||||||
|
pkill gamescope || true
|
||||||
|
# End the session cleanly
|
||||||
|
loginctl terminate-session "$XDG_SESSION_ID"
|
||||||
|
'')
|
||||||
|
|
||||||
|
(pkgs.writeShellScriptBin "steamos-session-select" ''
|
||||||
|
#!/bin/sh
|
||||||
|
exec switch-to-desktop
|
||||||
|
'')
|
||||||
|
|
||||||
|
# Vulkan packages for Steam
|
||||||
|
mesa
|
||||||
|
vulkan-loader
|
||||||
|
vulkan-validation-layers
|
||||||
|
vulkan-extension-layer
|
||||||
|
vulkan-tools
|
||||||
|
libva
|
||||||
|
libva-utils
|
||||||
# vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
|
# vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
|
||||||
# wget
|
# wget
|
||||||
]
|
]
|
||||||
++ installedPackages.packages;
|
++ installedPackages.packages;
|
||||||
|
|
||||||
programs.nix-ld = {
|
programs.nix-ld = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.nix-ld; #replaces nix-ld-rs
|
package = pkgs.nix-ld; #replaces nix-ld-rs
|
||||||
};
|
};
|
||||||
|
|
||||||
services.flatpak.enable = true;
|
services.flatpak.enable = true;
|
||||||
systemd.services.flatpak-repo = {
|
systemd.services.flatpak-repo = {
|
||||||
wantedBy = [ "multi-user.target" ];
|
wantedBy = [ "multi-user.target" ];
|
||||||
@@ -146,9 +231,10 @@ in
|
|||||||
|
|
||||||
# Disable the GNOME3/GDM auto-suspend feature that cannot be disabled in GUI!
|
# Disable the GNOME3/GDM auto-suspend feature that cannot be disabled in GUI!
|
||||||
# If no user is logged in, the machine will power down after 20 minutes.
|
# If no user is logged in, the machine will power down after 20 minutes.
|
||||||
systemd.targets.sleep.enable = false;
|
|
||||||
systemd.targets.suspend.enable = false;
|
# systemd.targets.sleep.enable = false;
|
||||||
systemd.targets.hibernate.enable = false;
|
# systemd.targets.suspend.enable = false;
|
||||||
systemd.targets.hybrid-sleep.enable = false;
|
# systemd.targets.hibernate.enable = false;
|
||||||
|
# systemd.targets.hybrid-sleep.enable = false;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -1,7 +1,9 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
{
|
{
|
||||||
# boot.kernelParams = [ "drm.edid_firmware=DP-1:edid/edid.bin,DP-2:edid/edid.bin,DP-3:edid/edid.bin,DP-4:edid/edid.bin" ];
|
# boot.kernelParams = [ "drm.edid_firmware=DP-1:edid/edid.bin,DP-2:edid/edid.bin,DP-3:edid/edid.bin,DP-4:edid/edid.bin" ];
|
||||||
boot.kernelParams = [ "drm.edid_firmware=DP-2:edid/edid.bin" ];
|
boot.kernelParams = [
|
||||||
|
"drm.edid_firmware=DP-2:edid/edid.bin,DP-4:edid/edid.bin"
|
||||||
|
];
|
||||||
|
|
||||||
|
|
||||||
hardware.firmware = [
|
hardware.firmware = [
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,141 @@
|
|||||||
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
############################
|
||||||
|
## Display + Mesa Settings
|
||||||
|
############################
|
||||||
|
|
||||||
|
# hardware.enableRedistributableFirmware = true;
|
||||||
|
|
||||||
|
hardware.firmware = [
|
||||||
|
pkgs.linux-firmware
|
||||||
|
# pkgs.firmwareLinuxNonfree
|
||||||
|
# pkgs.firmwareLinuxStrict
|
||||||
|
# pkgs.firmwareLinuxLatest
|
||||||
|
];
|
||||||
|
|
||||||
|
# boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||||
|
boot.kernelParams = [
|
||||||
|
"console=tty0"
|
||||||
|
# "efifb=off"
|
||||||
|
"xe.force_probe=e20b"
|
||||||
|
# Xe stability improvements for B580
|
||||||
|
"xe.guc_log_level=0" # Reduce GuC logging overhead
|
||||||
|
"xe.enable_display=1" # Ensure display is enabled
|
||||||
|
# Memory/performance parameters
|
||||||
|
"mitigations=off" # Disable CPU mitigations for better performance
|
||||||
|
"module_blacklist=nouveau,nvidia,nvidia_drm,nvidia_modeset,nvidia_uvm"
|
||||||
|
];
|
||||||
|
services.switcherooControl.enable = true;
|
||||||
|
# environment.variables.VK_ICD_FILENAMES = "/run/opengl-driver/share/vulkan/icd.d/intel_icd.x86_64.json";
|
||||||
|
hardware.intel-gpu-tools.enable = true;
|
||||||
|
hardware.graphics = {
|
||||||
|
enable = true;
|
||||||
|
enable32Bit = true;
|
||||||
|
|
||||||
|
extraPackages = with pkgs; [
|
||||||
|
intel-media-driver # Intel VAAPI
|
||||||
|
vpl-gpu-rt # oneVPL runtime
|
||||||
|
intel-vaapi-driver # fallback
|
||||||
|
intel-compute-runtime # OpenCL/Level Zero
|
||||||
|
level-zero # Level Zero API for compute
|
||||||
|
intel-graphics-compiler # Shader compiler for Arc GPUs allgedly needed for XPU
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
# Ensure Arc driver is available (usually auto-loaded)
|
||||||
|
boot.kernelModules = [ "xe" "i915" ];
|
||||||
|
# Blacklist everything for nvidia
|
||||||
|
boot.blacklistedKernelModules = [
|
||||||
|
"nouveau"
|
||||||
|
"nvidia"
|
||||||
|
"nvidia_drm"
|
||||||
|
"nvidia_modeset"
|
||||||
|
"nvidia_uvm"
|
||||||
|
];
|
||||||
|
|
||||||
|
# Mark Arc B580 as a discrete Intel GPU for switcheroo-control and
|
||||||
|
# keep runtime PCI power management enabled for the device.
|
||||||
|
services.udev.extraRules = ''
|
||||||
|
ACTION=="add|bind", SUBSYSTEM=="pci", ATTR{vendor}=="0x8086", ATTR{device}=="0xe20b", TEST=="power/control", ATTR{power/control}="auto"
|
||||||
|
SUBSYSTEM=="drm", DRIVERS=="xe", ATTRS{vendor}=="0x8086", ATTRS{device}=="0xe20b", TAG+="switcheroo-discrete-gpu"
|
||||||
|
'';
|
||||||
|
|
||||||
|
environment.variables = {
|
||||||
|
# Force Intel GPU for all graphics operations
|
||||||
|
KWIN_DRM_DEVICES = "/dev/dri/card0";
|
||||||
|
|
||||||
|
# Vulkan/DXVK optimizations for B580
|
||||||
|
ANV_ENABLE_PIPELINE_CACHE = "1";
|
||||||
|
|
||||||
|
# Shader cache settings
|
||||||
|
MESA_SHADER_CACHE_DISABLE = "false";
|
||||||
|
MESA_SHADER_CACHE_MAX_SIZE = "10G";
|
||||||
|
|
||||||
|
# DXVK optimizations
|
||||||
|
DXVK_HUD = "compiler"; # Monitor shader compilation
|
||||||
|
# DXVK_ASYNC = "1"; # Enable if you want async shader compilation (may cause issues)
|
||||||
|
|
||||||
|
# Intel IPEX / PyTorch settings
|
||||||
|
ZE_ENABLE_ALT_DRIVERS = "libze_intel_gpu.so.1"; # Enable Intel GPU driver for Level Zero
|
||||||
|
SYCL_CACHE_PERSISTENT = "1"; # Enable persistent SYCL cache
|
||||||
|
SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS = "1"; # Performance optimization
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
############################
|
||||||
|
## LACT Settings for Overclocking
|
||||||
|
############################
|
||||||
|
|
||||||
|
services.lact.enable = true;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
############################
|
||||||
|
## X / Wayland GPU Drivers
|
||||||
|
############################
|
||||||
|
|
||||||
|
# Enable modesetting driver for X11 (required for Intel Xe)
|
||||||
|
services.xserver.videoDrivers = [
|
||||||
|
"modesetting"
|
||||||
|
#"intel"
|
||||||
|
];
|
||||||
|
|
||||||
|
services.xserver.enable = true;
|
||||||
|
services.xserver.autorun = false;
|
||||||
|
services.xserver.displayManager.startx.enable = true;
|
||||||
|
|
||||||
|
# Xorg configuration for Intel Arc Battlemage (xe driver)
|
||||||
|
# Based on: https://www.reddit.com/r/crtgaming/comments/1knom2t/guide_intel_arc_b580_arch_linux_xorg/
|
||||||
|
# Intel Arc B-series at PCI 0000:03:00.0
|
||||||
|
#services.xserver.deviceSection = ''
|
||||||
|
# Option "AccelMethod" "glamor"
|
||||||
|
# BusID "PCI:3:0:0"
|
||||||
|
#'';
|
||||||
|
|
||||||
|
############################
|
||||||
|
## User Access
|
||||||
|
############################
|
||||||
|
users.users.andreas.extraGroups = [ "video" "render" ];
|
||||||
|
|
||||||
|
############################
|
||||||
|
## System Packages for AI/ML
|
||||||
|
############################
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
intel-compute-runtime
|
||||||
|
level-zero
|
||||||
|
# For checking GPU compute capabilities
|
||||||
|
clinfo
|
||||||
|
vulkan-tools
|
||||||
|
];
|
||||||
|
services.xserver.config = ''
|
||||||
|
Section "Device"
|
||||||
|
Identifier "AMD"
|
||||||
|
Driver "amdgpu"
|
||||||
|
Option "TearFree" "false"
|
||||||
|
EndSection
|
||||||
|
'';
|
||||||
|
services.xserver.deviceSection = ''
|
||||||
|
Option "TearFree" "false"
|
||||||
|
'';
|
||||||
|
}
|
||||||
@@ -0,0 +1,90 @@
|
|||||||
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
############################
|
||||||
|
## Display + Mesa Settings
|
||||||
|
############################
|
||||||
|
|
||||||
|
# hardware.enableRedistributableFirmware = true;
|
||||||
|
|
||||||
|
hardware.firmware = [
|
||||||
|
pkgs.linux-firmware
|
||||||
|
# pkgs.firmwareLinuxNonfree
|
||||||
|
# pkgs.firmwareLinuxStrict
|
||||||
|
# pkgs.firmwareLinuxLatest
|
||||||
|
];
|
||||||
|
|
||||||
|
# boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||||
|
boot.kernelParams = [
|
||||||
|
"console=tty0"
|
||||||
|
# "efifb=off"
|
||||||
|
# "xe.force_probe=*"
|
||||||
|
"module_blacklist=nouveau,nvidia,nvidia_drm,nvidia_modeset,nvidia_uvm"
|
||||||
|
];
|
||||||
|
|
||||||
|
# environment.variables.VK_ICD_FILENAMES = "/run/opengl-driver/share/vulkan/icd.d/intel_icd.x86_64.json";
|
||||||
|
hardware.intel-gpu-tools.enable = true;
|
||||||
|
hardware.graphics = {
|
||||||
|
enable = true;
|
||||||
|
enable32Bit = true;
|
||||||
|
|
||||||
|
extraPackages = with pkgs; [
|
||||||
|
intel-media-driver # Intel VAAPI
|
||||||
|
vpl-gpu-rt # oneVPL runtime
|
||||||
|
intel-vaapi-driver # fallback
|
||||||
|
intel-compute-runtime # OpenCL/Level Zero
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
# Ensure Arc driver is available (usually auto-loaded)
|
||||||
|
boot.kernelModules = [ "i915" ];
|
||||||
|
# Blacklist everything for nvidia
|
||||||
|
boot.blacklistedKernelModules = [
|
||||||
|
"nouveau"
|
||||||
|
"nvidia"
|
||||||
|
"nvidia_drm"
|
||||||
|
"nvidia_modeset"
|
||||||
|
"nvidia_uvm"
|
||||||
|
"xe"
|
||||||
|
];
|
||||||
|
|
||||||
|
environment.variables = {
|
||||||
|
KWIN_DRM_DEVICES = "/dev/dri/card0";
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
############################
|
||||||
|
## LACT Settings for Overclocking
|
||||||
|
############################
|
||||||
|
|
||||||
|
services.lact.enable = true;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
############################
|
||||||
|
## X / Wayland GPU Drivers
|
||||||
|
############################
|
||||||
|
|
||||||
|
# Enable modesetting driver for X11 (required for Intel Xe)
|
||||||
|
services.xserver.videoDrivers = [
|
||||||
|
"modesetting"
|
||||||
|
#"intel"
|
||||||
|
];
|
||||||
|
|
||||||
|
services.xserver.enable = true;
|
||||||
|
services.xserver.autorun = false;
|
||||||
|
services.xserver.displayManager.startx.enable = true;
|
||||||
|
|
||||||
|
# Xorg configuration for Intel Arc Battlemage (xe driver)
|
||||||
|
# Based on: https://www.reddit.com/r/crtgaming/comments/1knom2t/guide_intel_arc_b580_arch_linux_xorg/
|
||||||
|
# Intel Arc B-series at PCI 0000:03:00.0
|
||||||
|
#services.xserver.deviceSection = ''
|
||||||
|
# Option "AccelMethod" "glamor"
|
||||||
|
# BusID "PCI:3:0:0"
|
||||||
|
#'';
|
||||||
|
|
||||||
|
############################
|
||||||
|
## User Access
|
||||||
|
############################
|
||||||
|
users.users.andreas.extraGroups = [ "video" "render" ];
|
||||||
|
}
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
|
||||||
let
|
|
||||||
inherit (lib.my-namespace) enabled;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
my-namespace.hardware = {
|
|
||||||
# graphics-nvidia-specializations.enabled = false;
|
|
||||||
# graphics-nvidia-prime-amd = enabled;
|
|
||||||
# graphics-nvidia-prime-amd-testing = enabled;
|
|
||||||
# graphics-amd-igpu-only = enabled;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,88 +0,0 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
|
||||||
{
|
|
||||||
|
|
||||||
# Enable OpenGL
|
|
||||||
hardware.graphics = {
|
|
||||||
enable = true;
|
|
||||||
extraPackages = with pkgs; [ nvidia-vaapi-driver ];
|
|
||||||
};
|
|
||||||
|
|
||||||
# Load nvidia driver for Xorg and Wayland
|
|
||||||
# boot.extraModulePackages = [ config.boot.kernelPackages.nvidia_x11 ];
|
|
||||||
boot.extraModulePackages = [ config.boot.kernelPackages.nvidia_x11_beta ];
|
|
||||||
# boot.extraModulePackages = [ config.boot.kernelPackages.nvidia_x11 ];
|
|
||||||
|
|
||||||
|
|
||||||
boot.loader.systemd-boot.consoleMode = "max";
|
|
||||||
|
|
||||||
boot.kernelParams = [
|
|
||||||
# "amdgpu.modeset=0"
|
|
||||||
"nvidia-drm.fbdev=1"
|
|
||||||
"nvidia-drm.modeset=1"
|
|
||||||
"nvidia.NVreg_PreserveVideoMemoryAllocations=1"
|
|
||||||
# "amd_iommu=on"
|
|
||||||
# "vfio-pci.ids=\"10de:2489,10de:228b\""
|
|
||||||
# "nomodeset"
|
|
||||||
# "nvidia_drm.modeset=1"
|
|
||||||
];
|
|
||||||
boot.blacklistedKernelModules = [
|
|
||||||
"i915"
|
|
||||||
"nouveau"
|
|
||||||
"amdgpu"
|
|
||||||
];
|
|
||||||
services.xserver.videoDrivers = [ "nvidia" ];
|
|
||||||
|
|
||||||
boot.initrd.kernelModules = [
|
|
||||||
"nvidia"
|
|
||||||
"nvidia_drm"
|
|
||||||
];
|
|
||||||
hardware.nvidia = {
|
|
||||||
modesetting.enable = true;
|
|
||||||
|
|
||||||
# Nvidia power management. Experimental, and can cause sleep/suspend to fail.
|
|
||||||
# Enable this if you have graphical corruption issues or application crashes after waking
|
|
||||||
# up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead
|
|
||||||
# of just the bare essentials.
|
|
||||||
powerManagement.enable = false;
|
|
||||||
|
|
||||||
# Fine-grained power management. Turns off GPU when not in use.
|
|
||||||
# Experimental and only works on modern Nvidia GPUs (Turing or newer).
|
|
||||||
powerManagement.finegrained = false;
|
|
||||||
|
|
||||||
# Use the NVidia open source kernel module (not to be confused with the
|
|
||||||
# independent third-party "nouveau" open source driver).
|
|
||||||
# Support is limited to the Turing and later architectures. Full list of
|
|
||||||
# supported GPUs is at:
|
|
||||||
# https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus
|
|
||||||
# Only available from driver 515.43.04+
|
|
||||||
# Currently alpha-quality/buggy, so false is currently the recommended setting.
|
|
||||||
open = false;
|
|
||||||
|
|
||||||
# Enable the Nvidia settings menu,
|
|
||||||
# accessible via `nvidia-settings`.
|
|
||||||
nvidiaSettings = true;
|
|
||||||
|
|
||||||
# Optionally, you may need to select the appropriate driver version for your specific GPU.
|
|
||||||
package = config.boot.kernelPackages.nvidiaPackages.beta;
|
|
||||||
# package = config.boot.kernelPackages.nvidiaPackages.none;
|
|
||||||
# package = config.boot.kernelPackages.nvidiaPackages.production;
|
|
||||||
|
|
||||||
forceFullCompositionPipeline = true;
|
|
||||||
|
|
||||||
# prime = {
|
|
||||||
# offload = {
|
|
||||||
# enable = true;
|
|
||||||
# enableOffloadCmd = true;
|
|
||||||
# };
|
|
||||||
# reverseSync.enable = false;
|
|
||||||
# # Make sure to use the correct Bus ID values for your system!
|
|
||||||
# # intelBusId = "PCI:0:2:0";
|
|
||||||
# nvidiaBusId = "PCI:01:0:0";
|
|
||||||
# amdgpuBusId = "PCI:50:0:0"; #For AMD GPU
|
|
||||||
# };
|
|
||||||
|
|
||||||
};
|
|
||||||
users.users.andreas = {
|
|
||||||
extraGroups = [ "video" "render" ];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,51 @@
|
|||||||
|
{ config, lib, system, pkgs, ... }:
|
||||||
|
{
|
||||||
|
boot.kernelModules = [
|
||||||
|
"vfio"
|
||||||
|
"vfio-pci"
|
||||||
|
"vfio_iommu_type1"
|
||||||
|
];
|
||||||
|
boot.kernelParams = [
|
||||||
|
"amd_iommu=on"
|
||||||
|
"iommu=pt"
|
||||||
|
];
|
||||||
|
# Make sure vfio is available inside initrd
|
||||||
|
boot.initrd.availableKernelModules = [
|
||||||
|
"vfio_pci"
|
||||||
|
];
|
||||||
|
# Bind by IDs (cleaner via modprobe instead of kernel param)
|
||||||
|
boot.extraModprobeConfig = ''
|
||||||
|
options vfio-pci ids=10de:1b81,10de:10f0
|
||||||
|
'';
|
||||||
|
boot.initrd.systemd = {
|
||||||
|
enable = true;
|
||||||
|
services.initrd-vfio-pci-nvidia = {
|
||||||
|
description = "vfio-pci predevice init";
|
||||||
|
wantedBy = [ "initrd.target" ];
|
||||||
|
# Match 'preDeviceCommands' by running early
|
||||||
|
before = [ "sysroot.mount" ];
|
||||||
|
|
||||||
|
unitConfig.DefaultDependencies = "no";
|
||||||
|
serviceConfig.Type = "oneshot";
|
||||||
|
|
||||||
|
# Place your original shell commands here
|
||||||
|
script = ''
|
||||||
|
modprobe vfio-pci
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
# # EARLY and deterministic binding
|
||||||
|
# boot.initrd.preDeviceCommands = ''
|
||||||
|
# echo 0000:05:00.0 > /sys/bus/pci/drivers/vfio-pci/bind
|
||||||
|
# echo 0000:05:00.1 > /sys/bus/pci/drivers/vfio-pci/bind
|
||||||
|
# '';
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
pciutils
|
||||||
|
virtiofsd
|
||||||
|
config.virtualisation.libvirtd.qemu.package
|
||||||
|
looking-glass-client
|
||||||
|
virt-manager
|
||||||
|
libguestfs-with-appliance
|
||||||
|
];
|
||||||
|
users.extraUsers.andreas.extraGroups = [ "libvirtd" ];
|
||||||
|
}
|
||||||
@@ -7,31 +7,75 @@
|
|||||||
imports =
|
imports =
|
||||||
[
|
[
|
||||||
(modulesPath + "/installer/scan/not-detected.nix")
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
./graphics/intel_nvidia.nix
|
./graphics/intel.nix
|
||||||
|
./graphics/passthrough_nvidia.nix
|
||||||
|
# ./graphics/intel_i915.nix
|
||||||
# ./graphics/nvidia.nix
|
# ./graphics/nvidia.nix
|
||||||
./acer-monitor-edid.nix
|
./acer-monitor-edid.nix
|
||||||
|
./samsung-monitor-edid.nix
|
||||||
];
|
];
|
||||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
# boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||||
|
boot.kernelPackages = pkgs.cachyosKernels.linuxPackages-cachyos-latest;
|
||||||
hardware.enableRedistributableFirmware = true;
|
hardware.enableRedistributableFirmware = true;
|
||||||
# boot.kernelPackages = pkgs.linuxKernel.packages.linux_xanmod_latest;
|
# boot.kernelPackages = pkgs.linuxKernel.packages.linux_xanmod_latest;
|
||||||
# boot.kernelPackages = pkgs.linuxPackages;
|
# boot.kernelPackages = pkgs.linuxPackages;
|
||||||
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
|
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
|
||||||
boot.kernelModules = [ "kvm-amd" "4vl2loopback" ];
|
boot.kernelModules = [ "kvm-amd" "r8125" "4vl2loopback" ];
|
||||||
boot.extraModulePackages = [ config.boot.kernelPackages.v4l2loopback ];
|
boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback r8125 ];
|
||||||
boot.supportedFilesystems = [ "ntfs" ];
|
boot.supportedFilesystems = [ "ntfs" ];
|
||||||
boot.blacklistedKernelModules = [ ];
|
boot.blacklistedKernelModules = [ "r8169" ];
|
||||||
|
|
||||||
|
systemd.services.disable-realtek-eee = {
|
||||||
|
description = "Disable Realtek Energy Efficient Ethernet";
|
||||||
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
after = [ "network.target" ];
|
||||||
|
|
||||||
|
serviceConfig = {
|
||||||
|
Type = "oneshot";
|
||||||
|
ExecStart = "${pkgs.ethtool}/bin/ethtool --set-eee enp10s0 eee off";
|
||||||
|
RemainAfterExit = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
fileSystems."/" =
|
fileSystems."/" =
|
||||||
{ device = "/dev/disk/by-uuid/563805a1-5277-4488-bbdd-c1a7ed37be76";
|
{ device = "/dev/disk/by-uuid/31fe479a-f4ef-4ee5-9cd9-d43ed1a3c88b";
|
||||||
fsType = "ext4";
|
fsType = "ext4";
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/boot" =
|
fileSystems."/boot" =
|
||||||
{ device = "/dev/disk/by-uuid/E846-D998";
|
{ device = "/dev/disk/by-uuid/646A-D107";
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
options = [ "fmask=0077" "dmask=0077" ];
|
options = [ "fmask=0077" "dmask=0077" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
fileSystems."/home" =
|
||||||
|
{ device = "/dev/disk/by-uuid/6ac4f42b-09e3-43b3-8215-8ff9a3c0695e";
|
||||||
|
fsType = "ext4";
|
||||||
|
};
|
||||||
|
|
||||||
|
# Mount ntfs partition
|
||||||
|
# fileSystems."/run/media/627C3BDF7C3BAD23" = {
|
||||||
|
# device = "/dev/disk/by-uuid/627C3BDF7C3BAD23";
|
||||||
|
# fsType = "ntfs-3g";
|
||||||
|
# options = [ "rw" "uid=1000"];
|
||||||
|
# };
|
||||||
|
|
||||||
|
# # Mount ntfs oldfiles drive partition
|
||||||
|
# fileSystems."/run/media/oldfiles" = {
|
||||||
|
# device = "/dev/disk/by-uuid/E2E26FFFE26FD677";
|
||||||
|
# fsType = "ntfs-3g";
|
||||||
|
# options = [ "rw" "uid=1000"];
|
||||||
|
# };
|
||||||
|
|
||||||
|
# # Mount The Vault
|
||||||
|
# fileSystems."/run/media/vault" = {
|
||||||
|
# device = "/dev/disk/by-uuid/3470646370642DB4";
|
||||||
|
# fsType = "ntfs-3g";
|
||||||
|
# options = [ "rw" "uid=1000"];
|
||||||
|
# };
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Try to fix hibernation
|
# Try to fix hibernation
|
||||||
@@ -40,10 +84,11 @@
|
|||||||
swapDevices = [ {
|
swapDevices = [ {
|
||||||
device = "/var/lib/swapfile";
|
device = "/var/lib/swapfile";
|
||||||
size = 32*1024;
|
size = 32*1024;
|
||||||
} ]; #resume-offset = 78399488
|
} ]; #resume-offset = 195323904
|
||||||
boot.resumeDevice = "/dev/disk/by-uuid/563805a1-5277-4488-bbdd-c1a7ed37be76"; # the unlocked drive mapping
|
boot.resumeDevice = "/dev/disk/by-uuid/31fe479a-f4ef-4ee5-9cd9-d43ed1a3c88b"; # the unlocked drive mapping
|
||||||
boot.kernelParams = [
|
boot.kernelParams = [
|
||||||
"resume_offset=78399488" #sudo filefrag -v /var/lib/swapfile|awk 'NR==4{gsub(/\./,"");print $4;}'
|
"resume_offset=195323904" #sudo filefrag -v /var/lib/swapfile|awk 'NR==4{gsub(/\./,"");print $4;}'
|
||||||
|
"r8125.aspm=0" # realtek network adapter fix
|
||||||
];
|
];
|
||||||
security.protectKernelImage = false;
|
security.protectKernelImage = false;
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,14 @@
|
|||||||
|
{ config, lib, pkgs, ... }:
|
||||||
|
{
|
||||||
|
# boot.kernelParams = [ "drm.edid_firmware=DP-1:edid/edid.bin,DP-2:edid/edid.bin,DP-3:edid/edid.bin,DP-4:edid/edid.bin" ];
|
||||||
|
boot.kernelParams = [ "drm.edid_firmware=DP-1:edid/edid2.bin" ];
|
||||||
|
|
||||||
|
|
||||||
|
hardware.firmware = [
|
||||||
|
(
|
||||||
|
pkgs.runCommand "edid2.bin" { } ''
|
||||||
|
mkdir -p $out/lib/firmware/edid
|
||||||
|
cp ${./firmware/U32J59x-edid.bin} $out/lib/firmware/edid/edid2.bin
|
||||||
|
''
|
||||||
|
)];
|
||||||
|
}
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
diff --git a/src/meson.build b/src/meson.build
|
||||||
|
--- a/src/meson.build
|
||||||
|
+++ b/src/meson.build
|
||||||
|
@@ -1077,5 +1077,6 @@ wayland_protocols = [
|
||||||
|
['single-pixel-buffer', 'staging', 1, ],
|
||||||
|
['tablet', 'stable', 2, ],
|
||||||
|
+ ['tearing-control', 'staging', 1, ],
|
||||||
|
['text-input-unstable-v3', 'private', ],
|
||||||
|
['viewporter', 'stable', ],
|
||||||
|
['xdg-activation', 'staging', 1, ],
|
||||||
|
diff --git a/src/wayland/meta-wayland-dma-buf.c b/src/wayland/meta-wayland-dma-buf.c
|
||||||
|
--- a/src/wayland/meta-wayland-dma-buf.c
|
||||||
|
+++ b/src/wayland/meta-wayland-dma-buf.c
|
||||||
|
@@ -630,11 +630,22 @@ has_modifier (GArray *modifiers,
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef HAVE_NATIVE_BACKEND
|
||||||
|
+static gboolean
|
||||||
|
+async_supports_modifier (MetaKmsPlane *plane,
|
||||||
|
+ uint32_t drm_format,
|
||||||
|
+ uint64_t drm_modifier)
|
||||||
|
+{
|
||||||
|
+ GArray *async_modifiers =
|
||||||
|
+ meta_kms_plane_get_async_modifiers_for_format (plane, drm_format);
|
||||||
|
+ return async_modifiers && has_modifier (async_modifiers, drm_modifier);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
static gboolean
|
||||||
|
crtc_supports_modifier (MetaCrtcKms *crtc_kms,
|
||||||
|
uint32_t drm_format,
|
||||||
|
- uint64_t drm_modifier)
|
||||||
|
+ uint64_t drm_modifier,
|
||||||
|
+ gboolean is_async)
|
||||||
|
{
|
||||||
|
MetaKmsPlane *plane = meta_crtc_kms_get_assigned_primary_plane (crtc_kms);
|
||||||
|
GArray *crtc_modifiers;
|
||||||
@@ -0,0 +1,59 @@
|
|||||||
|
{ lib, pkgs, ... }:
|
||||||
|
|
||||||
|
let
|
||||||
|
# GNOME/mutter!3797, pinned because the MR is still under development.
|
||||||
|
mutterTearingRevision = "a8d56d423edde9e6d76f6b9cab663d82c65cf1a2";
|
||||||
|
mutterTearingPatch = pkgs.fetchurl {
|
||||||
|
url = "https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3797.diff";
|
||||||
|
hash = "sha256-3up5PsHX+BSQRKb9JS5bnJLPaTGmvV55M18tKkepIng=";
|
||||||
|
};
|
||||||
|
in
|
||||||
|
{
|
||||||
|
nixpkgs.overlays = [
|
||||||
|
(final: prev: {
|
||||||
|
mutter = prev.mutter.overrideAttrs (old: {
|
||||||
|
pname = "mutter-tearing";
|
||||||
|
|
||||||
|
# nixpkgs leaves Mutter's verbose topics compiled out by default.
|
||||||
|
# This is required for MUTTER_DEBUG=kms to emit the async commit flags.
|
||||||
|
mesonFlags = (old.mesonFlags or [ ]) ++ [ ];
|
||||||
|
|
||||||
|
# The MR currently targets Mutter 51. Apply it to the packaged Mutter
|
||||||
|
# 50 source, then resolve the four small context conflicts separately.
|
||||||
|
prePatch = ''
|
||||||
|
${old.prePatch or ""}
|
||||||
|
|
||||||
|
set +e
|
||||||
|
patch --batch -p1 --forward < ${mutterTearingPatch}
|
||||||
|
mr_status=$?
|
||||||
|
set -e
|
||||||
|
|
||||||
|
if [ "$mr_status" -ne 0 ]; then
|
||||||
|
reject_count="$(find . -name '*.rej' -type f | wc -l)"
|
||||||
|
if [ "$reject_count" -ne 3 ]; then
|
||||||
|
echo "Unexpected number of Mutter !3797 rejects: $reject_count" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
patch --batch -p1 --forward < ${./mutter-50-tearing-compat.patch}
|
||||||
|
find . -name '*.rej' -type f -delete
|
||||||
|
'';
|
||||||
|
|
||||||
|
passthru = (old.passthru or { }) // {
|
||||||
|
tearingMr = 3797;
|
||||||
|
tearingRevision = mutterTearingRevision;
|
||||||
|
};
|
||||||
|
});
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
|
environment.sessionVariables = {
|
||||||
|
# Mutter keeps tearing support behind an experimental runtime switch.
|
||||||
|
MUTTER_DEBUG_EXPERIMENTAL_FEATURES = lib.mkDefault "tearing";
|
||||||
|
|
||||||
|
# Temporarily expose whether async atomic commits reach KMS or fall back
|
||||||
|
# to synchronized presentation. Remove this after collecting the log.
|
||||||
|
# MUTTER_DEBUG = lib.mkDefault "kms";
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,83 @@
|
|||||||
|
{ config, pkgs, lib, ... }:
|
||||||
|
|
||||||
|
let
|
||||||
|
cfg = config.services.tigervnc;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
options.services.tigervnc = {
|
||||||
|
enable = lib.mkEnableOption "TigerVNC x0vncserver (mirrors :0)";
|
||||||
|
users = lib.mkOption {
|
||||||
|
type = lib.types.attrsOf (lib.types.submodule ({ name, config, ... }: {
|
||||||
|
options = {
|
||||||
|
enableSharing = lib.mkOption { type = lib.types.bool; default = true; };
|
||||||
|
port = lib.mkOption { type = lib.types.int; default = 5901; };
|
||||||
|
localhost = lib.mkOption { type = lib.types.bool; default = false; };
|
||||||
|
#geometry = lib.mkOption { type = lib.types.str; default = ""; };
|
||||||
|
};
|
||||||
|
}));
|
||||||
|
default = { };
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
config = lib.mkIf cfg.enable {
|
||||||
|
environment.systemPackages = [ pkgs.tigervnc pkgs.xhost pkgs.xauth ];
|
||||||
|
|
||||||
|
systemd.user.services = lib.mapAttrs' (user: opts:
|
||||||
|
let svcName = "tigervnc-x0vncserver-${user}";
|
||||||
|
in {
|
||||||
|
name = svcName;
|
||||||
|
value = lib.mkIf opts.enableSharing {
|
||||||
|
description = "TigerVNC x0vncserver sharing :0 for ${user}";
|
||||||
|
after = [ "graphical-session.target" ];
|
||||||
|
partOf = [ "graphical-session.target" ];
|
||||||
|
wantedBy = [ "graphical-session.target" ];
|
||||||
|
|
||||||
|
path = [ pkgs.tigervnc pkgs.xhost pkgs.xauth pkgs.coreutils ];
|
||||||
|
|
||||||
|
script = let
|
||||||
|
# Build args array to avoid shell escaping hell
|
||||||
|
vncArgs = [
|
||||||
|
"-display :0"
|
||||||
|
"-rfbport ${toString opts.port}"
|
||||||
|
"-rfbauth $HOME/.vnc/passwd"
|
||||||
|
"-AcceptSetDesktopSize=0"
|
||||||
|
"-AlwaysShared"
|
||||||
|
] #++ lib.optionals (opts.geometry != "") [ "-Geometry ${opts.geometry}" ]
|
||||||
|
++ lib.optionals opts.localhost [ "-localhost" ];
|
||||||
|
in ''
|
||||||
|
set -euxo pipefail
|
||||||
|
|
||||||
|
# Password check
|
||||||
|
mkdir -p "$HOME/.vnc"
|
||||||
|
if [ ! -r "$HOME/.vnc/passwd" ]; then
|
||||||
|
echo "ERROR: Run: vncpasswd ~/.vnc/passwd" >&2
|
||||||
|
### CHANGE THE > in the above line TO A GREATER THAN SIGN! ###
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# X authority
|
||||||
|
xhost +local:
|
||||||
|
|
||||||
|
# Clean x0vncserver args
|
||||||
|
${pkgs.tigervnc}/bin/x0vncserver ${lib.concatStringsSep " " (map (arg: "${arg}") vncArgs)}
|
||||||
|
'';
|
||||||
|
|
||||||
|
preStop = ''
|
||||||
|
xhost -local:
|
||||||
|
pkill -f "x0vncserver.*${toString opts.port}"
|
||||||
|
'';
|
||||||
|
|
||||||
|
serviceConfig = {
|
||||||
|
Type = "simple";
|
||||||
|
Restart = "always";
|
||||||
|
RestartSec = "5s";
|
||||||
|
RuntimeDirectory = "vnc-${user}";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
|
) cfg.users;
|
||||||
|
|
||||||
|
networking.firewall.allowedTCPPorts =
|
||||||
|
lib.mapAttrsToList (_: opts: opts.port) cfg.users;
|
||||||
|
};
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user