Compare commits
118 Commits
e95ab8bd3e
...
mesa-downg
| Author | SHA1 | Date | |
|---|---|---|---|
| 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 |
408
flake.lock
generated
408
flake.lock
generated
@@ -1,5 +1,80 @@
|
|||||||
{
|
{
|
||||||
"nodes": {
|
"nodes": {
|
||||||
|
"aagl": {
|
||||||
|
"inputs": {
|
||||||
|
"flake-compat": "flake-compat",
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
],
|
||||||
|
"rust-overlay": "rust-overlay"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1774186997,
|
||||||
|
"narHash": "sha256-hyNVlhAqmwcBPl7XRkxbGcMt1BfCOdvuEfBDUf0k8Oo=",
|
||||||
|
"owner": "ezKEa",
|
||||||
|
"repo": "aagl-gtk-on-nix",
|
||||||
|
"rev": "546e95f7ec74892a31f883a10b1723c35f2c2edd",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "ezKEa",
|
||||||
|
"repo": "aagl-gtk-on-nix",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"anikki": {
|
||||||
|
"inputs": {
|
||||||
|
"flake-utils": "flake-utils",
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1766470910,
|
||||||
|
"narHash": "sha256-iY0vJAAjY5ZveB6JIAQDHq7lFrkAVGnO0tC7YOYDFsg=",
|
||||||
|
"owner": "Hion-V",
|
||||||
|
"repo": "Anikki-flake",
|
||||||
|
"rev": "95d15448466142126c7fc13ac1dbdaf58a36a3a5",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "Hion-V",
|
||||||
|
"repo": "Anikki-flake",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"cachyos-kernel": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1776608760,
|
||||||
|
"narHash": "sha256-ehDv8bF7k/2Kf4b8CCoSm51U/MOoFuLsRXqe5wZ57sE=",
|
||||||
|
"owner": "CachyOS",
|
||||||
|
"repo": "linux-cachyos",
|
||||||
|
"rev": "7e06e29005853bbaaa3b1c1067f915d6e0db728a",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "CachyOS",
|
||||||
|
"repo": "linux-cachyos",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"cachyos-kernel-patches": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1776680283,
|
||||||
|
"narHash": "sha256-wSHtct0KwbhFh9xYYp1ABaBsHE/K/1+oyrqHbIdiWFE=",
|
||||||
|
"owner": "CachyOS",
|
||||||
|
"repo": "kernel-patches",
|
||||||
|
"rev": "21c93f820124a8e7046f1e358739e1a14f6b700b",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "CachyOS",
|
||||||
|
"repo": "kernel-patches",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"crane": {
|
"crane": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1754269165,
|
"lastModified": 1754269165,
|
||||||
@@ -16,6 +91,22 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-compat": {
|
"flake-compat": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1767039857,
|
||||||
|
"narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
|
||||||
|
"owner": "edolstra",
|
||||||
|
"repo": "flake-compat",
|
||||||
|
"rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "edolstra",
|
||||||
|
"repo": "flake-compat",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"flake-compat_2": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1747046372,
|
"lastModified": 1747046372,
|
||||||
@@ -31,14 +122,30 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-compat_2": {
|
"flake-compat_3": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1761588595,
|
"lastModified": 1767039857,
|
||||||
"narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
|
"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,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1767039857,
|
||||||
|
"narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
|
||||||
"owner": "edolstra",
|
"owner": "edolstra",
|
||||||
"repo": "flake-compat",
|
"repo": "flake-compat",
|
||||||
"rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
|
"rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -47,7 +154,7 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-compat_3": {
|
"flake-compat_5": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1650374568,
|
"lastModified": 1650374568,
|
||||||
@@ -84,7 +191,62 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"flake-parts_2": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs-lib": "nixpkgs-lib"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1775087534,
|
||||||
|
"narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
|
||||||
|
"owner": "hercules-ci",
|
||||||
|
"repo": "flake-parts",
|
||||||
|
"rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "hercules-ci",
|
||||||
|
"repo": "flake-parts",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"flake-utils": {
|
"flake-utils": {
|
||||||
|
"inputs": {
|
||||||
|
"systems": "systems"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1731533236,
|
||||||
|
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"flake-utils-plus": {
|
||||||
|
"inputs": {
|
||||||
|
"flake-utils": "flake-utils_2"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1715533576,
|
||||||
|
"narHash": "sha256-fT4ppWeCJ0uR300EH3i7kmgRZnAVxrH+XtK09jQWihk=",
|
||||||
|
"owner": "gytis-ivaskevicius",
|
||||||
|
"repo": "flake-utils-plus",
|
||||||
|
"rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "gytis-ivaskevicius",
|
||||||
|
"repo": "flake-utils-plus",
|
||||||
|
"rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"flake-utils_2": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_2"
|
"systems": "systems_2"
|
||||||
},
|
},
|
||||||
@@ -102,35 +264,18 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-utils-plus": {
|
|
||||||
"inputs": {
|
|
||||||
"flake-utils": "flake-utils"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1715533576,
|
|
||||||
"narHash": "sha256-fT4ppWeCJ0uR300EH3i7kmgRZnAVxrH+XtK09jQWihk=",
|
|
||||||
"owner": "gytis-ivaskevicius",
|
|
||||||
"repo": "flake-utils-plus",
|
|
||||||
"rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "gytis-ivaskevicius",
|
|
||||||
"repo": "flake-utils-plus",
|
|
||||||
"rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"game-of-life": {
|
"game-of-life": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": "nixpkgs"
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1728511087,
|
"lastModified": 1771895942,
|
||||||
"narHash": "sha256-CvO74jwMjUUPySy0QCt7sPImbxKlhWcSAet93Fkt6iU=",
|
"narHash": "sha256-2G212O6uoBCjmyIBux/Kfy/FVlsAY+3mTT4JRstYRZ0=",
|
||||||
"owner": "local-interloper",
|
"owner": "local-interloper",
|
||||||
"repo": "game-of-life",
|
"repo": "game-of-life",
|
||||||
"rev": "c39d37e394f5da79a6a7d198e1d7e505aa5298a7",
|
"rev": "dd5cba5d873ece0ca5c8a7d74243b3b0199a2194",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -168,11 +313,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1764361670,
|
"lastModified": 1776777932,
|
||||||
"narHash": "sha256-jgWzgpIaHbL3USIq0gihZeuy1lLf2YSfwvWEwnfAJUw=",
|
"narHash": "sha256-0R3Yow/NzSeVGUke5tL7CCkqmss4Vmi6BbV6idHzq/8=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "780be8ef503a28939cf9dc7996b48ffb1a3e04c6",
|
"rev": "5d5640599a0050b994330328b9fd45709c909720",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -189,11 +334,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1762964643,
|
"lastModified": 1776184304,
|
||||||
"narHash": "sha256-RYHN8O/Aja59XDji6WSJZPkJpYVUfpSkyH+PEupBJqM=",
|
"narHash": "sha256-No6QGBmIv5ChiwKCcbkxjdEQ/RO2ZS1gD7SFy6EZ7rc=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "827f2a23373a774a8805f84ca5344654c31f354b",
|
"rev": "3c7524c68348ef79ce48308e0978611a050089b2",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -202,37 +347,16 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"kwin-effects-forceblur": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixpkgs"
|
|
||||||
],
|
|
||||||
"utils": "utils"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1755098995,
|
|
||||||
"narHash": "sha256-6FN7XEf27DenQHDIKjrjOW3tGIaJlyqRlXarmt1v+M0=",
|
|
||||||
"owner": "taj-ny",
|
|
||||||
"repo": "kwin-effects-forceblur",
|
|
||||||
"rev": "51a1d49d7fd7df3ce40ccf6ba4c4410cf6f510e1",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "taj-ny",
|
|
||||||
"repo": "kwin-effects-forceblur",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"lanzaboote": {
|
"lanzaboote": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"crane": "crane",
|
"crane": "crane",
|
||||||
"flake-compat": "flake-compat",
|
"flake-compat": "flake-compat_2",
|
||||||
"flake-parts": "flake-parts",
|
"flake-parts": "flake-parts",
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
],
|
],
|
||||||
"pre-commit-hooks-nix": "pre-commit-hooks-nix",
|
"pre-commit-hooks-nix": "pre-commit-hooks-nix",
|
||||||
"rust-overlay": "rust-overlay"
|
"rust-overlay": "rust-overlay_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1762205063,
|
"lastModified": 1762205063,
|
||||||
@@ -249,17 +373,42 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixos-wsl": {
|
"nix-cachyos-kernel": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-compat": "flake-compat_2",
|
"cachyos-kernel": "cachyos-kernel",
|
||||||
|
"cachyos-kernel-patches": "cachyos-kernel-patches",
|
||||||
|
"flake-compat": "flake-compat_3",
|
||||||
|
"flake-parts": "flake-parts_2",
|
||||||
"nixpkgs": "nixpkgs_2"
|
"nixpkgs": "nixpkgs_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1764072830,
|
"lastModified": 1776710308,
|
||||||
"narHash": "sha256-ezkjlUCohD9o9c47Ey0/I4CamSS0QEORTqGvyGqMud0=",
|
"narHash": "sha256-rrdCcEXukj2CDjsiOVPYb9LpTKzB89sIicBqoOBK3Xs=",
|
||||||
|
"owner": "xddxdd",
|
||||||
|
"repo": "nix-cachyos-kernel",
|
||||||
|
"rev": "8c8219b1f4822932baea710948da7963f50e9739",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "xddxdd",
|
||||||
|
"ref": "release",
|
||||||
|
"repo": "nix-cachyos-kernel",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixos-wsl": {
|
||||||
|
"inputs": {
|
||||||
|
"flake-compat": "flake-compat_4",
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1776692876,
|
||||||
|
"narHash": "sha256-7Q05rUgwbkJnjxIJyi8bHUG+XnyZqLxFJz7c8RncpeU=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NixOS-WSL",
|
"repo": "NixOS-WSL",
|
||||||
"rev": "c7832dd786175e20f2697179e0e03efadffe4201",
|
"rev": "51b302c28dbf904a5c341be005eebe0779cf4f16",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -271,43 +420,58 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1717179513,
|
"lastModified": 1744536153,
|
||||||
"narHash": "sha256-vboIEwIQojofItm2xGCdZCzW96U85l9nDW3ifMuAIdM=",
|
"narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "63dacb46bf939521bdc93981b4cbb7ecb58427a0",
|
"rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"ref": "24.05",
|
"ref": "nixpkgs-unstable",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nixpkgs-lib": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1774748309,
|
||||||
|
"narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=",
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "nixpkgs.lib",
|
||||||
|
"rev": "333c4e0545a6da976206c74db8773a1645b5870a",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "nixpkgs.lib",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1763678758,
|
"lastModified": 1776635459,
|
||||||
"narHash": "sha256-+hBiJ+kG5IoffUOdlANKFflTT5nO3FrrR2CA3178Y5s=",
|
"narHash": "sha256-3UVWm751p/8VAY1Mq+DgSTCv9HpMmdB2byhnRrVKflk=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "117cc7f94e8072499b0a7aa4c52084fa4e11cc9b",
|
"rev": "8d8538e67e516362d9d09ee5d3ce73dce944612b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"ref": "nixos-unstable",
|
"ref": "nixos-unstable-small",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1764242076,
|
"lastModified": 1776548001,
|
||||||
"narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=",
|
"narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4",
|
"rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -317,22 +481,6 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_4": {
|
|
||||||
"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": {
|
"pre-commit-hooks-nix": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-compat": [
|
"flake-compat": [
|
||||||
@@ -361,20 +509,39 @@
|
|||||||
},
|
},
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
|
"aagl": "aagl",
|
||||||
|
"anikki": "anikki",
|
||||||
"game-of-life": "game-of-life",
|
"game-of-life": "game-of-life",
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"kwin-effects-forceblur": "kwin-effects-forceblur",
|
|
||||||
"lanzaboote": "lanzaboote",
|
"lanzaboote": "lanzaboote",
|
||||||
|
"nix-cachyos-kernel": "nix-cachyos-kernel",
|
||||||
"nixos-wsl": "nixos-wsl",
|
"nixos-wsl": "nixos-wsl",
|
||||||
"nixpkgs": "nixpkgs_3",
|
"nixpkgs": "nixpkgs_3",
|
||||||
"snowfall-lib": "snowfall-lib",
|
"snowfall-lib": "snowfall-lib",
|
||||||
"sops-nix": "sops-nix",
|
"sops-nix": "sops-nix",
|
||||||
"trilium-next-pr": "trilium-next-pr",
|
"trilium-next-pr": "trilium-next-pr",
|
||||||
"wallpaper-engine-plugin-src": "wallpaper-engine-plugin-src",
|
|
||||||
"zen-browser": "zen-browser"
|
"zen-browser": "zen-browser"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"rust-overlay": {
|
"rust-overlay": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": "nixpkgs"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1770952264,
|
||||||
|
"narHash": "sha256-CjymNrJZWBtpavyuTkfPVPaZkwzIzGaf0E/3WgcwM14=",
|
||||||
|
"owner": "oxalica",
|
||||||
|
"repo": "rust-overlay",
|
||||||
|
"rev": "ec6a3d5cdf14bb5a1dd03652bd3f6351004d2188",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "oxalica",
|
||||||
|
"repo": "rust-overlay",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"rust-overlay_2": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"lanzaboote",
|
"lanzaboote",
|
||||||
@@ -397,18 +564,18 @@
|
|||||||
},
|
},
|
||||||
"snowfall-lib": {
|
"snowfall-lib": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-compat": "flake-compat_3",
|
"flake-compat": "flake-compat_5",
|
||||||
"flake-utils-plus": "flake-utils-plus",
|
"flake-utils-plus": "flake-utils-plus",
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1736130495,
|
"lastModified": 1765361626,
|
||||||
"narHash": "sha256-4i9nAJEZFv7vZMmrE0YG55I3Ggrtfo5/T07JEpEZ/RM=",
|
"narHash": "sha256-kX0Dp/kYSRbQ+yd9e3lmmUWdNbipufvKfL2IzbrSpnY=",
|
||||||
"owner": "snowfallorg",
|
"owner": "snowfallorg",
|
||||||
"repo": "lib",
|
"repo": "lib",
|
||||||
"rev": "02d941739f98a09e81f3d2d9b3ab08918958beac",
|
"rev": "c566ad8b7352c30ec3763435de7c8f1c46ebb357",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -424,11 +591,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1764021963,
|
"lastModified": 1776771786,
|
||||||
"narHash": "sha256-1m84V2ROwNEbqeS9t37/mkry23GBhfMt8qb6aHHmjuc=",
|
"narHash": "sha256-DRFGPfFV6hbrfO9a1PH1FkCi7qR5FgjSqsQGGvk1rdI=",
|
||||||
"owner": "mic92",
|
"owner": "mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "c482a1c1bbe030be6688ed7dc84f7213f304f1ec",
|
"rev": "bef289e2248991f7afeb95965c82fbcd8ff72598",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -483,52 +650,19 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"utils": {
|
|
||||||
"inputs": {
|
|
||||||
"systems": "systems"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1726560853,
|
|
||||||
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"wallpaper-engine-plugin-src": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1751185984,
|
|
||||||
"narHash": "sha256-tKeYJvVa8jzbyZ7MQaOuCUJa+UqABolTNe3e5XNw998=",
|
|
||||||
"owner": "catsout",
|
|
||||||
"repo": "wallpaper-engine-kde-plugin",
|
|
||||||
"rev": "9e60b364e268814a1a778549c579ad45a9b9c7bb",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "catsout",
|
|
||||||
"ref": "main",
|
|
||||||
"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": 1776790993,
|
||||||
"narHash": "sha256-pZ2m2JmTTMyqiKB8WSigsSvAeoShI6OSRhzBuRO9SVY=",
|
"narHash": "sha256-TxDU/PFKoOYm+ncWXyI2vurKQPqu54gMlCRzx5sGnZc=",
|
||||||
"owner": "0xc000022070",
|
"owner": "0xc000022070",
|
||||||
"repo": "zen-browser-flake",
|
"repo": "zen-browser-flake",
|
||||||
"rev": "10d2aa53ada9b14f6df2f9877d6a057f0a2b262f",
|
"rev": "3f4f36b17ceeda27fc4953e8bc29637333508c05",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
52
flake.nix
52
flake.nix
@@ -3,39 +3,54 @@
|
|||||||
|
|
||||||
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";
|
trilium-next-pr = {
|
||||||
|
url = "github:FliegendeWurst/nixpkgs/trilium-next";
|
||||||
|
# Don't follow nixpkgs as this repo has its own pinned nixpkgs
|
||||||
|
};
|
||||||
|
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/v0.4.3";
|
||||||
|
|
||||||
# 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";
|
|
||||||
flake = false;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = inputs:
|
outputs = inputs:
|
||||||
@@ -74,14 +89,21 @@
|
|||||||
lib.mkFlake {
|
lib.mkFlake {
|
||||||
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
|
||||||
|
];
|
||||||
|
|
||||||
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;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,8 +22,8 @@ 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.hyfetch
|
pkgs.hyfetch
|
||||||
@@ -32,7 +32,17 @@ in
|
|||||||
# pkgs.vesktop
|
# 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.
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# 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,7 +20,6 @@ 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
|
||||||
|
|||||||
@@ -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
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -2,12 +2,12 @@
|
|||||||
let
|
let
|
||||||
inherit (lib) mkEnableOption mkIf;
|
inherit (lib) mkEnableOption mkIf;
|
||||||
cfg = config.my-namespace.home.vesktop-appimage;
|
cfg = config.my-namespace.home.vesktop-appimage;
|
||||||
vesktopVersion = "1.6.1";
|
vesktopVersion = "1.6.4";
|
||||||
|
|
||||||
vesktopAppImage = pkgs.runCommand "vesktop-appimage" { } ''
|
vesktopAppImage = pkgs.runCommand "vesktop-appimage" { } ''
|
||||||
cp ${pkgs.fetchurl {
|
cp ${pkgs.fetchurl {
|
||||||
url = "https://github.com/Vencord/Vesktop/releases/download/v${vesktopVersion}/Vesktop-${vesktopVersion}.AppImage";
|
url = "https://github.com/Vencord/Vesktop/releases/download/v${vesktopVersion}/Vesktop-${vesktopVersion}.AppImage";
|
||||||
sha256 = "sha256-zK098H7iiOEe5y5YhgsUCPYVQQPcsnZw6/6q6Nx7h+w=";
|
sha256 = "sha256-o7A8DBQyutONeLp5rstq9hQko2xxbvYZvGGM8/YOQ8s=";
|
||||||
}} $out
|
}} $out
|
||||||
chmod +x $out
|
chmod +x $out
|
||||||
'';
|
'';
|
||||||
|
|||||||
24
modules/nixos/cs-tools/default.nix
Normal file
24
modules/nixos/cs-tools/default.nix
Normal file
@@ -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
|
||||||
|
];
|
||||||
|
};
|
||||||
|
}
|
||||||
135
modules/nixos/desktop-environment/default.nix
Normal file
135
modules/nixos/desktop-environment/default.nix
Normal file
@@ -0,0 +1,135 @@
|
|||||||
|
{ config, lib, pkgs, namespace, ... }:
|
||||||
|
|
||||||
|
let
|
||||||
|
cfg = config.${namespace}.desktop-environment;
|
||||||
|
in {
|
||||||
|
|
||||||
|
options.${namespace}.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 = {
|
||||||
|
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
|
||||||
|
gnome-software
|
||||||
|
gnomeExtensions.pop-shell
|
||||||
|
gnome-remote-desktop
|
||||||
|
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.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
|
||||||
|
];
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
|
}
|
||||||
23
modules/nixos/file-organization/default.nix
Normal file
23
modules/nixos/file-organization/default.nix
Normal file
@@ -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
|
||||||
|
];
|
||||||
|
};
|
||||||
|
}
|
||||||
30
modules/nixos/gnome-keyring/default.nix
Normal file
30
modules/nixos/gnome-keyring/default.nix
Normal file
@@ -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
|
||||||
|
];
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -43,7 +43,7 @@ in
|
|||||||
age
|
age
|
||||||
wget
|
wget
|
||||||
sops
|
sops
|
||||||
bitwarden-desktop #replaced bitwarden
|
# bitwarden-desktop #replaced bitwarden
|
||||||
bitwarden-cli
|
bitwarden-cli
|
||||||
cowsay
|
cowsay
|
||||||
remmina
|
remmina
|
||||||
|
|||||||
23
modules/nixos/performance-tuning/default.nix
Normal file
23
modules/nixos/performance-tuning/default.nix
Normal file
@@ -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;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -29,7 +29,6 @@
|
|||||||
# capSysNice = true;
|
# capSysNice = true;
|
||||||
# };
|
# };
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
steam
|
|
||||||
protonup-ng # Tool to install and manage Proton-GE
|
protonup-ng # Tool to install and manage Proton-GE
|
||||||
lutris
|
lutris
|
||||||
vkd3d
|
vkd3d
|
||||||
@@ -38,50 +37,47 @@
|
|||||||
protontricks
|
protontricks
|
||||||
mangohud
|
mangohud
|
||||||
vkbasalt
|
vkbasalt
|
||||||
gamemode
|
gamescope
|
||||||
];
|
];
|
||||||
|
|
||||||
|
hardware.uinput.enable = true;
|
||||||
|
users.users.andreas.extraGroups = [ "input" ];
|
||||||
|
|
||||||
|
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.steam.override {
|
||||||
|
extraPkgs = pkgs: with pkgs; [
|
||||||
|
gamemode
|
||||||
|
];
|
||||||
|
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
|
|
||||||
# ];
|
|
||||||
# };
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
11
overlays/mbedtls-fix/default.nix
Normal file
11
overlays/mbedtls-fix/default.nix
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
{ ... }:
|
||||||
|
|
||||||
|
final: prev: {
|
||||||
|
mbedtls_2 = prev.mbedtls_2.overrideAttrs (oldAttrs: {
|
||||||
|
doCheck = false; # Skip failing PSA crypto tests
|
||||||
|
});
|
||||||
|
|
||||||
|
haxe = prev.haxe.overrideAttrs (oldAttrs: {
|
||||||
|
buildInputs = (oldAttrs.buildInputs or []) ++ [ final.mbedtls_2 ];
|
||||||
|
});
|
||||||
|
}
|
||||||
38
overlays/mesa-gcc/default.nix
Normal file
38
overlays/mesa-gcc/default.nix
Normal file
@@ -0,0 +1,38 @@
|
|||||||
|
{ ... }:
|
||||||
|
|
||||||
|
final: prev: {
|
||||||
|
mesa = (prev.mesa.overrideAttrs (old: rec {
|
||||||
|
version = "git-unstable-2026-04-02";
|
||||||
|
src = prev.fetchFromGitLab {
|
||||||
|
domain = "gitlab.freedesktop.org";
|
||||||
|
owner = "mesa";
|
||||||
|
repo = "mesa";
|
||||||
|
rev = "72e9f9a760a5dd81a74497f1daef054af1b6b827";
|
||||||
|
hash = "sha256-81V5RdLSLYeGJ/wh5H8L6vq+QdR6yMkJxDV+6Yf5FPk=";
|
||||||
|
};
|
||||||
|
patches = [];
|
||||||
|
buildInputs = old.buildInputs ++ (with prev.llvmPackages_21; [
|
||||||
|
clang-unwrapped
|
||||||
|
libclang
|
||||||
|
]);
|
||||||
|
|
||||||
|
# Create symlinks to clang libraries so meson can find them
|
||||||
|
preConfigure = (old.preConfigure or "") + ''
|
||||||
|
mkdir -p $NIX_BUILD_TOP/clang-libs
|
||||||
|
for lib in ${prev.llvmPackages_21.clang-unwrapped.lib}/lib/*.a; do
|
||||||
|
ln -sf "$lib" "$NIX_BUILD_TOP/clang-libs/"
|
||||||
|
done
|
||||||
|
export LIBRARY_PATH="$NIX_BUILD_TOP/clang-libs:''${LIBRARY_PATH:-}"
|
||||||
|
export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
|
||||||
|
'';
|
||||||
|
|
||||||
|
mesonFlags =
|
||||||
|
(builtins.filter (flag:
|
||||||
|
!(prev.lib.hasPrefix "-Dclang-libdir=" flag) &&
|
||||||
|
flag != "--sysconfdir=/etc"
|
||||||
|
) old.mesonFlags) ++ [
|
||||||
|
"-Dsysconfdir=${placeholder "out"}/etc"
|
||||||
|
] ++ (if prev.stdenv.hostPlatform.is64bit then [ "-Dintel-rt=enabled" ] else [ "-Dintel-rt=disabled" ]);
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
43
packages/cs-demo-manager/default.nix
Normal file
43
packages/cs-demo-manager/default.nix
Normal file
@@ -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.extractType2 {
|
||||||
|
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 = [ ];
|
||||||
|
};
|
||||||
|
}
|
||||||
46
packages/droidcam-obs/default.nix
Normal file
46
packages/droidcam-obs/default.nix
Normal file
@@ -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;
|
||||||
|
};
|
||||||
|
}
|
||||||
135
packages/linux-wallpaperengine/default.nix
Normal file
135
packages/linux-wallpaperengine/default.nix
Normal file
@@ -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"
|
||||||
|
};
|
||||||
|
})
|
||||||
@@ -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,19 @@
|
|||||||
# 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 = [
|
||||||
./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.
|
||||||
@@ -44,24 +47,16 @@
|
|||||||
|
|
||||||
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 = false;
|
||||||
displayManager.sddm.wayland.enable = true;
|
displayManager.cosmic-greeter.enable = false;
|
||||||
displayManager.defaultSession = "gnome";
|
displayManager.defaultSession = "gnome";
|
||||||
desktopManager.plasma6.enable = true;
|
|
||||||
|
|
||||||
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 +67,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,38 +91,58 @@
|
|||||||
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
|
ntfs3g
|
||||||
|
htop
|
||||||
|
rivalcfg
|
||||||
|
blender
|
||||||
|
reaper
|
||||||
|
discord
|
||||||
|
betterdiscordctl
|
||||||
];
|
];
|
||||||
environment.etc."xdg/autostart/xwaylandvideobridge.desktop".text = ''
|
environment.etc."xdg/autostart/xwaylandvideobridge.desktop".text = ''
|
||||||
[Desktop Entry]
|
[Desktop Entry]
|
||||||
@@ -179,18 +160,26 @@
|
|||||||
|
|
||||||
services.gvfs.enable = true; # For file manager integration
|
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.
|
||||||
@@ -205,15 +194,47 @@
|
|||||||
# 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
|
53317 #localsend
|
||||||
|
3390 #rdp
|
||||||
|
9090
|
||||||
|
8000
|
||||||
|
40122
|
||||||
];
|
];
|
||||||
networking.firewall.allowedUDPPorts = [
|
networking.firewall.allowedUDPPorts = [
|
||||||
24800 #Synergy
|
24800 #Synergy
|
||||||
53317 #localsend
|
53317 #localsend
|
||||||
|
3390 #rdp
|
||||||
|
9090
|
||||||
|
8000
|
||||||
|
40122
|
||||||
];
|
];
|
||||||
|
networking.firewall.trustedInterfaces = [ "virbr0" ];
|
||||||
|
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;
|
||||||
|
services.mullvad-vpn.package = pkgs.mullvad-vpn;
|
||||||
# Or disable the firewall altogether.
|
# Or disable the firewall altogether.
|
||||||
# networking.firewall.enable = false;
|
# networking.firewall.enable = false;
|
||||||
|
|
||||||
|
|||||||
@@ -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
|
||||||
@@ -35,27 +35,46 @@ in
|
|||||||
imports = [
|
imports = [
|
||||||
./configuration.nix
|
./configuration.nix
|
||||||
./video.nix
|
./video.nix
|
||||||
|
inputs.aagl.nixosModules.default
|
||||||
];
|
];
|
||||||
config = {
|
config = {
|
||||||
system.stateVersion = "24.05";
|
system.stateVersion = "24.05";
|
||||||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
||||||
# 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’.
|
||||||
|
# Desktops
|
||||||
|
my-namespace.desktop-environment.xfce.enable = true;
|
||||||
|
my-namespace.desktop-environment.gnome.enable = true;
|
||||||
|
my-namespace.desktop-environment.kde.enable = true;
|
||||||
|
my-namespace.desktop-environment.hyprland.enable = true;
|
||||||
|
my-namespace.desktop-environment.cosmic.enable = true;
|
||||||
|
my-namespace.performance-tuning.enable = true;
|
||||||
|
my-namespace.file-organization.enable = true;
|
||||||
|
# GNOME-keyring
|
||||||
|
my-namespace.gnome-keyring.enable = true;
|
||||||
|
# CS Tools
|
||||||
|
my-namespace.cs-tools.enable = true;
|
||||||
|
|
||||||
users.users.andreas = {
|
users.users.andreas = {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
description = "Andreas Schaafsma";
|
description = "Andreas Schaafsma";
|
||||||
extraGroups = [ "networkmanager" "wheel" "libvirtd" "plugdev" ] ;
|
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.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
|
||||||
spotify
|
spotify
|
||||||
@@ -64,11 +83,16 @@ in
|
|||||||
trilium-desktop
|
trilium-desktop
|
||||||
terraform
|
terraform
|
||||||
virt-manager
|
virt-manager
|
||||||
|
nil
|
||||||
# thunderbird
|
# thunderbird
|
||||||
];
|
];
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
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;
|
my-namespace.keychron-keyboard.enable = true;
|
||||||
|
|
||||||
# lib.my-namespace.home.stream-tools.enable = true;
|
# lib.my-namespace.home.stream-tools.enable = true;
|
||||||
@@ -86,16 +110,7 @@ in
|
|||||||
];
|
];
|
||||||
# Or disable the firewall altogether.
|
# Or disable the firewall altogether.
|
||||||
# networking.firewall.enable = false;
|
# networking.firewall.enable = false;
|
||||||
programs.gamescope.enable = true;
|
|
||||||
programs.steam.gamescopeSession = {
|
|
||||||
enable = true;
|
|
||||||
args = [
|
|
||||||
"-w" "1920"
|
|
||||||
"-h" "1080"
|
|
||||||
"-r" "172"
|
|
||||||
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
# Install firefox.
|
# Install firefox.
|
||||||
programs.firefox.enable = true;
|
programs.firefox.enable = true;
|
||||||
@@ -113,7 +128,8 @@ in
|
|||||||
mangohud
|
mangohud
|
||||||
my-namespace.udev-steelseries
|
my-namespace.udev-steelseries
|
||||||
my-namespace.hello
|
my-namespace.hello
|
||||||
kde-rounded-corners
|
my-namespace.linux-wallpaperengine
|
||||||
|
|
||||||
(pkgs.writeShellScriptBin "switch-to-desktop" ''
|
(pkgs.writeShellScriptBin "switch-to-desktop" ''
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
# Kill Steam and return to display manager
|
# Kill Steam and return to display manager
|
||||||
@@ -122,26 +138,30 @@ in
|
|||||||
# End the session cleanly
|
# End the session cleanly
|
||||||
loginctl terminate-session "$XDG_SESSION_ID"
|
loginctl terminate-session "$XDG_SESSION_ID"
|
||||||
'')
|
'')
|
||||||
|
|
||||||
(pkgs.writeShellScriptBin "steamos-session-select" ''
|
(pkgs.writeShellScriptBin "steamos-session-select" ''
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
exec switch-to-desktop
|
exec switch-to-desktop
|
||||||
'')
|
'')
|
||||||
# stuff I installed to try to get gamescope to work to no avail Gamescope is just broken it seems.
|
|
||||||
# pkgs.mesa
|
# Vulkan packages for Steam
|
||||||
# pkgs.vulkan-loader
|
mesa
|
||||||
# pkgs.vulkan-validation-layers
|
vulkan-loader
|
||||||
# pkgs.vulkan-extension-layer
|
vulkan-validation-layers
|
||||||
# pkgs.vulkan-tools
|
vulkan-extension-layer
|
||||||
# pkgs.libva
|
vulkan-tools
|
||||||
# pkgs.libva-utils
|
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" ];
|
||||||
@@ -169,6 +189,7 @@ 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.sleep.enable = false;
|
||||||
systemd.targets.suspend.enable = false;
|
systemd.targets.suspend.enable = false;
|
||||||
systemd.targets.hibernate.enable = false;
|
systemd.targets.hibernate.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.
BIN
systems/x86_64-linux/drivebystation-nix/hardware/firmware/U32J59x-edid.bin
Executable file
BIN
systems/x86_64-linux/drivebystation-nix/hardware/firmware/U32J59x-edid.bin
Executable file
Binary file not shown.
@@ -15,29 +15,35 @@
|
|||||||
];
|
];
|
||||||
|
|
||||||
# boot.kernelPackages = pkgs.linuxPackages_latest;
|
# boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||||
|
|
||||||
boot.kernelParams = [
|
boot.kernelParams = [
|
||||||
"console=tty0"
|
"console=tty0"
|
||||||
"efifb=off"
|
# "efifb=off"
|
||||||
"xe.force_probe=*"
|
"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"
|
"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";
|
||||||
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 = {
|
hardware.graphics = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
enable32Bit = true;
|
||||||
|
|
||||||
extraPackages = with pkgs; [
|
extraPackages = with pkgs; [
|
||||||
intel-media-driver # Intel VAAPI
|
intel-media-driver # Intel VAAPI
|
||||||
vpl-gpu-rt # oneVPL runtime
|
vpl-gpu-rt # oneVPL runtime
|
||||||
intel-vaapi-driver # fallback
|
intel-vaapi-driver # fallback
|
||||||
|
intel-compute-runtime # OpenCL/Level Zero
|
||||||
|
level-zero # Level Zero API for compute
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
# Ensure Arc driver is available (usually auto-loaded)
|
# Ensure Arc driver is available (usually auto-loaded)
|
||||||
boot.kernelModules = [ "xe" ];
|
boot.kernelModules = [ "xe" "i915" ];
|
||||||
# Blacklist everything for nvidia
|
# Blacklist everything for nvidia
|
||||||
boot.blacklistedKernelModules = [
|
boot.blacklistedKernelModules = [
|
||||||
"nouveau"
|
"nouveau"
|
||||||
@@ -47,18 +53,81 @@
|
|||||||
"nvidia_uvm"
|
"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 = {
|
environment.variables = {
|
||||||
|
# Force Intel GPU for all graphics operations
|
||||||
KWIN_DRM_DEVICES = "/dev/dri/card0";
|
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
|
## 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
|
## User Access
|
||||||
############################
|
############################
|
||||||
users.users.andreas.extraGroups = [ "video" "render" ];
|
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.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,71 @@
|
|||||||
imports =
|
imports =
|
||||||
[
|
[
|
||||||
(modulesPath + "/installer/scan/not-detected.nix")
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
./graphics/intel.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/563805a1-5277-4488-bbdd-c1a7ed37be76";
|
||||||
fsType = "ext4";
|
fsType = "ext4";
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/boot" = {
|
fileSystems."/boot" = {
|
||||||
device = "/dev/disk/by-uuid/E846-D998";
|
#device = "/dev/disk/by-uuid/E846-D998";
|
||||||
|
device = "/dev/disk/by-uuid/19BE-8BAA";
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
options = [ "fmask=0077" "dmask=0077" ];
|
options = [ "fmask=0077" "dmask=0077" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# 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
|
||||||
@@ -44,6 +84,7 @@
|
|||||||
boot.resumeDevice = "/dev/disk/by-uuid/563805a1-5277-4488-bbdd-c1a7ed37be76"; # the unlocked drive mapping
|
boot.resumeDevice = "/dev/disk/by-uuid/563805a1-5277-4488-bbdd-c1a7ed37be76"; # 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=78399488" #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
|
||||||
|
''
|
||||||
|
)];
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user