Compare commits
3 commits
| Author | SHA1 | Date | |
|---|---|---|---|
b576c8e273
|
|||
|
a08b1e5238
|
|||
|
9c3cdb5691
|
16 changed files with 432 additions and 373 deletions
250
flake.lock
250
flake.lock
|
|
@ -101,6 +101,24 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"firefox": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731773001,
|
||||
"narHash": "sha256-/3tpXzkJqSmJObEilZxeL4Mo1GsyNP0q15kIvw6+GEo=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "bb30e67d1f3e5947d46c86dda2a567d16e9d3f52",
|
||||
"revCount": 3,
|
||||
"type": "git",
|
||||
"url": "https://woof.rip/mikael/firefox.git"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "https://woof.rip/mikael/firefox.git"
|
||||
}
|
||||
},
|
||||
"flake-compat": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
|
@ -190,11 +208,11 @@
|
|||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731533236,
|
||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||
"lastModified": 1726560853,
|
||||
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -207,24 +225,6 @@
|
|||
"inputs": {
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"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_4": {
|
||||
"inputs": {
|
||||
"systems": "systems_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1710146030,
|
||||
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
|
||||
|
|
@ -254,21 +254,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flakey-profile_2": {
|
||||
"locked": {
|
||||
"lastModified": 1712898590,
|
||||
"narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=",
|
||||
"owner": "lf-",
|
||||
"repo": "flakey-profile",
|
||||
"rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "lf-",
|
||||
"repo": "flakey-profile",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"gitignore": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
|
@ -320,11 +305,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1732025103,
|
||||
"narHash": "sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo=",
|
||||
"lastModified": 1731604581,
|
||||
"narHash": "sha256-Qq2YZZaDTB3FZLWU/Hgh1uuWlUBl3cMLGB99bm7rFUM=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "a46e702093a5c46e192243edbd977d5749e7f294",
|
||||
"rev": "1d0862ee2d7c6f6cd720d6f32213fa425004be10",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -347,11 +332,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731941836,
|
||||
"narHash": "sha256-zpmAzrvK8KdssBSwiIwwRxaUJ77oWORbW0XFvgCFpTE=",
|
||||
"lastModified": 1730739295,
|
||||
"narHash": "sha256-aYeJ/P/9AuK6Kee63ZdsmDjEwhnksF+gIv/OyGtlBJE=",
|
||||
"owner": "nix-community",
|
||||
"repo": "lanzaboote",
|
||||
"rev": "2f48272f34174fd2a5ab3df4d8a46919247be879",
|
||||
"rev": "cef39a78679c266300874e7a7000b4da066228d4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -362,14 +347,14 @@
|
|||
},
|
||||
"linux-hardened": {
|
||||
"inputs": {
|
||||
"neoidiosyn": "neoidiosyn"
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1732143490,
|
||||
"narHash": "sha256-nS882w0+Vznq5OFz5W4lX2wl+zv0fXJ0eE0eEPnWPaQ=",
|
||||
"lastModified": 1731676971,
|
||||
"narHash": "sha256-y+WFpBqDlcQN33mDIupZP75AgtgQGrcaAz4zIRsuH6U=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "ab8f4d6ffa5bb1dd155d163375045af2c11a9af3",
|
||||
"revCount": 19,
|
||||
"rev": "ebcc2dd38146a4c15c6f69d95c3873b429589422",
|
||||
"revCount": 17,
|
||||
"type": "git",
|
||||
"url": "https://woof.rip/mikael/linux-hardened.git"
|
||||
},
|
||||
|
|
@ -381,11 +366,11 @@
|
|||
"lix": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1732056932,
|
||||
"narHash": "sha256-3ubtSu0D+BUV5FKmBU7kTEXlI/okp/j1xC/ODC7LgTA=",
|
||||
"rev": "b0d7a816135de1cd551b8a54f5497148bf59d81d",
|
||||
"lastModified": 1731416517,
|
||||
"narHash": "sha256-1LGkwq9g/BfM0JuZmWPYwBX5RiqIpW/BxXcsLwkVcGg=",
|
||||
"rev": "43777939eb2253596ff822771929a8820916fb29",
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/b0d7a816135de1cd551b8a54f5497148bf59d81d.tar.gz?rev=b0d7a816135de1cd551b8a54f5497148bf59d81d"
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/43777939eb2253596ff822771929a8820916fb29.tar.gz?rev=43777939eb2253596ff822771929a8820916fb29"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
|
|
@ -396,33 +381,6 @@
|
|||
"inputs": {
|
||||
"flake-utils": "flake-utils_2",
|
||||
"flakey-profile": "flakey-profile",
|
||||
"lix": [
|
||||
"linux-hardened",
|
||||
"neoidiosyn",
|
||||
"lix"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"linux-hardened",
|
||||
"neoidiosyn",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731967274,
|
||||
"narHash": "sha256-n6dPGRlMGdL8X5gviA6ZuRfUdbdD5KiNN/BpABA5YT0=",
|
||||
"rev": "aa2846680fa9a2032939d720487942567fd9eb63",
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/aa2846680fa9a2032939d720487942567fd9eb63.tar.gz?rev=aa2846680fa9a2032939d720487942567fd9eb63"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz"
|
||||
}
|
||||
},
|
||||
"lix-module_2": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_3",
|
||||
"flakey-profile": "flakey-profile_2",
|
||||
"lix": [
|
||||
"lix"
|
||||
],
|
||||
|
|
@ -431,51 +389,17 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731967274,
|
||||
"narHash": "sha256-n6dPGRlMGdL8X5gviA6ZuRfUdbdD5KiNN/BpABA5YT0=",
|
||||
"rev": "aa2846680fa9a2032939d720487942567fd9eb63",
|
||||
"lastModified": 1731185731,
|
||||
"narHash": "sha256-RNaIu43b9PoXEhW4OqXUNZKY/jezQyCYWwdv1M0VjsA=",
|
||||
"rev": "691193879d96bdfd1e6ab5ebcca2fadc7604cf34",
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/aa2846680fa9a2032939d720487942567fd9eb63.tar.gz?rev=aa2846680fa9a2032939d720487942567fd9eb63"
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/691193879d96bdfd1e6ab5ebcca2fadc7604cf34.tar.gz?rev=691193879d96bdfd1e6ab5ebcca2fadc7604cf34"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz"
|
||||
}
|
||||
},
|
||||
"lix_2": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1732112222,
|
||||
"narHash": "sha256-H7GN4++a4vE49SUNojZx+FSk4mmpb2ifJUtJMJHProI=",
|
||||
"rev": "66f6dbda32959dd5cf3a9aaba15af72d037ab7ff",
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/66f6dbda32959dd5cf3a9aaba15af72d037ab7ff.tar.gz?rev=66f6dbda32959dd5cf3a9aaba15af72d037ab7ff"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"
|
||||
}
|
||||
},
|
||||
"neoidiosyn": {
|
||||
"inputs": {
|
||||
"lix": "lix",
|
||||
"lix-module": "lix-module",
|
||||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1732143208,
|
||||
"narHash": "sha256-PMbA+8Bpjo0AHydBLVW2x/C1SW9LJ6MiCI5ZFCY+ZJc=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "6cd36a603e2360ac7a6389040eaf4ed3a34fbaaa",
|
||||
"revCount": 1,
|
||||
"type": "git",
|
||||
"url": "https://woof.rip/mikael/neoidiosyn.git"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "https://woof.rip/mikael/neoidiosyn.git"
|
||||
}
|
||||
},
|
||||
"niri": {
|
||||
"inputs": {
|
||||
"niri-stable": "niri-stable",
|
||||
|
|
@ -488,11 +412,11 @@
|
|||
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1732127403,
|
||||
"narHash": "sha256-9AzSk5OMhGdlFf1JhmvwWvaTa/q6d+vahh5uJ9Jv8UU=",
|
||||
"lastModified": 1731577605,
|
||||
"narHash": "sha256-gT7+CbsPtNQXHL32Z4fUZinlVWZSgW87qFty9HMsFN4=",
|
||||
"owner": "sodiboo",
|
||||
"repo": "niri-flake",
|
||||
"rev": "ee1ac4ecbe5195ac2d3322089c4581ba848940bb",
|
||||
"rev": "9bd436676472da23fefe06fb07fbb8ff7574a8f3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -521,11 +445,11 @@
|
|||
"niri-unstable": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1732097762,
|
||||
"narHash": "sha256-13TTDVzZAmzbw1xL3m8T9GbpohW+YFvf/BxfPRRFQTI=",
|
||||
"lastModified": 1731575130,
|
||||
"narHash": "sha256-V+bIsYXshtdMv7Ycw1Y/xVfKdWVywXuqHHII7FgV6dg=",
|
||||
"owner": "YaLTeR",
|
||||
"repo": "niri",
|
||||
"rev": "7de752ec565c5b3e4e25fcba1f051cfd639338a2",
|
||||
"rev": "1a0612cbfd0abee0796efa86470226686ae78f21",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -562,11 +486,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731897021,
|
||||
"narHash": "sha256-M3kLX32uTn27kfm/X1RTtTq5Zks6VDGPYCLqMEzjUtA=",
|
||||
"lastModified": 1731291988,
|
||||
"narHash": "sha256-2Gh76VlUV6FKFBGcCw4GjW+xUXfB9fHmQ8dlqQVwwIE=",
|
||||
"owner": "illdefined",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "daa4b9753419986151c11290f96ef67cc789d189",
|
||||
"rev": "95e85dcb96a4622be23ffc71be51b35ba30f7481",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -577,11 +501,11 @@
|
|||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1731797098,
|
||||
"narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=",
|
||||
"lastModified": 1731403644,
|
||||
"narHash": "sha256-T9V7CTucjRZ4Qc6pUEV/kpgNGzQbHWfGcfK6JJLfUeI=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6",
|
||||
"rev": "f6581f1c3b137086e42a08a906bdada63045f991",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -592,11 +516,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1731890469,
|
||||
"narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=",
|
||||
"lastModified": 1731531548,
|
||||
"narHash": "sha256-sz8/v17enkYmfpgeeuyzniGJU0QQBfmAjlemAUYhfy8=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "5083ec887760adfe12af64830a66807423a859a7",
|
||||
"rev": "24f0d4acd634792badd6470134c387a3b039dace",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -624,11 +548,11 @@
|
|||
},
|
||||
"nixpkgs-stable_2": {
|
||||
"locked": {
|
||||
"lastModified": 1731797254,
|
||||
"narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=",
|
||||
"lastModified": 1731386116,
|
||||
"narHash": "sha256-lKA770aUmjPHdTaJWnP3yQ9OI1TigenUqVC3wweqZuI=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59",
|
||||
"rev": "689fed12a013f56d4c4d3f612489634267d86529",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -656,11 +580,27 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1731890469,
|
||||
"narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=",
|
||||
"lastModified": 1731531548,
|
||||
"narHash": "sha256-sz8/v17enkYmfpgeeuyzniGJU0QQBfmAjlemAUYhfy8=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "5083ec887760adfe12af64830a66807423a859a7",
|
||||
"rev": "24f0d4acd634792badd6470134c387a3b039dace",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1731531548,
|
||||
"narHash": "sha256-sz8/v17enkYmfpgeeuyzniGJU0QQBfmAjlemAUYhfy8=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "24f0d4acd634792badd6470134c387a3b039dace",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -672,11 +612,11 @@
|
|||
},
|
||||
"nur": {
|
||||
"locked": {
|
||||
"lastModified": 1732140964,
|
||||
"narHash": "sha256-OrmDjtdoUqsWE7DPwEgn+a3qcPMX21f7uCzMnDjxdFs=",
|
||||
"lastModified": 1731667778,
|
||||
"narHash": "sha256-YGoAGx65+ZB/v/PlBDLF6lefXH2hsirQ/TqXnV/yBIU=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"rev": "a1d4c79a93b4a56127c152f4eec71eee63f8f5e6",
|
||||
"rev": "40254693c3500191c5a375cb4a42d3f0128f8a09",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -740,7 +680,7 @@
|
|||
"inputs": {
|
||||
"advisory-db": "advisory-db",
|
||||
"crane": "crane_2",
|
||||
"flake-utils": "flake-utils_4",
|
||||
"flake-utils": "flake-utils_3",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
|
|
@ -768,15 +708,16 @@
|
|||
"catppuccin": "catppuccin",
|
||||
"catppuccin-palette": "catppuccin-palette",
|
||||
"colmena": "colmena",
|
||||
"firefox": "firefox",
|
||||
"home-manager": "home-manager",
|
||||
"lanzaboote": "lanzaboote",
|
||||
"linux-hardened": "linux-hardened",
|
||||
"lix": "lix_2",
|
||||
"lix-module": "lix-module_2",
|
||||
"lix": "lix",
|
||||
"lix-module": "lix-module",
|
||||
"niri": "niri",
|
||||
"nix-index-database": "nix-index-database",
|
||||
"nixos-hardware": "nixos-hardware",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"nixpkgs": "nixpkgs_3",
|
||||
"nur": "nur",
|
||||
"ripgrep-all": "ripgrep-all",
|
||||
"rust-overlay": "rust-overlay"
|
||||
|
|
@ -789,11 +730,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1732069891,
|
||||
"narHash": "sha256-moKx8AVJrViCSdA0e0nSsG8b1dAsObI4sRAtbqbvBY8=",
|
||||
"lastModified": 1731637922,
|
||||
"narHash": "sha256-6iuzRINXyPX4DfUQZIGafpJnzjFXjVRYMymB10/jFFY=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "8509a51241c407d583b1963d5079585a992506e8",
|
||||
"rev": "db10c66da18e816030b884388545add8cf096647",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -848,21 +789,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_3": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"xwayland-satellite-stable": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
|
|
|||
31
flake.nix
31
flake.nix
|
|
@ -40,6 +40,7 @@
|
|||
};
|
||||
|
||||
linux-hardened.url = "git+https://woof.rip/mikael/linux-hardened.git";
|
||||
firefox.url = "git+https://woof.rip/mikael/firefox.git";
|
||||
|
||||
nix-index-database = {
|
||||
url = "github:illdefined/nix-index-database";
|
||||
|
|
@ -101,12 +102,25 @@
|
|||
};
|
||||
|
||||
overlays = load ./overlay "overlay";
|
||||
legacyPackages = eachSystem (system: platform:
|
||||
import nixpkgs {
|
||||
localSystem = builtins.currentSystem or platform;
|
||||
legacyPackages = eachSystem (system: platform: let
|
||||
pkgs = import nixpkgs {
|
||||
localSystem = {
|
||||
inherit (platform) config;
|
||||
};
|
||||
|
||||
crossSystem = platform;
|
||||
overlays = [ self.overlays.default ];
|
||||
config.allowUnsupportedSystem = true;
|
||||
config = {
|
||||
allowBroken = true;
|
||||
allowUnsupportedSystem = true;
|
||||
};
|
||||
};
|
||||
in pkgs // {
|
||||
config = pkgs.config // {
|
||||
replaceStdenv = { pkgs }: self.lib.stdenv pkgs pkgs.stdenv;
|
||||
/*replaceCrossStdenv = { buildPackages, baseStdenv }:
|
||||
self.lib.stdenv self.legacyPackages.${system} baseStdenv;*/
|
||||
};
|
||||
});
|
||||
|
||||
packages = eachSystem (system: platform:
|
||||
|
|
@ -128,6 +142,15 @@
|
|||
targetHost = config.networking.fqdnOrHostName;
|
||||
targetUser = null;
|
||||
};
|
||||
|
||||
nixpkgs = let
|
||||
platform = self.lib.platforms.x86_64-linux;
|
||||
in {
|
||||
buildPlatform = {
|
||||
inherit (platform) config;
|
||||
};
|
||||
hostPlatform = platform;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ ... }: { config, lib, pkgs, ... }@args:
|
||||
{ firefox, ... }: { config, lib, pkgs, ... }@args:
|
||||
let
|
||||
osConfig = args.osConfig or { };
|
||||
|
||||
|
|
@ -12,7 +12,7 @@ let
|
|||
in lib.mkIf (osConfig.hardware.graphics.enable or false) {
|
||||
programs.firefox = {
|
||||
enable = true;
|
||||
package = pkgs.firefox;
|
||||
package = firefox.packages.${pkgs.system}.firefox;
|
||||
profiles = let
|
||||
extensions = with config.nur.repos.rycee.firefox-addons; [
|
||||
clearurls
|
||||
|
|
@ -30,16 +30,6 @@ in lib.mkIf (osConfig.hardware.graphics.enable or false) {
|
|||
"intl.accept_languages" = "en-gb,en,de,fr,es-es,es,pt,ja";
|
||||
"intl.locale.requested" = "en-GB,en,de,fr,es-ES,es,pt,ja";
|
||||
|
||||
# use OS resolver
|
||||
"network.trr.mode" = 5;
|
||||
|
||||
# force HTTPS
|
||||
"dom.security.https_only_mode" = true;
|
||||
"dom.security.https_only_mode_ever_enabled" = true;
|
||||
|
||||
# enable EME
|
||||
"media.eme.enabled" = true;
|
||||
|
||||
# founts
|
||||
"font.default.x-unicode" = "sans-serif";
|
||||
"font.default.x-western" = "sans-serif";
|
||||
|
|
@ -49,87 +39,7 @@ in lib.mkIf (osConfig.hardware.graphics.enable or false) {
|
|||
"font.name.monospace.x-western" = "Fira Code";
|
||||
|
||||
# hardware acceleration
|
||||
"gfx.webrender.all" = true;
|
||||
"layers.acceleration.force-enabled" = true;
|
||||
"media.ffmpeg.vaapi.enabled" = true;
|
||||
|
||||
# always ask for download location
|
||||
"browser.download.useDownloadDir" = false;
|
||||
|
||||
# disable firefox tab
|
||||
"browser.tabs.firefox-view" = false;
|
||||
|
||||
# disable firefox intro tab
|
||||
"browser.startup.homepage_override.mstone" = "ignore";
|
||||
|
||||
# disable default browser check
|
||||
"browser.shell.checkDefaultBrowser" = false;
|
||||
|
||||
# private containor for new tab page thumbnails
|
||||
"privacy.usercontext.about_newtab_segregation.enabled" = true;
|
||||
|
||||
# disable Beacons API
|
||||
"beacon.enabled" = false;
|
||||
|
||||
# disable pings
|
||||
"browser.send_pings" = false;
|
||||
|
||||
# strip query parameters
|
||||
"privacy.query_stripping" = true;
|
||||
|
||||
# disable access to device sensors
|
||||
"device.sensors.enabled" = false;
|
||||
"dom.battery.enabled" = false;
|
||||
|
||||
# disable media auto‐play
|
||||
"media.autoplay.enabled" = false;
|
||||
|
||||
# block third‐party cookies
|
||||
"network.cookie.cookieBehavior" = 1;
|
||||
|
||||
# spoof referrer header
|
||||
"network.http.referer.spoofSource" = true;
|
||||
|
||||
# isolate all browser identifier sources
|
||||
"privacy.firstparty.isolate" = true;
|
||||
|
||||
# resist fingerprinting
|
||||
#"privacy.resistFingerprinting" = true;
|
||||
|
||||
# enable built‐in tracking protection
|
||||
"privacy.trackingprotection.enabled" = true;
|
||||
"privacy.trackingprotection.emailtracking.enabled" = true;
|
||||
"privacy.trackingprotection.socialtracking.enabled" = true;
|
||||
|
||||
# disable data sharing
|
||||
"app.normandy.enabled" = false;
|
||||
"app.shield.optoutstudies.enabled" = false;
|
||||
"datareporting.healthreport.uploadEnabled" = false;
|
||||
|
||||
# disable safebrowsing
|
||||
"browser.safebrowsing.downloads.enabled" = false;
|
||||
"browser.safebrowsing.malware.enabled" = false;
|
||||
"browser.safebrowsing.phishing.enabled" = false;
|
||||
|
||||
# disable firefox account
|
||||
"identity.fxaccounts.enabled" = false;
|
||||
|
||||
# disable sponsored items
|
||||
"browser.newtabpage.activity-stream.showSponsoredTopSites" = false;
|
||||
"browser.newtabpage.enhanced" = false;
|
||||
|
||||
# disable Pocket
|
||||
"extensions.pocket.enabled" = false;
|
||||
|
||||
# disable crash reporting
|
||||
"browser.tabs.crashReporting.sendReport" = false;
|
||||
"breakpad.reportURL" = "";
|
||||
|
||||
# disable accessibility services
|
||||
"accessibility.force_disabled" = true;
|
||||
|
||||
# disable password auto‐fill
|
||||
"signon.autofillForms" = false;
|
||||
|
||||
# enable user profile customisation
|
||||
"toolkit.legacyUserProfileCustomizations.stylesheets" = true;
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@ in {
|
|||
imports = [
|
||||
nur.hmModules.nur
|
||||
self.homeModules.greedy
|
||||
self.homeModules.locale-en_EU
|
||||
catppuccin.homeManagerModules.catppuccin
|
||||
niri.homeModules.config
|
||||
] ++ self.lib.mods [
|
||||
|
|
@ -212,7 +211,7 @@ in {
|
|||
enable = true;
|
||||
envFile.text = let
|
||||
ls-colours = pkgs.runCommand "ls-colours" { } ''
|
||||
${lib.getExe pkgs.vivid} generate catppuccin-mocha >$out
|
||||
${lib.getExe pkgs.buildPackages.vivid} generate catppuccin-mocha >$out
|
||||
'' |> builtins.readFile;
|
||||
in ''
|
||||
load-env {
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ in lib.mkIf (osConfig.hardware.graphics.enable or false) {
|
|||
};
|
||||
|
||||
services.mopidy = {
|
||||
enable = true;
|
||||
# enable = true;
|
||||
extensionPackages = with pkgs; [
|
||||
mopidy-iris
|
||||
mopidy-local
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
{ ... }: { config, lib, pkgs, ... }@args:
|
||||
{ firefox, ... }: { config, lib, pkgs, ... }@args:
|
||||
let
|
||||
osConfig = args.osConfig or { };
|
||||
in lib.mkIf (osConfig.hardware.graphics.enable or false) {
|
||||
programs.thunderbird = {
|
||||
enable = true;
|
||||
package = pkgs.thunderbird;
|
||||
package = firefox.packages.${pkgs.system}.thunderbird;
|
||||
profiles = { };
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,13 +4,25 @@ let inherit (nixpkgs) lib;
|
|||
in lib.mapAttrs (system: platform: lib.systems.elaborate platform) {
|
||||
"x86_64-linux" = {
|
||||
system = "x86_64-linux";
|
||||
config = "x86_64-unknown-linux-musl";
|
||||
useLLVM = true;
|
||||
linker = "lld";
|
||||
gcc.arch = "x86-64-v3";
|
||||
};
|
||||
|
||||
"aarch64-linux" = {
|
||||
system = "aarch64-linux";
|
||||
config = "aarch64-unknown-linux-musl";
|
||||
useLLVM = true;
|
||||
linker = "lld";
|
||||
gcc.arch = "armv8-a";
|
||||
};
|
||||
|
||||
"riscv64-linux" = {
|
||||
system = "riscv64-linux";
|
||||
config = "riscv64-unknown-linux-gnu";
|
||||
useLLVM = true;
|
||||
linker = "lld";
|
||||
gcc.arch = "rv64imacfd";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
56
lib/stdenv.nix
Normal file
56
lib/stdenv.nix
Normal file
|
|
@ -0,0 +1,56 @@
|
|||
{ ... }: pkgs: stdenv:
|
||||
|
||||
let
|
||||
inherit (lib) optionalAttrs optionals toList;
|
||||
inherit (pkgs) lib;
|
||||
inherit (stdenv) targetPlatform;
|
||||
in pkgs.addAttrsToDerivation (prevAttrs: let
|
||||
overrideAlloc = prevAttrs.overrideAlloc or true;
|
||||
|
||||
inputs = optionals overrideAlloc [ pkgs.mimalloc ];
|
||||
|
||||
cflagsE = [ "-flto" ];
|
||||
cflagsC = [ "-pipe" ];
|
||||
cflagsL = [ /*"-fuse-ld=lld"*/ ];
|
||||
|
||||
ldflags = [
|
||||
"-O2"
|
||||
"--hash-style=gnu"
|
||||
/*"--icf=safe"
|
||||
"--lto-O2"*/
|
||||
] ++ optionals overrideAlloc [ "-lmimalloc" ];
|
||||
|
||||
rustflags = [
|
||||
"-C" "opt-level=2"
|
||||
"-C" "linker-flavor=ld.lld"
|
||||
"-C" "lto"
|
||||
"-C" "linker-plugin-lto"
|
||||
] ++ optionals (targetPlatform.isx86_64 && targetPlatform ? gcc.arch) [
|
||||
"-C" "target-cpu=${targetPlatform.gcc.arch}"
|
||||
] ++ (map (flag: [ "-C" "link-arg=${flag}" ]) ldflags |> lib.flatten);
|
||||
|
||||
goflags = [ "-ldflags=-linkmode=external" ];
|
||||
in {
|
||||
buildInputs = prevAttrs.buildInputs or [ ] ++ inputs;
|
||||
|
||||
env = prevAttrs.env or { } // optionalAttrs (!prevAttrs ? CFLAGS) {
|
||||
CFLAGS = toList prevAttrs.CFLAGS or [ ] ++ cflagsE |> toString;
|
||||
} // optionalAttrs (!prevAttrs ? NIX_CFLAGS_COMPILE) {
|
||||
NIX_CFLAGS_COMPILE = toList prevAttrs.env.NIX_CFLAGS_COMPILE or [ ] ++ cflagsC |> toString;
|
||||
} // optionalAttrs (!prevAttrs ? NIX_CFLAGS_LINK) {
|
||||
NIX_CFLAGS_LINK = toList prevAttrs.env.NIX_CFLAGS_LINK or [ ] ++ cflagsL |> toString;
|
||||
} // optionalAttrs (prevAttrs ? env.NIX_LDFLAGS) {
|
||||
NIX_LDFLAGS = toList prevAttrs.NIX_LDFLAGS or [ ] ++ ldflags |> toString;
|
||||
};
|
||||
|
||||
NIX_RUSTFLAGS = prevAttrs.NIX_RUSTFLAGS or [ ] ++ rustflags;
|
||||
GOFLAGS = prevAttrs.GOFLAGS or [ ] ++ goflags;
|
||||
} // optionalAttrs (prevAttrs ? CFLAGS) {
|
||||
CFLAGS = toList prevAttrs.CFLAGS or [ ] ++ cflagsE;
|
||||
} // optionalAttrs (prevAttrs ? NIX_CFLAGS_COMPILE) {
|
||||
NIX_CFLAGS_COMPILE = toList prevAttrs.NIX_CFLAGS_COMPILE or [ ] ++ cflagsC;
|
||||
} // optionalAttrs (prevAttrs ? NIX_CFLAGS_LINK) {
|
||||
NIX_CFLAGS_LINK = toList prevAttrs.NIX_CFLAGS_LINK or [ ] ++ cflagsL;
|
||||
} // optionalAttrs (!prevAttrs ? env.NIX_LDFLAGS) {
|
||||
NIX_LDFLAGS = toList prevAttrs.NIX_LDFLAGS or [ ] ++ ldflags;
|
||||
}) stdenv
|
||||
|
|
@ -190,7 +190,6 @@ imports = [
|
|||
|
||||
programs.ssh = {
|
||||
knownHosts = {
|
||||
"[build-worker-kyoumanet.fly.dev]:2200".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJUGzlilikAUfUGKXVCoTeDvPRoWUgDDkNU5WaRUBzls";
|
||||
"[build-worker-kyoumanet.fly.dev]:2201".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDL2M97UBHg9aUfjDUxzmzg1r0ga0m3/stummBVwuEAB";
|
||||
"[build-worker-kyoumanet.fly.dev]:2202".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOTwVKL0P0chPM2Gz23rbT94844+w1CGJdCaZdzfjThz";
|
||||
"[build-worker-kyoumanet.fly.dev]:2203".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAjy2eZGJQeAYy0+fLgW9jiS0jVY2LInY0NDMnzCvvKp";
|
||||
|
|
@ -199,17 +198,15 @@ imports = [
|
|||
"[build-worker-kyoumanet.fly.dev]:2206".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGf0kxGgwOG9KhUhvxxTSiQC5YikrzZXKDgSpBw33qN4";
|
||||
"[build-worker-kyoumanet.fly.dev]:2207".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL9z95a6Fn/dB+iNigEYpuJdBnBwCkIZYaKHcFbGP+RY";
|
||||
"[build-worker-kyoumanet.fly.dev]:2208".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAk+FNMhTfAVqk3MfLp4QiG/i5ti53DlpnC0q+sOvU9O";
|
||||
"[build-worker-kyoumanet-cdg.fly.dev]:2209".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJGlQD/3fLn/Kyb7v0RIycHRcArGi75jURj803EMpW0S";
|
||||
"[build-worker-kyoumanet-cdg.fly.dev]:2210".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMQm1FSGBGdCR5f8MvBvdKM0M4yIQVnH1po7hHO5T1qz";
|
||||
"integra.kyouma.net".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIBwEQiSfaDrUAwgul4mktusBPcIVxI4pLNDh9DPopVU";
|
||||
"schrodinger.kyouma.net".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKo7vZ6lS1wx76YsbAdhOsGcc20YMAW52ep8SZ/FCHDp";
|
||||
"zh1830.rsync.net".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJtclizeBy1Uo3D86HpgD3LONGVH0CJ0NT+YfZlldAJd";
|
||||
};
|
||||
|
||||
extraConfig = lib.range 0 10 |> map (num: ''
|
||||
Host build-worker-${lib.fixedWidthNumber 2 num}
|
||||
Hostname build-worker-kyoumanet${lib.optionalString (num > 8) "-cdg"}.fly.dev
|
||||
Port ${toString (2200 + num)}
|
||||
extraConfig = lib.range 1 8 |> map (num: ''
|
||||
Host build-worker-0${toString num}
|
||||
Hostname build-worker-kyoumanet.fly.dev
|
||||
Port 220${toString num}
|
||||
'') |> lib.concatStrings;
|
||||
};
|
||||
|
||||
|
|
|
|||
26
nixos/config/soy.nix
Normal file
26
nixos/config/soy.nix
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{ self, nixos-hardware, ... }: { lib, config, pkgs, ... }: {
|
||||
imports = with self.nixosModules; [
|
||||
default
|
||||
mimalloc
|
||||
physical
|
||||
graphical
|
||||
wireless
|
||||
];
|
||||
|
||||
boot = {
|
||||
binfmt = {
|
||||
emulatedSystems = [ "aarch64-linux" "x86_64-linux" ];
|
||||
preferStaticEmulators = true;
|
||||
};
|
||||
};
|
||||
|
||||
nixpkgs = {
|
||||
hostPlatform = {
|
||||
system = "riscv64-linux";
|
||||
config = "riscv64-unknown-linux-musl";
|
||||
gcc.arch = "rv64imafdc";
|
||||
useLLVM = true;
|
||||
linker = "lld";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -10,7 +10,7 @@
|
|||
ephemeral
|
||||
iosched
|
||||
kernel
|
||||
locale-en_EU
|
||||
musl
|
||||
network
|
||||
nix
|
||||
openssh
|
||||
|
|
|
|||
24
nixos/module/musl.nix
Normal file
24
nixos/module/musl.nix
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
{ ...}: { modulesPath, config, lib, pkgs, ... }: {
|
||||
disabledModules = [
|
||||
(modulesPath + "/config/ldso.nix")
|
||||
(modulesPath + "/config/stub-ld.nix")
|
||||
(modulesPath + "/programs/nix-ld.nix")
|
||||
];
|
||||
|
||||
config = lib.mkIf pkgs.hostPlatform.isMusl {
|
||||
i18n.glibcLocales = pkgs.stdenvNoCC.mkDerivation {
|
||||
pname = "locale-archive-stub";
|
||||
version = "0";
|
||||
|
||||
buildCommand = ''
|
||||
mkdir -p "$out/lib/locale"
|
||||
touch "$out/lib/locale/locale-archive"
|
||||
'';
|
||||
} |> lib.mkDefault;
|
||||
|
||||
i18n.supportedLocales = lib.mkDefault [ ];
|
||||
security.pam.services.login.updateWtmp = lib.mkForce false;
|
||||
services.nscd.enable = lib.mkForce false;
|
||||
system.nssModules = lib.mkForce [ ];
|
||||
};
|
||||
}
|
||||
1
nixos/result
Symbolic link
1
nixos/result
Symbolic link
|
|
@ -0,0 +1 @@
|
|||
/nix/store/y9c8a19hbfqpfinhnd5d5hr1833wjy77-nixos-system-muon-24.11pre-git
|
||||
|
|
@ -1,21 +1,174 @@
|
|||
{ nixpkgs, ... }: final: prev:
|
||||
{ self, nixpkgs, ... }: final: prev:
|
||||
let
|
||||
inherit (nixpkgs) lib;
|
||||
inherit (lib) toList;
|
||||
inherit (prev.stdenv) hostPlatform;
|
||||
in {
|
||||
redis = prev.redis.overrideAttrs {
|
||||
doCheck = false;
|
||||
};
|
||||
inherit (prev.stdenv) buildPlatform hostPlatform;
|
||||
inherit (self.lib) removePackages;
|
||||
|
||||
python312 = prev.python312.override {
|
||||
packageOverrides = final: prev: {
|
||||
pywebview = prev.pywebview.overrideAttrs ({
|
||||
doCheck = false;
|
||||
doInstallCheck = false;
|
||||
prev' = prev;
|
||||
final' = final;
|
||||
in {
|
||||
gst_all_1 = prev.gst_all_1 // {
|
||||
gst-plugins-bad = prev.gst_all_1.gst-plugins-bad.overrideAttrs (prevAttrs: {
|
||||
buildInputs = prevAttrs.buildInputs or [ ] |> removePackages [ "libajantv2" ];
|
||||
});
|
||||
};
|
||||
|
||||
perlPackages = prev.perlPackages.overrideScope (final: prev: {
|
||||
DBI = prev.DBI.overrideAttrs (prevAttrs: {
|
||||
nativeBuildInputs = prevAttrs.nativeBuildInputs or [ ] ++ [
|
||||
final'.stdenv.cc
|
||||
final'.stdenv.cc.binutils
|
||||
];
|
||||
|
||||
makeMakerFlags = prevAttrs.makeMakerFlags or [ ] ++ [
|
||||
"CC=${final'.stdenv.cc.targetPrefix}cc"
|
||||
"LD=${final'.stdenv.cc.targetPrefix}cc"
|
||||
"CCFLAGS=-Doff64_t=off_t"
|
||||
];
|
||||
});
|
||||
});
|
||||
|
||||
bind = prev.bind.overrideAttrs (prevAttrs: {
|
||||
buildInputs = prevAttrs.buildInputs or [ ] |> removePackages [ "jemalloc" ];
|
||||
});
|
||||
|
||||
diffutils = prev.diffutils.overrideAttrs (prevAttrs: {
|
||||
configureFlags = prevAttrs.configureFlags or [ ] ++ [ "--disable-nls" ];
|
||||
|
||||
postPatch = ''
|
||||
sed -E -i 's/test-getopt-(gnu|posix)//g' gnulib-tests/Makefile.in
|
||||
'';
|
||||
});
|
||||
|
||||
gnu-efi = prev.gnu-efi.overrideAttrs (prevAttrs: {
|
||||
nativeBuildInputs = prevAttrs.nativeBuildInputs or [ ] ++ [ final.buildPackages.binutils ];
|
||||
makeFlags = prevAttrs.makeFlags or [ ] ++ [ "CC=${final.stdenv.cc.targetPrefix}cc" ];
|
||||
});
|
||||
|
||||
gsm = prev.gsm.overrideAttrs (prevAttrs: {
|
||||
makeFlags = prevAttrs.makeFlags or [ ] ++ [ "CC=${final.stdenv.cc.targetPrefix}cc" ];
|
||||
});
|
||||
|
||||
keyutils = prev.keyutils.overrideAttrs (prevAttrs: {
|
||||
NIX_LDFLAGS = toList prevAttrs.NIX_LDFLAGS or [ ] ++ [ "--undefined-version" ];
|
||||
});
|
||||
|
||||
kexec-tools = prev.kexec-tools.override { stdenv = final.gccStdenv; };
|
||||
|
||||
level-zero = prev.level-zero.overrideAttrs (prevAttrs: {
|
||||
cmakeFlags = prevAttrs.cmakeFlags or [ ] ++ [ "-DCMAKE_CXX_FLAGS=-Wno-error=deprecated" ];
|
||||
});
|
||||
|
||||
libcdio = prev.libcdio.overrideAttrs (prevAttrs: {
|
||||
nativeBuildInputs = prevAttrs.nativeBuildInputs or [ ] ++ [ final.buildPackages.binutils ];
|
||||
});
|
||||
|
||||
libjpeg = prev.libjpeg.overrideAttrs (prevAttrs: {
|
||||
cmakeFlags = prevAttrs.cmakeFlags or [ ] ++ [ "-DFLOATTEST12=fp-contract" ];
|
||||
});
|
||||
|
||||
liboping = prev.liboping.overrideAttrs (prevAttrs: {
|
||||
configureFlags = prevAttrs.configureFlags or [ ] ++ [
|
||||
"ac_cv_func_malloc_0_nonnull=yes"
|
||||
"ac_cv_func_realloc_0_nonnull=yes"
|
||||
];
|
||||
});
|
||||
|
||||
libselinux = prev.libselinux.override { enablePython = false; };
|
||||
|
||||
liburing = prev.liburing.overrideAttrs (finalAttrs: prevAttrs: {
|
||||
version = "2.8";
|
||||
|
||||
src = final.fetchFromGitHub {
|
||||
owner = "axboe";
|
||||
repo = "liburing";
|
||||
rev = "refs/tags/liburing-${finalAttrs.version}";
|
||||
hash = "sha256-10zmoMDzO41oNRVXE/6FzDGPVRVJTJTARVUmc1b7f+o=";
|
||||
};
|
||||
});
|
||||
|
||||
llvmPackages = prev.llvmPackages // {
|
||||
libcxx = prev.llvmPackages.libcxx.override {
|
||||
devExtraCmakeFlags = [ "-DLIBCXX_HAS_MUSL_LIBC=1" ];
|
||||
};
|
||||
};
|
||||
|
||||
lua = prev.lua.overrideAttrs (prevAttrs: {
|
||||
env = prevAttrs.env or { } // { LD = "${final.stdenv.cc.targetPrefix}ld"; };
|
||||
makeFlags = prevAttrs.makeFlags or [ ] ++ [ "LD=${final.stdenv.cc.targetPrefix}ld" ];
|
||||
});
|
||||
|
||||
netbsd = prev.netbsd.overrideScope (final: prev: {
|
||||
compatIfNeeded = [ final.compat ];
|
||||
|
||||
compat = prev.compat.overrideAttrs (prevAttrs: {
|
||||
makeFlags = prevAttrs.makeFlags ++ [ "OBJCOPY=:" ];
|
||||
});
|
||||
});
|
||||
|
||||
numactl = prev.numactl.overrideAttrs (prevAttrs: {
|
||||
patches = prevAttrs.patches or [ ] ++ [
|
||||
(final.fetchpatch {
|
||||
url = "https://github.com/numactl/numactl/commit/f9deba0c8404529772468d6dd01389f7dbfa5ba9.patch";
|
||||
hash = "sha256-TmWfD99YaSIHA5PSsWHE91GSsdsVgVU+qIow7LOwOGw=";
|
||||
})
|
||||
];
|
||||
});
|
||||
|
||||
python3 = (prev.python3.overrideAttrs (prevAttrs: {
|
||||
env = prevAttrs.env or { } // {
|
||||
LD = "${final.stdenv.cc.bintools}/bin/${final.stdenv.cc.targetPrefix}ld";
|
||||
};
|
||||
|
||||
configureFlags = prevAttrs.configureFlags or [ ] ++ [
|
||||
"LD=${final.stdenv.cc.bintools}/bin/${final.stdenv.cc.targetPrefix}ld"
|
||||
];
|
||||
|
||||
postFixup = prevAttrs.postFixup + ''
|
||||
cat <<EOF >>"$out/nix-support/setup-hook"
|
||||
setuptoolsDistutilsHook() {
|
||||
export SETUPTOOLS_USE_DISTUTILS="stdlib"
|
||||
}
|
||||
|
||||
addEnvHooks "\$hostOffset" setuptoolsDistutilsHook
|
||||
EOF
|
||||
'';
|
||||
})).override {
|
||||
packageOverrides = final: prev: {
|
||||
defusedxml = prev.defusedxml.overrideAttrs {
|
||||
doCheck = false;
|
||||
doInstallCheck = false;
|
||||
};
|
||||
|
||||
html5-parser = prev.html5-parser.overrideAttrs (prevAttrs: {
|
||||
env = prevAttrs.env or { } // {
|
||||
LD = "${final.stdenv.cc.targetPrefix}cc";
|
||||
};
|
||||
});
|
||||
|
||||
netifaces = prev.netifaces.overrideAttrs (prevAttrs: {
|
||||
env = prevAttrs.env or { } // {
|
||||
NIX_CFLAGS_COMPILE = toList prevAttrs.env.NIX_CFLAGS_COMPILE or [ ] ++ [
|
||||
"-Wno-error=int-conversion"
|
||||
] |> toString;
|
||||
};
|
||||
});
|
||||
|
||||
pycparser = prev.pycparser.overrideAttrs {
|
||||
doCheck = false;
|
||||
doInstallCheck = false;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
python3Packages = final.python3.pkgs;
|
||||
|
||||
redis = prev.redis.overrideAttrs { doCheck = false; };
|
||||
|
||||
sane-backends = prev.sane-backends.overrideAttrs (prevAttrs: {
|
||||
buildInputs = prevAttrs.buildInputs or [ ] |> removePackages [ "net-snmp" ];
|
||||
});
|
||||
|
||||
sioyek = prev.sioyek.overrideAttrs (prevAttrs: {
|
||||
env = prevAttrs.env or { } // {
|
||||
|
|
@ -24,10 +177,28 @@ in {
|
|||
};
|
||||
});
|
||||
|
||||
soundtouch = prev.soundtouch.overrideAttrs (prevAttrs: {
|
||||
nativeBuildInputs = prevAttrs.nativeBuildInputs or [ ] ++ [ final.binutils ];
|
||||
});
|
||||
|
||||
time = prev.time.overrideAttrs (prevAttrs: {
|
||||
env = prevAttrs.env or { } // {
|
||||
CFLAGS = toList prevAttrs.env.CFLAGS or [ ] ++ [
|
||||
"-Wno-error=implicit-function-declaration"
|
||||
] |> toString;
|
||||
};
|
||||
});
|
||||
|
||||
usrsctp = prev.usrsctp.overrideAttrs (prevAttrs: {
|
||||
cmakeFlags = prevAttrs.cmakeFlags or [ ] ++ [ "-Dsctp_werror=0" ];
|
||||
});
|
||||
|
||||
zeromq = prev.zeromq.overrideAttrs (prevAttrs: {
|
||||
postPatch = prevAttrs.postPatch or "" + ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail 'CACHELINE_SIZE EQUAL "undefined"' 'CACHELINE_SIZE STREQUAL "undefined"'
|
||||
'';
|
||||
});
|
||||
|
||||
zlib = prev.zlib.override { splitStaticOutput = false; };
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ let
|
|||
inherit (nixpkgs) lib;
|
||||
in {
|
||||
mimalloc = (prev.mimalloc.overrideAttrs (prevAttrs: {
|
||||
overrideAlloc = false;
|
||||
postPatch = prevAttrs.postPatch or "" + ''
|
||||
sed -E -i \
|
||||
-e 's/(\{ )1(, UNINIT, MI_OPTION_LEGACY\(purge_decommits,reset_decommits\) \})/\10\2/' \
|
||||
|
|
@ -15,28 +16,8 @@ in {
|
|||
secureBuild = true;
|
||||
};
|
||||
|
||||
firefox = (final.wrapFirefox final.firefox-unwrapped { }).overrideAttrs (prevAttrs: {
|
||||
buildCommand = prevAttrs.buildCommand + ''
|
||||
sed -i \
|
||||
'$i export MIMALLOC_RESERVE_HUGE_OS_PAGES=2' \
|
||||
"$out/bin/firefox"
|
||||
'';
|
||||
});
|
||||
|
||||
thunderbird = (final.wrapThunderbird final.thunderbird-unwrapped { }).overrideAttrs (prevAttrs: {
|
||||
buildCommand = prevAttrs.buildCommand + ''
|
||||
sed -i \
|
||||
'$i export MIMALLOC_RESERVE_HUGE_OS_PAGES=2' \
|
||||
"$out/bin/thunderbird"
|
||||
'';
|
||||
});
|
||||
|
||||
fractal = prev.fractal.overrideAttrs (prevAttrs: {
|
||||
nativeBuildInputs = prevAttrs.nativeBuildInputs or [ ] ++ [ final.makeBinaryWrapper ];
|
||||
buildInputs = prevAttrs.buildInputs or [ ] ++ [ final.mimalloc ];
|
||||
|
||||
NIX_RUSTFLAGS = lib.toList prevAttrs.NIX_RUSTFLAGS or [ ] ++ [ "-C" "link-arg=-lmimalloc" ];
|
||||
|
||||
postInstall = prevAttrs.postInstall or "" + ''
|
||||
wrapProgram "$out/bin/fractal" \
|
||||
--set MIMALLOC_RESERVE_HUGE_OS_PAGES 1
|
||||
|
|
@ -47,47 +28,8 @@ in {
|
|||
mpv = final.mpv-unwrapped;
|
||||
extraMakeWrapperArgs = [ "--set" "MIMALLOC_RESERVE_HUGE_OS_PAGES" "1" ];
|
||||
};
|
||||
} // lib.genAttrs [
|
||||
"bat"
|
||||
"bottom"
|
||||
"cryptsetup"
|
||||
"dbus-broker"
|
||||
"erlang"
|
||||
"fd"
|
||||
"firefox-unwrapped"
|
||||
"fuzzel"
|
||||
"helix"
|
||||
"kitty"
|
||||
"mako"
|
||||
"mpv-unwrapped"
|
||||
"niri"
|
||||
"nix"
|
||||
"nushell"
|
||||
"openssh"
|
||||
"pipewire"
|
||||
"pueue"
|
||||
"ripgrep"
|
||||
"sd"
|
||||
"sioyek"
|
||||
"sudo-rs"
|
||||
"systemd"
|
||||
"swayidle"
|
||||
"swaylock"
|
||||
"swaylock-effects"
|
||||
"thunderbird-unwrapped"
|
||||
"uutils-coreutils"
|
||||
"uutils-coreutils-noprefix"
|
||||
"waybar"
|
||||
"wirepluber"
|
||||
"xdg-desktop-portal-gnome"
|
||||
"xdg-desktop-portal-gtk"
|
||||
] (pkg: prev.${pkg}.overrideAttrs (prevAttrs: {
|
||||
buildInputs = prevAttrs.buildInputs or [ ] ++ [ final.mimalloc ];
|
||||
env = prevAttrs.env or { } // lib.optionalAttrs (prevAttrs ? env.NIX_LDFLAGS) {
|
||||
NIX_LDFLAGS = toString (lib.toList prevAttrs.env.NIX_LDFLAGS or [ ] ++ [ "-lmimalloc" ]);
|
||||
};
|
||||
|
||||
NIX_RUSTFLAGS = lib.toList prevAttrs.NIX_RUSTFLAGS or [ ] ++ [ "-C" "link-arg=-lmimalloc" ];
|
||||
} // lib.optionalAttrs (!prevAttrs ? env.NIX_LDFLAGS) {
|
||||
NIX_LDFLAGS = lib.toList prevAttrs.NIX_LDFLAGS or [ ] ++ [ "-lmimalloc" ];
|
||||
}))
|
||||
perl = prev.perl.overrideAttrs {
|
||||
overrideAlloc = false;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -91,23 +91,6 @@ in genAttrs [
|
|||
withSsh = false;
|
||||
};
|
||||
|
||||
firefox-unwrapped = (prev.firefox-unwrapped.overrideAttrs (prevAttrs: {
|
||||
buildInputs = prevAttrs.buildInputs or [ ]
|
||||
++ [ final.alsa-lib ];
|
||||
|
||||
configureFlags = prevAttrs.configureFlags or [ ]
|
||||
|> substituteFlags {
|
||||
"--enable-default-toolkit=.*" = "--enable-default-toolkit=cairo-gtk3-wayland-only";
|
||||
};
|
||||
})).override {
|
||||
alsaSupport = false;
|
||||
gssSupport = false;
|
||||
jemallocSupport = false;
|
||||
sndioSupport = false;
|
||||
};
|
||||
|
||||
firefox = final.wrapFirefox final.firefox-unwrapped { };
|
||||
|
||||
gammastep = prev.gammastep.override {
|
||||
withRandr = false;
|
||||
};
|
||||
|
|
@ -344,17 +327,6 @@ in genAttrs [
|
|||
withIptables = false;
|
||||
};
|
||||
|
||||
thunderbird-unwrapped = (prev.thunderbird-unwrapped.overrideAttrs (prevAttrs: {
|
||||
configureFlags = prevAttrs.configureFlags or [ ]
|
||||
|> substituteFlags {
|
||||
"--enable-default-toolkit=.*" = "--enable-default-toolkit=cairo-gtk3-wayland-only";
|
||||
};
|
||||
})).override {
|
||||
jemallocSupport = false;
|
||||
};
|
||||
|
||||
thunderbird = final.wrapThunderbird final.thunderbird-unwrapped { };
|
||||
|
||||
w3m = prev.w3m.override {
|
||||
x11Support = false;
|
||||
imlib2 = final.imlib2;
|
||||
|
|
|
|||
Loading…
Reference in a new issue