Compare commits
1 Commits
main
...
feature/re
| Author | SHA1 | Date | |
|---|---|---|---|
bde6ae6da1
|
@ -1,6 +1,4 @@
|
||||
#!/usr/bin/env bash
|
||||
# shellcheck disable=SC2317
|
||||
# ^ SC2317 (Command appears to be unreachable.)
|
||||
|
||||
set -Exo pipefail
|
||||
|
||||
@ -8,7 +6,6 @@ err=0
|
||||
|
||||
set_error () {
|
||||
err=1
|
||||
pkill -s 0 -9 nix-eval-jobs || true
|
||||
}
|
||||
|
||||
trap set_error ERR
|
||||
@ -19,19 +16,14 @@ system="$(nix eval --impure --raw --expr 'builtins.currentSystem')"
|
||||
run_builds () {
|
||||
for i in "$@" ; do
|
||||
nix-fast-build --eval-workers 1 --no-nom --skip-cache --attic-cache main -f "$i"
|
||||
pkill -s 0 -9 nix-eval-jobs || true
|
||||
done
|
||||
}
|
||||
|
||||
_build_systems () {
|
||||
build_systems () {
|
||||
case "$system" in
|
||||
# TODO this is messy and hard-coded, make an attribute set for
|
||||
# each system containing the specializations as well as the nospec ver
|
||||
x86_64-linux) run_builds \
|
||||
.\#nixosConfigurations.nullbox.config.specialisation.hyprland.configuration.system.build.toplevel \
|
||||
.\#nospec.nullbox.config.system.build.toplevel \
|
||||
.\#nixosConfigurations.slab.config.specialisation.{hyprland,nvidia}.configuration.system.build.toplevel \
|
||||
.\#nospec.slab.config.system.build.toplevel \
|
||||
.\#nixosConfigurations.nullbox.config.system.build.toplevel \
|
||||
.\#nixosConfigurations.slab.config.system.build.toplevel \
|
||||
.\#nixosConfigurations.nixos-wsl.config.system.build.toplevel \
|
||||
;;
|
||||
|
||||
@ -41,23 +33,6 @@ _build_systems () {
|
||||
esac
|
||||
}
|
||||
|
||||
|
||||
|
||||
build_systems () {
|
||||
# system should be set in `nix develop` but just in case
|
||||
local system
|
||||
system="${system:-$(nix eval --impure --raw --expr 'builtins.currentSystem')}"
|
||||
#nix eval --json .#legacyPackages."${system}".specialisedNixosConfigurations --apply 'builtins.attrNames' \
|
||||
# | jq -c '.[]' \
|
||||
# | while read -r line ; do
|
||||
# local build
|
||||
# build="$(printf '%s' "$line" | jq -r)"
|
||||
# run_builds ".#legacyPackages.${system}.specialisedNixosConfigurations.${build}"
|
||||
# done
|
||||
run_builds ".#legacyPackages.${system}.specialisedNixosConfigurations"
|
||||
|
||||
}
|
||||
|
||||
build_packages () {
|
||||
run_builds .\#packages."${system}".redlib
|
||||
}
|
||||
|
||||
238
flake.lock
generated
238
flake.lock
generated
@ -10,11 +10,11 @@
|
||||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1745630506,
|
||||
"narHash": "sha256-bHCFgGeu8XjWlVuaWzi3QONjDW3coZDqSHvnd4l7xus=",
|
||||
"lastModified": 1736955230,
|
||||
"narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=",
|
||||
"owner": "ryantm",
|
||||
"repo": "agenix",
|
||||
"rev": "96e078c646b711aee04b82ba01aefbff87004ded",
|
||||
"rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -43,11 +43,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1744289235,
|
||||
"narHash": "sha256-ZFkHLdimtFzQACsVVyZkZlfYdj4iNy3PkzXfrwmlse8=",
|
||||
"lastModified": 1739298463,
|
||||
"narHash": "sha256-oAFv9jKwwA7d7384d2LeywDSgwhvb3ZnrwbfoWPhXsI=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "aquamarine",
|
||||
"rev": "c8282f4982b56dfa5e9b9f659809da93f8d37e7a",
|
||||
"rev": "f239e5aadd6d23c48e085c2de3397e2058e54d16",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -61,11 +61,11 @@
|
||||
"fromYaml": "fromYaml"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1745523430,
|
||||
"narHash": "sha256-EAYWV+kXbwsH+8G/8UtmcunDeKwLwSOyfcmzZUkWE/c=",
|
||||
"lastModified": 1732200724,
|
||||
"narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=",
|
||||
"owner": "SenchoPens",
|
||||
"repo": "base16.nix",
|
||||
"rev": "58bfe2553d937d8af0564f79d5b950afbef69717",
|
||||
"rev": "153d52373b0fb2d343592871009a286ec8837aec",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -146,11 +146,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1744478979,
|
||||
"narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=",
|
||||
"lastModified": 1700795494,
|
||||
"narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=",
|
||||
"owner": "lnl7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "43975d782b418ebf4969e9ccba82466728c2851b",
|
||||
"rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -163,11 +163,11 @@
|
||||
"firefox-gnome-theme": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1744642301,
|
||||
"narHash": "sha256-5A6LL7T0lttn1vrKsNOKUk9V0ittdW0VEqh6AtefxJ4=",
|
||||
"lastModified": 1739223196,
|
||||
"narHash": "sha256-vAxN2f3rvl5q62gQQjZGVSvF93nAsOxntuFz+e/655w=",
|
||||
"owner": "rafaelmardojai",
|
||||
"repo": "firefox-gnome-theme",
|
||||
"rev": "59e3de00f01e5adb851d824cf7911bd90c31083a",
|
||||
"rev": "a89108e6272426f4eddd93ba17d0ea101c34fb21",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -291,11 +291,11 @@
|
||||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1743550720,
|
||||
"narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
|
||||
"lastModified": 1738453229,
|
||||
"narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "c621e8422220273271f52058f618c94e405bb0f5",
|
||||
"rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -433,11 +433,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1742649964,
|
||||
"narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
|
||||
"lastModified": 1737465171,
|
||||
"narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=",
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
|
||||
"rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -537,11 +537,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1745494811,
|
||||
"narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=",
|
||||
"lastModified": 1703113217,
|
||||
"narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be",
|
||||
"rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -557,11 +557,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1745627989,
|
||||
"narHash": "sha256-mOCdFmxocBPae7wg7RYWOtJzWMJk34u9493ItY0dVqw=",
|
||||
"lastModified": 1740624780,
|
||||
"narHash": "sha256-8TP61AI3QBQsjzVUQFIV8NoB5nbYfJB3iHczhBikDkU=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "4d2d32231797bfa7213ae5e8ac89d25f8caaae82",
|
||||
"rev": "b8869e4ead721bbd4f0d6b927e8395705d4f16e6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -607,11 +607,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1742215578,
|
||||
"narHash": "sha256-zfs71PXVVPEe56WEyNi2TJQPs0wabU4WAlq0XV7GcdE=",
|
||||
"lastModified": 1738664950,
|
||||
"narHash": "sha256-xIeGNM+iivwVHkv9tHwOqoUP5dDrtees34bbFKKMZYs=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprcursor",
|
||||
"rev": "2fd36421c21aa87e2fe3bee11067540ae612f719",
|
||||
"rev": "7c6d165e1eb9045a996551eb9f121b6d1b30adc3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -636,11 +636,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1745015490,
|
||||
"narHash": "sha256-apEJ9zoSzmslhJ2vOKFcXTMZLUFYzh1ghfB6Rbw3Low=",
|
||||
"lastModified": 1739049071,
|
||||
"narHash": "sha256-3+7TpXMrbsUXSwgr5VAKAnmkzMb6JO+Rvc9XRb5NMg4=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprgraphics",
|
||||
"rev": "60754910946b4e2dc1377b967b7156cb989c5873",
|
||||
"rev": "175c6b29b6ff82100539e7c4363a35a02c74dd73",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -661,11 +661,11 @@
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1745357037,
|
||||
"narHash": "sha256-eakUr+0ON1muX3nusJy3eC66unUQtjgnUUzQ5XMIB+k=",
|
||||
"lastModified": 1739465717,
|
||||
"narHash": "sha256-8Ulwr1Z6n5YjM518DYMSHZUbPsZOG53d6QO/bwhb4SA=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hypridle",
|
||||
"rev": "b18d83027676d0efbc6d56ed4a6935ac65d75067",
|
||||
"rev": "3e30a63b5db64a208e9394328a81048044571368",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -690,11 +690,11 @@
|
||||
"xdph": "xdph"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1745593751,
|
||||
"narHash": "sha256-OmAsshc/Z/2hgN9+OK1ZHfEvSkoRC9pROTmxzUTh4QU=",
|
||||
"lastModified": 1740614171,
|
||||
"narHash": "sha256-6fWCR3TLTK39XNy6SDsW4L78VsmwIwi1sO5B8lq24vY=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "742bce016cb848d222fbfcfcf8d3894ea3fdaeff",
|
||||
"revCount": 6028,
|
||||
"rev": "d5920bc5da75b8eaf3476bc814bd46d225709788",
|
||||
"revCount": 5849,
|
||||
"submodules": true,
|
||||
"type": "git",
|
||||
"url": "https://github.com/hyprwm/Hyprland"
|
||||
@ -742,11 +742,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1743714874,
|
||||
"narHash": "sha256-yt8F7NhMFCFHUHy/lNjH/pjZyIDFNk52Q4tivQ31WFo=",
|
||||
"lastModified": 1738422629,
|
||||
"narHash": "sha256-5v+bv75wJWvahyM2xcMTSNNxmV8a7hb01Eey5zYnBJw=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprland-protocols",
|
||||
"rev": "3a5c2bda1c1a4e55cc1330c782547695a93f05b2",
|
||||
"rev": "755aef8dab49d0fc4663c715fa4ad221b2aedaed",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -868,11 +868,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1744468525,
|
||||
"narHash": "sha256-9HySx+EtsbbKlZDlY+naqqOV679VdxP6x6fP3wxDXJk=",
|
||||
"lastModified": 1739048914,
|
||||
"narHash": "sha256-vd5rJBTmp2w7SDgfv23Zcd84ktI5eDA7e5UBzx+pKrU=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprlang",
|
||||
"rev": "f1000c54d266e6e4e9d646df0774fac5b8a652df",
|
||||
"rev": "a7334904d591f38757c46fbe2ab68651877d9099",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -918,11 +918,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1743950287,
|
||||
"narHash": "sha256-/6IAEWyb8gC/NKZElxiHChkouiUOrVYNq9YqG0Pzm4Y=",
|
||||
"lastModified": 1739891528,
|
||||
"narHash": "sha256-h8HOCZ/rw2Buzku+GKF77VXxrGjCSOQkLhptiEKMYg0=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprutils",
|
||||
"rev": "f2dc70e448b994cef627a157ee340135bd68fbc6",
|
||||
"rev": "61a5382f4b1ab578064d470b1b3d3f0df396b8ba",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -968,11 +968,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1739870480,
|
||||
"narHash": "sha256-SiDN5BGxa/1hAsqhgJsS03C3t2QrLgBT8u+ENJ0Qzwc=",
|
||||
"lastModified": 1739049028,
|
||||
"narHash": "sha256-RleJp7LYbr6s+M1xgbmhtBs+fYa3ZdIiF7+QalJ4D1g=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprwayland-scanner",
|
||||
"rev": "206367a08dc5ac4ba7ad31bdca391d098082e64b",
|
||||
"rev": "04146df74a8d5ec0b579657307be01f1e241125f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -988,11 +988,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1743417258,
|
||||
"narHash": "sha256-YItzk1pj8Kz+b7VlC9zN1pSZ6CuX35asYy3HuMQ3lBQ=",
|
||||
"lastModified": 1739465511,
|
||||
"narHash": "sha256-kXdVW89VJoG+W6N1u0m8hgK2VIWUAweQVzehRZwdNSo=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "contrib",
|
||||
"rev": "bc2ad24e0b2e66c3e164994c4897cd94a933fd10",
|
||||
"rev": "59178a657b7e09ddf82b9e79681f482b6c2f378b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1049,11 +1049,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1745120797,
|
||||
"narHash": "sha256-owQ0VQ+7cSanTVPxaZMWEzI22Q4bGnuvhVjLAJBNQ3E=",
|
||||
"lastModified": 1740281615,
|
||||
"narHash": "sha256-dZWcbAQ1sF8oVv+zjSKkPVY0ebwENQEkz5vc6muXbKY=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "69716041f881a2af935021c1182ed5b0cc04d40e",
|
||||
"rev": "465792533d03e6bb9dc849d58ab9d5e31fac9023",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1071,11 +1071,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1745630674,
|
||||
"narHash": "sha256-mMdr7XcmWWjEibSd3nBhyS3MVI23RE6gdJFVT+Q3KCU=",
|
||||
"lastModified": 1740617752,
|
||||
"narHash": "sha256-OTNAtsRtkojQ9qCwPNCjBOTJMAIJLaYk4Ti83IXYSBM=",
|
||||
"owner": "Silveere",
|
||||
"repo": "nix-minecraft",
|
||||
"rev": "bd415685ddbee6ae1ee4ca6cf2252ad5b0c4e6db",
|
||||
"rev": "68b45fd2540ec02ddf696f32e741a536b9cacf95",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1094,11 +1094,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1745632480,
|
||||
"narHash": "sha256-Rjr9Dh33zXciPbSgOSoYoOJ7gpvpJ+wy04WGIUOY+Nw=",
|
||||
"lastModified": 1740620959,
|
||||
"narHash": "sha256-2yp4ipvKG1cZf4OJYelOiDMtZ4qxGn4PPFXlpiVMcuo=",
|
||||
"owner": "infinidoge",
|
||||
"repo": "nix-minecraft",
|
||||
"rev": "ad10d773fc3a39ace88f495c2c111a0bf7f5a481",
|
||||
"rev": "91ee2f20fe2500359ba04f6ca86d39e950345d1f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1115,11 +1115,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1744290088,
|
||||
"narHash": "sha256-/X9XVEl0EiyisNbF5srrxXRSVoRqdwExuqyspYqqEjQ=",
|
||||
"lastModified": 1740567864,
|
||||
"narHash": "sha256-eTS2wrC1jKR6PKXC9jZqQy5PwqbIOBLSLF3dwLiFJ8M=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NixOS-WSL",
|
||||
"rev": "60b4904a1390ac4c89e93d95f6ed928975e525ed",
|
||||
"rev": "1f40b43d01626ce994eb47150afa0d7215f396ca",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1153,11 +1153,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1744932701,
|
||||
"narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=",
|
||||
"lastModified": 1739020877,
|
||||
"narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef",
|
||||
"rev": "a79cfe0ebd24952b580b1cf08cd906354996d547",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1169,17 +1169,14 @@
|
||||
},
|
||||
"nixpkgs-lib": {
|
||||
"locked": {
|
||||
"lastModified": 1743296961,
|
||||
"narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs.lib",
|
||||
"rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa",
|
||||
"type": "github"
|
||||
"lastModified": 1738452942,
|
||||
"narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs.lib",
|
||||
"type": "github"
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
|
||||
}
|
||||
},
|
||||
"nixpkgs-mopidy": {
|
||||
@ -1232,11 +1229,11 @@
|
||||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1745377448,
|
||||
"narHash": "sha256-jhZDfXVKdD7TSEGgzFJQvEEZ2K65UMiqW5YJ2aIqxMA=",
|
||||
"lastModified": 1740547748,
|
||||
"narHash": "sha256-Ly2fBL1LscV+KyCqPRufUBuiw+zmWrlJzpWOWbahplg=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "507b63021ada5fee621b6ca371c4fca9ca46f52c",
|
||||
"rev": "3a05eebede89661660945da1f151959900903b6a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1248,11 +1245,11 @@
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1745487689,
|
||||
"narHash": "sha256-FQoi3R0NjQeBAsEOo49b5tbDPcJSMWc3QhhaIi9eddw=",
|
||||
"lastModified": 1740463929,
|
||||
"narHash": "sha256-4Xhu/3aUdCKeLfdteEHMegx5ooKQvwPHNkOgNCXQrvc=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "5630cf13cceac06cefe9fc607e8dfa8fb342dde3",
|
||||
"rev": "5d7db4668d7a0c6cc5fc8cf6ef33b008b2b1ed8b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1272,11 +1269,11 @@
|
||||
"treefmt-nix": "treefmt-nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1745459908,
|
||||
"narHash": "sha256-bWqgohVf/py9EW3bLS/dYbenD2p9N2/Qsw1+CJk1S04=",
|
||||
"lastModified": 1740408283,
|
||||
"narHash": "sha256-2xECnhgF3MU9YjmvOkrRp8wRFo2OjjewgCtlfckhL5s=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"rev": "dbc4ba3233b2bf951521177bf0ee0a7679959035",
|
||||
"rev": "496a4a11162bdffb9a7b258942de138873f019f7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1295,11 +1292,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1742649964,
|
||||
"narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
|
||||
"lastModified": 1737465171,
|
||||
"narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=",
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
|
||||
"rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1360,8 +1357,7 @@
|
||||
"rust-overlay": "rust-overlay_2",
|
||||
"stylix": "stylix",
|
||||
"systems": "systems_7",
|
||||
"treefmt-nix": "treefmt-nix_2",
|
||||
"zen-browser": "zen-browser"
|
||||
"treefmt-nix": "treefmt-nix_2"
|
||||
}
|
||||
},
|
||||
"rust-overlay": {
|
||||
@ -1392,11 +1388,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1745634793,
|
||||
"narHash": "sha256-8AuOyfLNlcbLy0AqERSNUUoDdY+3THZI7+9VrXUfGqg=",
|
||||
"lastModified": 1740623427,
|
||||
"narHash": "sha256-3SdPQrZoa4odlScFDUHd4CUPQ/R1gtH4Mq9u8CBiK8M=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "f1aeaeb91ba9c88f235ab82bd23d7a4931fe736c",
|
||||
"rev": "d342e8b5fd88421ff982f383c853f0fc78a847ab",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1433,11 +1429,11 @@
|
||||
"tinted-zed": "tinted-zed"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1745618823,
|
||||
"narHash": "sha256-WGKSI0+CY3Ep2YnRASmBRU8oMIvTW4ngFyjA0dVcKgQ=",
|
||||
"lastModified": 1740644467,
|
||||
"narHash": "sha256-i2ArXwncE2OmneLBllo5OlpLB2UsXU5JX+T+7or5OX4=",
|
||||
"owner": "danth",
|
||||
"repo": "stylix",
|
||||
"rev": "11ceb2fde1901dc227421bbbef2d0800339f5126",
|
||||
"rev": "e7c09d206680e6fe6771e1ac9a83515313feaf95",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1588,11 +1584,11 @@
|
||||
"tinted-schemes": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1744974599,
|
||||
"narHash": "sha256-Fg+rdGs5FAgfkYNCs74lnl8vkQmiZVdBsziyPhVqrlY=",
|
||||
"lastModified": 1740351358,
|
||||
"narHash": "sha256-Hdk850xgAd3DL8KX0AbyU7tC834d3Lej1jOo3duWiOA=",
|
||||
"owner": "tinted-theming",
|
||||
"repo": "schemes",
|
||||
"rev": "28c26a621123ad4ebd5bbfb34ab39421c0144bdd",
|
||||
"rev": "a1bc2bd89e693e7e3f5764cfe8114e2ae150e184",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1604,11 +1600,11 @@
|
||||
"tinted-tmux": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1745111349,
|
||||
"narHash": "sha256-udV+nHdpqgkJI9D0mtvvAzbqubt9jdifS/KhTTbJ45w=",
|
||||
"lastModified": 1740272597,
|
||||
"narHash": "sha256-/etfUV3HzAaLW3RSJVwUaW8ULbMn3v6wbTlXSKbcoWQ=",
|
||||
"owner": "tinted-theming",
|
||||
"repo": "tinted-tmux",
|
||||
"rev": "e009f18a01182b63559fb28f1c786eb027c3dee9",
|
||||
"rev": "b6c7f46c8718cc484f2db8b485b06e2a98304cd0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1662,11 +1658,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1744961264,
|
||||
"narHash": "sha256-aRmUh0AMwcbdjJHnytg1e5h5ECcaWtIFQa6d9gI85AI=",
|
||||
"lastModified": 1739829690,
|
||||
"narHash": "sha256-mL1szCeIsjh6Khn3nH2cYtwO5YXG6gBiTw1A30iGeDU=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "8d404a69efe76146368885110f29a2ca3700bee6",
|
||||
"rev": "3d0579f5cc93436052d94b73925b48973a104204",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1703,11 +1699,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1744644585,
|
||||
"narHash": "sha256-p0D/e4J6Sv6GSb+9u8OQcVHSE2gPNYB5ygIfGDyEiXQ=",
|
||||
"lastModified": 1737634991,
|
||||
"narHash": "sha256-dBAnb7Kbnier30cA7AgxVSxxARmxKZ1vHZT33THSIr8=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "xdg-desktop-portal-hyprland",
|
||||
"rev": "be6771e754345f18244fb00aae5c9e5ab21ccc26",
|
||||
"rev": "e09dfe2726c8008f983e45a0aa1a3b7416aaeb8a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1715,26 +1711,6 @@
|
||||
"repo": "xdg-desktop-portal-hyprland",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"zen-browser": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs-unstable"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1745121923,
|
||||
"narHash": "sha256-8X9JuDfxAEQlBhB0ARgFj9fbDOlCvPx6AbQ1h2T47/g=",
|
||||
"owner": "youwen5",
|
||||
"repo": "zen-browser-flake",
|
||||
"rev": "02084a38e9dbc4fa17f3474c3e9d43bb7db55799",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "youwen5",
|
||||
"repo": "zen-browser-flake",
|
||||
"type": "github"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
|
||||
79
flake.nix
79
flake.nix
@ -85,11 +85,6 @@
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
zen-browser = {
|
||||
url = "github:youwen5/zen-browser-flake";
|
||||
inputs.nixpkgs.follows = "nixpkgs-unstable";
|
||||
};
|
||||
|
||||
rust-overlay = {
|
||||
url = "github:oxalica/rust-overlay";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
@ -155,7 +150,6 @@
|
||||
|
||||
perSystem = {
|
||||
config,
|
||||
system,
|
||||
pkgs,
|
||||
self',
|
||||
...
|
||||
@ -166,49 +160,9 @@
|
||||
};
|
||||
};
|
||||
|
||||
legacyPackages.specialisedNixosConfigurations = let
|
||||
attrs = lib.pipe self.nixosConfigurations [
|
||||
(lib.filterAttrs (n: v: !(builtins.elem n ["iso" "rpi4-x86_64"])))
|
||||
(lib.filterAttrs (n: v: v.pkgs.system or "" == system))
|
||||
(lib.mapAttrs' (configName: v: let
|
||||
nospec =
|
||||
(v.extendModules {
|
||||
modules = [
|
||||
({lib, ...}: {
|
||||
config.specialisation = lib.mkForce {};
|
||||
})
|
||||
];
|
||||
})
|
||||
.config;
|
||||
configs =
|
||||
(
|
||||
lib.mapAttrs'
|
||||
(n: v: lib.nameValuePair "specialisation-${n}" v.configuration)
|
||||
v.config.specialisation
|
||||
)
|
||||
// {inherit nospec;};
|
||||
in
|
||||
lib.nameValuePair configName configs))
|
||||
(
|
||||
lib.concatMapAttrs (
|
||||
configName: v:
|
||||
(
|
||||
lib.mapAttrs' (
|
||||
specName: v: lib.nameValuePair "${configName}--${specName}" v
|
||||
)
|
||||
)
|
||||
v
|
||||
)
|
||||
)
|
||||
(lib.mapAttrs (_: v: v.system.build.toplevel))
|
||||
];
|
||||
in
|
||||
attrs;
|
||||
|
||||
devShells = {
|
||||
ci = pkgs.mkShell {
|
||||
buildInputs = with pkgs; [
|
||||
jq
|
||||
nix-update
|
||||
nix-fast-build
|
||||
];
|
||||
@ -262,28 +216,6 @@
|
||||
inherit (packages) mopidy-autoplay google-fonts;
|
||||
atool-wrapped = packages.atool;
|
||||
};
|
||||
|
||||
zen-browser-overlay = final: prev: let
|
||||
inherit (final) system callPackage;
|
||||
|
||||
input = inputs.zen-browser;
|
||||
packages = input.packages.${system};
|
||||
sources = builtins.fromJSON (builtins.readFile (input + "/sources.json"));
|
||||
|
||||
warnExists = name: value: let
|
||||
pass =
|
||||
if prev ? ${name}
|
||||
then builtins.warn "zen-browser-overlay: Package `${name}` already exists. This overlay is no longer needed and should be removed." value
|
||||
else value;
|
||||
in
|
||||
pass;
|
||||
in {
|
||||
zen-browser-bin = callPackage packages.zen-browser.override {};
|
||||
zen-browser-unwrapped = warnExists "zen-browser-unwrapped" (callPackage packages.zen-browser-unwrapped.override {
|
||||
inherit (sources.${system}) hash url;
|
||||
inherit (sources) version;
|
||||
});
|
||||
};
|
||||
in [
|
||||
# TODO delete this, transfer all packages to new-packages overlay
|
||||
packagesOverlay
|
||||
@ -302,7 +234,6 @@
|
||||
inputs.rust-overlay.overlays.default
|
||||
inputs.nixfiles-assets.overlays.default
|
||||
nix-minecraft-patched-overlay
|
||||
zen-browser-overlay
|
||||
];
|
||||
|
||||
systems = {
|
||||
@ -369,16 +300,6 @@
|
||||
iso = mkISOSystem "x86_64-linux";
|
||||
}; # end nixosConfigurations
|
||||
|
||||
nospec = lib.mapAttrs (n: v:
|
||||
v.extendModules {
|
||||
modules = [
|
||||
(
|
||||
{lib, ...}: {specialisation = lib.mkForce {};}
|
||||
)
|
||||
];
|
||||
})
|
||||
config.flake.nixosConfigurations;
|
||||
|
||||
homeConfigurations = {
|
||||
# minimal root config
|
||||
"root@rpi4" = mkHome {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
inputs,
|
||||
self,
|
||||
...
|
||||
}: let
|
||||
} @ flakeArgs: let
|
||||
cfg = config.nixfiles.systems;
|
||||
inherit
|
||||
(lib)
|
||||
@ -227,14 +227,22 @@ in {
|
||||
++ lib.optional config.wsl wslModule;
|
||||
extraConfig = {
|
||||
inherit (config) system modules;
|
||||
# TODO get rid of specialArgs and pass things as a module
|
||||
specialArgs = let
|
||||
inherit (self) outputs;
|
||||
in {
|
||||
inherit inputs outputs;
|
||||
inherit (outerConfig.nixfiles) vars;
|
||||
specialArgs = {
|
||||
# TODO this is temporary, i prefer to not use specialArgs because
|
||||
# it can't be exported. these are still better than my clunky
|
||||
# "vars" arg that i would arbitrarily add things to.
|
||||
#
|
||||
# we need to merge all of the module args like this because the
|
||||
# module evaluator only calls each module with the args it asks
|
||||
# for, but we explicitly want *all* args to be made available.
|
||||
flakeArgs = outerConfig._module.args // outerConfig._module.specialArgs // flakeArgs;
|
||||
|
||||
# still unsure of what the best way to deal with this is. i can
|
||||
# probably pass this submodule's args for a fairly clean way to
|
||||
# pass it, but i'd want to refactor it because config.nixpkgs and
|
||||
# config.home-manager.input are named inconsistently
|
||||
inherit (config) nixpkgs;
|
||||
inherit (config.home-manager) input;
|
||||
home-manager = config.home-manager.input;
|
||||
};
|
||||
};
|
||||
result = config.nixpkgs.lib.nixosSystem config.extraConfig;
|
||||
|
||||
@ -7,6 +7,10 @@
|
||||
...
|
||||
}: let
|
||||
cfg = config.nixfiles.packageSets.communication;
|
||||
rustdesk-pkg =
|
||||
if (lib.strings.hasInfix "23.11" lib.version)
|
||||
then inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.rustdesk-flutter
|
||||
else pkgs.rustdesk-flutter;
|
||||
|
||||
vesktop-ozone-cmd = let
|
||||
extraFlags = lib.optionalString config.nixfiles.workarounds.nvidiaPrimary " --disable-gpu";
|
||||
@ -48,7 +52,7 @@ in {
|
||||
signal-desktop
|
||||
thunderbird
|
||||
vesktop
|
||||
rustdesk-flutter
|
||||
rustdesk-pkg
|
||||
tor-browser
|
||||
onionshare
|
||||
]
|
||||
|
||||
@ -13,7 +13,6 @@ in {
|
||||
libreoffice-fresh
|
||||
obsidian
|
||||
anki
|
||||
zen-browser-bin
|
||||
|
||||
# mapping/GIS
|
||||
qgis
|
||||
|
||||
@ -2,9 +2,11 @@
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
vars,
|
||||
flakeConfig,
|
||||
...
|
||||
}: {
|
||||
}: let
|
||||
inherit (flakeConfig.nixfiles) vars;
|
||||
in {
|
||||
config = {
|
||||
networking.hostName = "nixos-wsl";
|
||||
|
||||
|
||||
@ -6,7 +6,6 @@
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
inputs,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
|
||||
@ -33,7 +33,6 @@ okbuddyhetero
|
||||
peepeeshart
|
||||
pressureroblox
|
||||
prismlauncher
|
||||
programmingcirclejerk
|
||||
regretevator
|
||||
rust
|
||||
rustjerk
|
||||
|
||||
@ -6,7 +6,6 @@
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
vars,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
|
||||
# TODO mkif stylix.enable; danth/stylix#216
|
||||
home.pointerCursor = lib.mkIf (config.nixfiles.theming.enable && !config.stylix.enable) {size = 32;};
|
||||
stylix.cursor = lib.mkIf config.stylix.enable {size = 32;};
|
||||
stylix.cursor = {size = 32;};
|
||||
|
||||
nixfiles.theming.catppuccin.themeDPI = "hdpi";
|
||||
|
||||
|
||||
@ -9,10 +9,7 @@
|
||||
# not high priority, this still works well for this overlay.
|
||||
nixfiles = self;
|
||||
overlay = final: prev: let
|
||||
pkgsStable = import nixfiles.inputs.nixpkgs.outPath {
|
||||
inherit (prev) system;
|
||||
config.allowUnfree = true;
|
||||
};
|
||||
pkgsStable = import nixfiles.inputs.nixpkgs.outPath {inherit (prev) system;};
|
||||
updateTime = nixfiles.inputs.nixpkgs-unstable.lastModified;
|
||||
|
||||
inherit (final) callPackage fetchFromGitHub;
|
||||
@ -82,25 +79,11 @@
|
||||
in
|
||||
hold now 7 stable unstable;
|
||||
|
||||
gotenberg = let
|
||||
stable = pkgsStable.gotenberg;
|
||||
unstable = prev.gotenberg;
|
||||
now = 1745707083;
|
||||
in
|
||||
hold now 90 stable unstable;
|
||||
|
||||
redlib = let
|
||||
redlib-new = final.callPackage nixfiles.packages.${prev.system}.redlib.override {};
|
||||
inherit (prev) redlib;
|
||||
in
|
||||
pickNewer redlib-new redlib;
|
||||
|
||||
rustdesk-flutter = let
|
||||
stable = pkgsStable.rustdesk-flutter;
|
||||
unstable = prev.rustdesk-flutter;
|
||||
now = 1741899501;
|
||||
in
|
||||
hold now 7 stable unstable;
|
||||
}
|
||||
// (
|
||||
lib.genAttrs [
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
}:
|
||||
buildNpmPackage rec {
|
||||
pname = "cross-seed";
|
||||
version = "6.11.2";
|
||||
version = "6.11.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "cross-seed";
|
||||
repo = "cross-seed";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-m/TlEAW9BFEXOvBixOj09ylgstgHKL48e9zC50fzD5g=";
|
||||
hash = "sha256-+bIRLoiY9+23GUuKxPpKK23cb4Dng5nwxh3SUzMAtXA=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-c8wTvEA7QQb17gBHdBKMUatn8I/wKOhXP1W5ftH3pJc=";
|
||||
npmDepsHash = "sha256-gNsD6+4+PIcygL/QCznecd5bVnLyorVJfHM/+cLG4og=";
|
||||
}
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "redlib";
|
||||
version = "0.35.1-unstable-2025-03-01";
|
||||
version = "0.35.1-unstable-2025-02-18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "redlib-org";
|
||||
repo = "redlib";
|
||||
rev = "357e7c2e096c1aa3bb871e42860dfd3be62e0bfb";
|
||||
hash = "sha256-KX76kq3AX+GI8wIulGixgS5cENlNUcrKaes1dZwRhxI=";
|
||||
rev = "efcf2fc24c455acdf2ddc4adc8d20606883aa118";
|
||||
hash = "sha256-tcazjCxioVg13BexUnuybWKG/zaXo4xBAvb7BSvpShI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
|
||||
./no-hash.patch
|
||||
];
|
||||
|
||||
cargoHash = "sha256-5cwF+pntkAwtTwerYrJOfL4NRcL8Sb7lLZiajNcvSZY=";
|
||||
cargoHash = "sha256-aQmMKXBEymvz44hwDyB7z8M4mQR0hcOHJnZ7rlJsuIw=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
|
||||
@ -3,10 +3,11 @@
|
||||
lib,
|
||||
config,
|
||||
options,
|
||||
inputs,
|
||||
flakeArgs,
|
||||
nixpkgs,
|
||||
...
|
||||
}: let
|
||||
inherit (flakeArgs) inputs;
|
||||
cfg = config.nixfiles.common.nix;
|
||||
in {
|
||||
options.nixfiles.common.nix = {
|
||||
|
||||
@ -3,9 +3,9 @@
|
||||
config,
|
||||
lib,
|
||||
options,
|
||||
flakeArgs,
|
||||
nixpkgs,
|
||||
home-manager,
|
||||
inputs,
|
||||
utils,
|
||||
...
|
||||
} @ args:
|
||||
@ -14,8 +14,15 @@
|
||||
# inputs/outputs/overlays/etc into scope. this might even make nixfiles
|
||||
# portable (it still shouldn't be imported by other flakes probably)
|
||||
let
|
||||
inherit (flakeArgs) inputs;
|
||||
|
||||
cfg = config.nixfiles;
|
||||
flakeType = cfg.lib.types.flake;
|
||||
mkReadOnlyOption = {...} @ args:
|
||||
lib.mkOption ({
|
||||
readOnly = true;
|
||||
}
|
||||
// args);
|
||||
in {
|
||||
imports = [
|
||||
./common
|
||||
@ -35,7 +42,15 @@ in {
|
||||
inputs.lanzaboote.nixosModules.lanzaboote
|
||||
./stylix.nix # imports inputs.stylix
|
||||
];
|
||||
config = {};
|
||||
config = {
|
||||
_module.args.flakeConfig = flakeArgs.config;
|
||||
};
|
||||
options.debug = {
|
||||
args = mkReadOnlyOption {
|
||||
description = "all module args";
|
||||
default = config._module.args // config._module.specialArgs // args;
|
||||
};
|
||||
};
|
||||
options.nixfiles = {
|
||||
meta.wayland = lib.mkOption {
|
||||
description = "Whether to prefer wayland applications and configuration";
|
||||
@ -44,12 +59,6 @@ in {
|
||||
type = lib.types.bool;
|
||||
};
|
||||
|
||||
utils = lib.mkOption {
|
||||
description = "nixpkgs `utils` argument passthrough";
|
||||
default = utils;
|
||||
readOnly = true;
|
||||
};
|
||||
|
||||
workarounds.nvidiaPrimary = lib.mkOption {
|
||||
description = "Whether to enable workarounds for NVIDIA as the primary GPU";
|
||||
default = false;
|
||||
|
||||
@ -2,11 +2,12 @@
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
inputs,
|
||||
flakeArgs,
|
||||
...
|
||||
}: let
|
||||
cfg = config.nixfiles.hardware.sound;
|
||||
inherit (flakeArgs) inputs;
|
||||
inherit (lib) optionals mkEnableOption mkIf mkDefault;
|
||||
cfg = config.nixfiles.hardware.sound;
|
||||
in {
|
||||
# Enable sound.
|
||||
# sound.enable = true;
|
||||
|
||||
@ -2,9 +2,11 @@
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
inputs,
|
||||
flakeArgs,
|
||||
...
|
||||
}: {
|
||||
}: let
|
||||
inherit (flakeArgs) inputs;
|
||||
in {
|
||||
imports = [
|
||||
inputs.nix-minecraft.nixosModules.minecraft-servers
|
||||
];
|
||||
|
||||
@ -1,11 +1,10 @@
|
||||
{
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
inputs,
|
||||
nixpkgs,
|
||||
flakeArgs,
|
||||
...
|
||||
}: let
|
||||
inherit (flakeArgs) inputs;
|
||||
p5 = config.services.xserver.desktopManager.plasma5.enable;
|
||||
p6 = config.services.desktopManager.plasma6.enable;
|
||||
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
inputs,
|
||||
...
|
||||
}: let
|
||||
cfg = config.nixfiles.packageSets.gaming;
|
||||
|
||||
@ -2,9 +2,6 @@
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
options,
|
||||
inputs,
|
||||
outputs,
|
||||
...
|
||||
} @ args: let
|
||||
cfg = config.nixfiles.profile.base;
|
||||
|
||||
@ -2,10 +2,10 @@
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
outputs,
|
||||
vars,
|
||||
flakeConfig,
|
||||
...
|
||||
} @ args: let
|
||||
inherit (flakeConfig.nixfiles) vars;
|
||||
cfg = config.nixfiles.programs.adb;
|
||||
in {
|
||||
options.nixfiles.programs.adb = {
|
||||
|
||||
@ -79,13 +79,11 @@ in {
|
||||
# here instead of above.)
|
||||
programs.regreet = let
|
||||
# lets us use wlr-randr
|
||||
wrapperPackage =
|
||||
{inherit (pkgs.greetd.regreet) version;}
|
||||
// (pkgs.writeShellScriptBin "regreet-wrapper" ''
|
||||
${cfg.settings.graphicalInit}
|
||||
wrapperPackage = pkgs.writeShellScriptBin "regreet-wrapper" ''
|
||||
${cfg.settings.graphicalInit}
|
||||
|
||||
exec ${escapeShellArg (lib.getExe pkgs.greetd.regreet)} "$@"
|
||||
'');
|
||||
exec ${escapeShellArg (lib.getExe pkgs.greetd.regreet)} "$@"
|
||||
'';
|
||||
in
|
||||
lib.mkIf cfg.presets.regreet.enable {
|
||||
enable = lib.mkDefault true;
|
||||
|
||||
@ -2,9 +2,10 @@
|
||||
lib,
|
||||
pkgs,
|
||||
config,
|
||||
inputs,
|
||||
flakeArgs,
|
||||
...
|
||||
}: let
|
||||
inherit (flakeArgs) inputs;
|
||||
cfg = config.nixfiles.sessions.hyprland;
|
||||
flake-package = inputs.hyprland.packages.${pkgs.system}.hyprland;
|
||||
flake-portal = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland;
|
||||
|
||||
@ -2,9 +2,11 @@
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
inputs,
|
||||
flakeArgs,
|
||||
...
|
||||
} @ args: {
|
||||
} @ args: let
|
||||
inherit (flakeArgs) inputs;
|
||||
in {
|
||||
imports = [inputs.stylix.nixosModules.stylix];
|
||||
|
||||
config = {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user