Compare commits
3 commits
Author | SHA1 | Date | |
---|---|---|---|
b576c8e273 | |||
a08b1e5238 | |||
9c3cdb5691 |
18 changed files with 438 additions and 400 deletions
254
flake.lock
254
flake.lock
|
@ -18,11 +18,11 @@
|
||||||
},
|
},
|
||||||
"catppuccin": {
|
"catppuccin": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732838231,
|
"lastModified": 1731232837,
|
||||||
"narHash": "sha256-KJTRqfEcGpONBK/6BkMdWmbGth0r/nYWY3k/rvZl4es=",
|
"narHash": "sha256-0aIwr/RC/oe7rYkfJb47xjdEQDSNcqpFGsEa+EPlDEs=",
|
||||||
"owner": "catppuccin",
|
"owner": "catppuccin",
|
||||||
"repo": "nix",
|
"repo": "nix",
|
||||||
"rev": "becc64812c8d6af24dedc2f75c5c63ebf778a115",
|
"rev": "32359bf226fe874d3b7a0a5753d291a4da9616fe",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -101,24 +101,22 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"eosyn": {
|
"firefox": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"lix": "lix",
|
|
||||||
"lix-module": "lix-module",
|
|
||||||
"nixpkgs": "nixpkgs"
|
"nixpkgs": "nixpkgs"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732909782,
|
"lastModified": 1731773001,
|
||||||
"narHash": "sha256-DG4+Leg/w3tnlPXGd+d31OGna+sgGwMFdb9l3mpRjy0=",
|
"narHash": "sha256-/3tpXzkJqSmJObEilZxeL4Mo1GsyNP0q15kIvw6+GEo=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "a9198f5ea57c3b95ba59812071593634a3e951de",
|
"rev": "bb30e67d1f3e5947d46c86dda2a567d16e9d3f52",
|
||||||
"revCount": 1,
|
"revCount": 3,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://woof.rip/mikael/eosyn.git"
|
"url": "https://woof.rip/mikael/firefox.git"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://woof.rip/mikael/eosyn.git"
|
"url": "https://woof.rip/mikael/firefox.git"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-compat": {
|
"flake-compat": {
|
||||||
|
@ -210,11 +208,11 @@
|
||||||
"systems": "systems"
|
"systems": "systems"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731533236,
|
"lastModified": 1726560853,
|
||||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "flake-utils",
|
"repo": "flake-utils",
|
||||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -227,24 +225,6 @@
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_2"
|
"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": {
|
"locked": {
|
||||||
"lastModified": 1710146030,
|
"lastModified": 1710146030,
|
||||||
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
|
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
|
||||||
|
@ -274,21 +254,6 @@
|
||||||
"type": "github"
|
"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": {
|
"gitignore": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
|
@ -340,11 +305,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732884235,
|
"lastModified": 1731604581,
|
||||||
"narHash": "sha256-r8j6R3nrvwbT1aUp4EPQ1KC7gm0pu9VcV1aNaB+XG6Q=",
|
"narHash": "sha256-Qq2YZZaDTB3FZLWU/Hgh1uuWlUBl3cMLGB99bm7rFUM=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "819f682269f4e002884702b87e445c82840c68f2",
|
"rev": "1d0862ee2d7c6f6cd720d6f32213fa425004be10",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -367,11 +332,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731941836,
|
"lastModified": 1730739295,
|
||||||
"narHash": "sha256-zpmAzrvK8KdssBSwiIwwRxaUJ77oWORbW0XFvgCFpTE=",
|
"narHash": "sha256-aYeJ/P/9AuK6Kee63ZdsmDjEwhnksF+gIv/OyGtlBJE=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "lanzaboote",
|
"repo": "lanzaboote",
|
||||||
"rev": "2f48272f34174fd2a5ab3df4d8a46919247be879",
|
"rev": "cef39a78679c266300874e7a7000b4da066228d4",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -382,14 +347,14 @@
|
||||||
},
|
},
|
||||||
"linux-hardened": {
|
"linux-hardened": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"eosyn": "eosyn"
|
"nixpkgs": "nixpkgs_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732909813,
|
"lastModified": 1731676971,
|
||||||
"narHash": "sha256-ZCvLGTLcZTe77w9B7rpRwXeoG8cbJdJpzwnekJfbniM=",
|
"narHash": "sha256-y+WFpBqDlcQN33mDIupZP75AgtgQGrcaAz4zIRsuH6U=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "9d970140b0946985e77740188caa9c2f05835c72",
|
"rev": "ebcc2dd38146a4c15c6f69d95c3873b429589422",
|
||||||
"revCount": 21,
|
"revCount": 17,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://woof.rip/mikael/linux-hardened.git"
|
"url": "https://woof.rip/mikael/linux-hardened.git"
|
||||||
},
|
},
|
||||||
|
@ -401,11 +366,11 @@
|
||||||
"lix": {
|
"lix": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732806742,
|
"lastModified": 1731416517,
|
||||||
"narHash": "sha256-2RNOVB3UIIxxjiFKrEqSgnSoHK+olbw2o5g/63dDjJ8=",
|
"narHash": "sha256-1LGkwq9g/BfM0JuZmWPYwBX5RiqIpW/BxXcsLwkVcGg=",
|
||||||
"rev": "f5754dc90ae9b1207656d0e29ad2704d3ef1e554",
|
"rev": "43777939eb2253596ff822771929a8820916fb29",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/f5754dc90ae9b1207656d0e29ad2704d3ef1e554.tar.gz?rev=f5754dc90ae9b1207656d0e29ad2704d3ef1e554"
|
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/43777939eb2253596ff822771929a8820916fb29.tar.gz?rev=43777939eb2253596ff822771929a8820916fb29"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
|
@ -416,33 +381,6 @@
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils_2",
|
"flake-utils": "flake-utils_2",
|
||||||
"flakey-profile": "flakey-profile",
|
"flakey-profile": "flakey-profile",
|
||||||
"lix": [
|
|
||||||
"linux-hardened",
|
|
||||||
"eosyn",
|
|
||||||
"lix"
|
|
||||||
],
|
|
||||||
"nixpkgs": [
|
|
||||||
"linux-hardened",
|
|
||||||
"eosyn",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1732603698,
|
|
||||||
"narHash": "sha256-Jw2MhzgCCrKV2MJytehG0cCLIAosBX71p8qmQ6XQlR4=",
|
|
||||||
"rev": "15b999f9c958c475f71fb8c543b9fc2f36ae8730",
|
|
||||||
"type": "tarball",
|
|
||||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/15b999f9c958c475f71fb8c543b9fc2f36ae8730.tar.gz?rev=15b999f9c958c475f71fb8c543b9fc2f36ae8730"
|
|
||||||
},
|
|
||||||
"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": [
|
||||||
"lix"
|
"lix"
|
||||||
],
|
],
|
||||||
|
@ -451,31 +389,17 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732603698,
|
"lastModified": 1731185731,
|
||||||
"narHash": "sha256-Jw2MhzgCCrKV2MJytehG0cCLIAosBX71p8qmQ6XQlR4=",
|
"narHash": "sha256-RNaIu43b9PoXEhW4OqXUNZKY/jezQyCYWwdv1M0VjsA=",
|
||||||
"rev": "15b999f9c958c475f71fb8c543b9fc2f36ae8730",
|
"rev": "691193879d96bdfd1e6ab5ebcca2fadc7604cf34",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/15b999f9c958c475f71fb8c543b9fc2f36ae8730.tar.gz?rev=15b999f9c958c475f71fb8c543b9fc2f36ae8730"
|
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/691193879d96bdfd1e6ab5ebcca2fadc7604cf34.tar.gz?rev=691193879d96bdfd1e6ab5ebcca2fadc7604cf34"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz"
|
"url": "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"lix_2": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1732899308,
|
|
||||||
"narHash": "sha256-1jsQqcbMbaWuFim3sqEUdB1/E2KqHa0+cHbTzd/GYFE=",
|
|
||||||
"rev": "2e5780ebc848f3b021f11dd94533b0b68362d989",
|
|
||||||
"type": "tarball",
|
|
||||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2e5780ebc848f3b021f11dd94533b0b68362d989.tar.gz?rev=2e5780ebc848f3b021f11dd94533b0b68362d989"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"type": "tarball",
|
|
||||||
"url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"niri": {
|
"niri": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"niri-stable": "niri-stable",
|
"niri-stable": "niri-stable",
|
||||||
|
@ -488,11 +412,11 @@
|
||||||
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
|
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732865666,
|
"lastModified": 1731577605,
|
||||||
"narHash": "sha256-pw34Z4Js8SlmshJKzd+NmH6CC9gm1Nu+I9nvsOneaHY=",
|
"narHash": "sha256-gT7+CbsPtNQXHL32Z4fUZinlVWZSgW87qFty9HMsFN4=",
|
||||||
"owner": "sodiboo",
|
"owner": "sodiboo",
|
||||||
"repo": "niri-flake",
|
"repo": "niri-flake",
|
||||||
"rev": "1ff204f0c8a5230720bf755bf09209e7ffd03bac",
|
"rev": "9bd436676472da23fefe06fb07fbb8ff7574a8f3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -504,16 +428,16 @@
|
||||||
"niri-stable": {
|
"niri-stable": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731483594,
|
"lastModified": 1731164272,
|
||||||
"narHash": "sha256-Qjf7alRbPPERfiZsM9EMKX+HwjESky1tieh5PJIkLwE=",
|
"narHash": "sha256-ea15x8+AAm90aeU1zNWXzX7ZfenzQRUgORyjOdn4Uoc=",
|
||||||
"owner": "YaLTeR",
|
"owner": "YaLTeR",
|
||||||
"repo": "niri",
|
"repo": "niri",
|
||||||
"rev": "75c79116a7e40cbc0e110ce0cdd500e896458679",
|
"rev": "9d8f640503819ff1905c9040d3c7910a50400bbd",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "YaLTeR",
|
"owner": "YaLTeR",
|
||||||
"ref": "v0.1.10.1",
|
"ref": "v0.1.10",
|
||||||
"repo": "niri",
|
"repo": "niri",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
@ -521,11 +445,11 @@
|
||||||
"niri-unstable": {
|
"niri-unstable": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732861988,
|
"lastModified": 1731575130,
|
||||||
"narHash": "sha256-PUZSyL8LYdtglzPEgUK0vD3VsfVSrrpdLJOgzA3v67k=",
|
"narHash": "sha256-V+bIsYXshtdMv7Ycw1Y/xVfKdWVywXuqHHII7FgV6dg=",
|
||||||
"owner": "YaLTeR",
|
"owner": "YaLTeR",
|
||||||
"repo": "niri",
|
"repo": "niri",
|
||||||
"rev": "39a9f55205ccb87b06e5f992f2db97800d6ce853",
|
"rev": "1a0612cbfd0abee0796efa86470226686ae78f21",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -562,11 +486,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732501818,
|
"lastModified": 1731291988,
|
||||||
"narHash": "sha256-Lq5ym34/A3CwRPSYNJJtXgRwzl8vduT/B3uYl2CGIyo=",
|
"narHash": "sha256-2Gh76VlUV6FKFBGcCw4GjW+xUXfB9fHmQ8dlqQVwwIE=",
|
||||||
"owner": "illdefined",
|
"owner": "illdefined",
|
||||||
"repo": "nix-index-database",
|
"repo": "nix-index-database",
|
||||||
"rev": "19bb855118125b63fbce87df710001bff257b035",
|
"rev": "95e85dcb96a4622be23ffc71be51b35ba30f7481",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -577,11 +501,11 @@
|
||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732483221,
|
"lastModified": 1731403644,
|
||||||
"narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=",
|
"narHash": "sha256-T9V7CTucjRZ4Qc6pUEV/kpgNGzQbHWfGcfK6JJLfUeI=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405",
|
"rev": "f6581f1c3b137086e42a08a906bdada63045f991",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -592,11 +516,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732617236,
|
"lastModified": 1731531548,
|
||||||
"narHash": "sha256-PYkz6U0bSEaEB1al7O1XsqVNeSNS+s3NVclJw7YC43w=",
|
"narHash": "sha256-sz8/v17enkYmfpgeeuyzniGJU0QQBfmAjlemAUYhfy8=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "af51545ec9a44eadf3fe3547610a5cdd882bc34e",
|
"rev": "24f0d4acd634792badd6470134c387a3b039dace",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -624,11 +548,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-stable_2": {
|
"nixpkgs-stable_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732749044,
|
"lastModified": 1731386116,
|
||||||
"narHash": "sha256-T38FQOg0BV5M8FN1712fovzNakSOENEYs+CSkg31C9Y=",
|
"narHash": "sha256-lKA770aUmjPHdTaJWnP3yQ9OI1TigenUqVC3wweqZuI=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "0c5b4ecbed5b155b705336aa96d878e55acd8685",
|
"rev": "689fed12a013f56d4c4d3f612489634267d86529",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -656,11 +580,27 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732617236,
|
"lastModified": 1731531548,
|
||||||
"narHash": "sha256-PYkz6U0bSEaEB1al7O1XsqVNeSNS+s3NVclJw7YC43w=",
|
"narHash": "sha256-sz8/v17enkYmfpgeeuyzniGJU0QQBfmAjlemAUYhfy8=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "af51545ec9a44eadf3fe3547610a5cdd882bc34e",
|
"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"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -672,11 +612,11 @@
|
||||||
},
|
},
|
||||||
"nur": {
|
"nur": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732909490,
|
"lastModified": 1731667778,
|
||||||
"narHash": "sha256-ov9YvDdaB+kdrvL1Qsh5esv646bldkHeADInqr8YVjk=",
|
"narHash": "sha256-YGoAGx65+ZB/v/PlBDLF6lefXH2hsirQ/TqXnV/yBIU=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NUR",
|
"repo": "NUR",
|
||||||
"rev": "2c2351efdee742e0a90da08d597c34b119287abe",
|
"rev": "40254693c3500191c5a375cb4a42d3f0128f8a09",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -740,7 +680,7 @@
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"advisory-db": "advisory-db",
|
"advisory-db": "advisory-db",
|
||||||
"crane": "crane_2",
|
"crane": "crane_2",
|
||||||
"flake-utils": "flake-utils_4",
|
"flake-utils": "flake-utils_3",
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
],
|
],
|
||||||
|
@ -750,11 +690,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732657257,
|
"lastModified": 1728907998,
|
||||||
"narHash": "sha256-yE9rYPwP/oZIql890hYJqFzah0fY9cX5Z+JNf/UVouw=",
|
"narHash": "sha256-RTGG2pnCwe2mFjJ7FNyuBZFvWSJbIQKK93GRlhyYD6c=",
|
||||||
"owner": "phiresky",
|
"owner": "phiresky",
|
||||||
"repo": "ripgrep-all",
|
"repo": "ripgrep-all",
|
||||||
"rev": "108eaead32b54b3dd010570f53fb1247c9a8f63f",
|
"rev": "b4dbe1b8e802a8139cca33a4640ed99fded5cbe3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -768,15 +708,16 @@
|
||||||
"catppuccin": "catppuccin",
|
"catppuccin": "catppuccin",
|
||||||
"catppuccin-palette": "catppuccin-palette",
|
"catppuccin-palette": "catppuccin-palette",
|
||||||
"colmena": "colmena",
|
"colmena": "colmena",
|
||||||
|
"firefox": "firefox",
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"lanzaboote": "lanzaboote",
|
"lanzaboote": "lanzaboote",
|
||||||
"linux-hardened": "linux-hardened",
|
"linux-hardened": "linux-hardened",
|
||||||
"lix": "lix_2",
|
"lix": "lix",
|
||||||
"lix-module": "lix-module_2",
|
"lix-module": "lix-module",
|
||||||
"niri": "niri",
|
"niri": "niri",
|
||||||
"nix-index-database": "nix-index-database",
|
"nix-index-database": "nix-index-database",
|
||||||
"nixos-hardware": "nixos-hardware",
|
"nixos-hardware": "nixos-hardware",
|
||||||
"nixpkgs": "nixpkgs_2",
|
"nixpkgs": "nixpkgs_3",
|
||||||
"nur": "nur",
|
"nur": "nur",
|
||||||
"ripgrep-all": "ripgrep-all",
|
"ripgrep-all": "ripgrep-all",
|
||||||
"rust-overlay": "rust-overlay"
|
"rust-overlay": "rust-overlay"
|
||||||
|
@ -789,11 +730,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732847586,
|
"lastModified": 1731637922,
|
||||||
"narHash": "sha256-SnHHSBNZ+aj8mRzYxb6yXBl9ei3K3j5agC/D8Vjw/no=",
|
"narHash": "sha256-6iuzRINXyPX4DfUQZIGafpJnzjFXjVRYMymB10/jFFY=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "97210ddff72fe139815f4c1ac5da74b5b0dde2d7",
|
"rev": "db10c66da18e816030b884388545add8cf096647",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -848,21 +789,6 @@
|
||||||
"type": "github"
|
"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": {
|
"xwayland-satellite-stable": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
|
@ -883,11 +809,11 @@
|
||||||
"xwayland-satellite-unstable": {
|
"xwayland-satellite-unstable": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732233710,
|
"lastModified": 1731123454,
|
||||||
"narHash": "sha256-gWf9dX6DVx0ssK2G3yrFG9yMT9UU0mDwyD51z/Q6FTA=",
|
"narHash": "sha256-W1UUok7DPi4IXCYtc273FbVH1ifuCIcl+oO6CDqt8Dk=",
|
||||||
"owner": "Supreeeme",
|
"owner": "Supreeeme",
|
||||||
"repo": "xwayland-satellite",
|
"repo": "xwayland-satellite",
|
||||||
"rev": "02f30546264ff8407cbb39528b3a3cc3045e53c1",
|
"rev": "3e6f892d20d918479e67d1e6c90c4be824a9d4ab",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
31
flake.nix
31
flake.nix
|
@ -40,6 +40,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
linux-hardened.url = "git+https://woof.rip/mikael/linux-hardened.git";
|
linux-hardened.url = "git+https://woof.rip/mikael/linux-hardened.git";
|
||||||
|
firefox.url = "git+https://woof.rip/mikael/firefox.git";
|
||||||
|
|
||||||
nix-index-database = {
|
nix-index-database = {
|
||||||
url = "github:illdefined/nix-index-database";
|
url = "github:illdefined/nix-index-database";
|
||||||
|
@ -101,12 +102,25 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
overlays = load ./overlay "overlay";
|
overlays = load ./overlay "overlay";
|
||||||
legacyPackages = eachSystem (system: platform:
|
legacyPackages = eachSystem (system: platform: let
|
||||||
import nixpkgs {
|
pkgs = import nixpkgs {
|
||||||
localSystem = builtins.currentSystem or platform;
|
localSystem = {
|
||||||
|
inherit (platform) config;
|
||||||
|
};
|
||||||
|
|
||||||
crossSystem = platform;
|
crossSystem = platform;
|
||||||
overlays = [ self.overlays.default ];
|
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:
|
packages = eachSystem (system: platform:
|
||||||
|
@ -128,6 +142,15 @@
|
||||||
targetHost = config.networking.fqdnOrHostName;
|
targetHost = config.networking.fqdnOrHostName;
|
||||||
targetUser = null;
|
targetUser = null;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
nixpkgs = let
|
||||||
|
platform = self.lib.platforms.x86_64-linux;
|
||||||
|
in {
|
||||||
|
buildPlatform = {
|
||||||
|
inherit (platform) config;
|
||||||
|
};
|
||||||
|
hostPlatform = platform;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1,27 +1,7 @@
|
||||||
{ ... }: { config, lib, pkgs, ... }@args:
|
{ ... }: { config, lib, ... }: {
|
||||||
let
|
|
||||||
osConfig = args.osConfig or { };
|
|
||||||
in {
|
|
||||||
programs.helix = {
|
programs.helix = {
|
||||||
enable = true;
|
enable = true;
|
||||||
defaultEditor = true;
|
defaultEditor = true;
|
||||||
extraPackages = lib.mkIf (osConfig.hardware.graphics.enable or false)
|
|
||||||
(with pkgs; [
|
|
||||||
bash-language-server
|
|
||||||
clang-tools
|
|
||||||
cmake-language-server
|
|
||||||
dot-language-server
|
|
||||||
elixir-ls
|
|
||||||
lldb
|
|
||||||
markdown-oxide
|
|
||||||
nil
|
|
||||||
python3Packages.python-lsp-server
|
|
||||||
taplo
|
|
||||||
texlab
|
|
||||||
typescript-language-server
|
|
||||||
yaml-language-server
|
|
||||||
]);
|
|
||||||
|
|
||||||
catppuccin.useItalics = true;
|
catppuccin.useItalics = true;
|
||||||
settings = {
|
settings = {
|
||||||
editor = {
|
editor = {
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ ... }: { config, lib, pkgs, ... }@args:
|
{ firefox, ... }: { config, lib, pkgs, ... }@args:
|
||||||
let
|
let
|
||||||
osConfig = args.osConfig or { };
|
osConfig = args.osConfig or { };
|
||||||
|
|
||||||
|
@ -12,7 +12,7 @@ let
|
||||||
in lib.mkIf (osConfig.hardware.graphics.enable or false) {
|
in lib.mkIf (osConfig.hardware.graphics.enable or false) {
|
||||||
programs.firefox = {
|
programs.firefox = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.firefox;
|
package = firefox.packages.${pkgs.system}.firefox;
|
||||||
profiles = let
|
profiles = let
|
||||||
extensions = with config.nur.repos.rycee.firefox-addons; [
|
extensions = with config.nur.repos.rycee.firefox-addons; [
|
||||||
clearurls
|
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.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";
|
"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
|
# founts
|
||||||
"font.default.x-unicode" = "sans-serif";
|
"font.default.x-unicode" = "sans-serif";
|
||||||
"font.default.x-western" = "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";
|
"font.name.monospace.x-western" = "Fira Code";
|
||||||
|
|
||||||
# hardware acceleration
|
# hardware acceleration
|
||||||
"gfx.webrender.all" = true;
|
|
||||||
"layers.acceleration.force-enabled" = 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
|
# enable user profile customisation
|
||||||
"toolkit.legacyUserProfileCustomizations.stylesheets" = true;
|
"toolkit.legacyUserProfileCustomizations.stylesheets" = true;
|
||||||
|
|
|
@ -46,7 +46,7 @@ in lib.mkIf (osConfig.hardware.graphics.enable or false) {
|
||||||
julia-mono
|
julia-mono
|
||||||
lato
|
lato
|
||||||
mplus-outline-fonts.githubRelease
|
mplus-outline-fonts.githubRelease
|
||||||
nerd-fonts.symbols-only
|
nerdfonts
|
||||||
noto-fonts
|
noto-fonts
|
||||||
noto-fonts-color-emoji
|
noto-fonts-color-emoji
|
||||||
unifont
|
unifont
|
||||||
|
|
|
@ -11,7 +11,6 @@ in {
|
||||||
imports = [
|
imports = [
|
||||||
nur.hmModules.nur
|
nur.hmModules.nur
|
||||||
self.homeModules.greedy
|
self.homeModules.greedy
|
||||||
self.homeModules.locale-en_EU
|
|
||||||
catppuccin.homeManagerModules.catppuccin
|
catppuccin.homeManagerModules.catppuccin
|
||||||
niri.homeModules.config
|
niri.homeModules.config
|
||||||
] ++ self.lib.mods [
|
] ++ self.lib.mods [
|
||||||
|
@ -212,7 +211,7 @@ in {
|
||||||
enable = true;
|
enable = true;
|
||||||
envFile.text = let
|
envFile.text = let
|
||||||
ls-colours = pkgs.runCommand "ls-colours" { } ''
|
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;
|
'' |> builtins.readFile;
|
||||||
in ''
|
in ''
|
||||||
load-env {
|
load-env {
|
||||||
|
|
|
@ -33,7 +33,7 @@ in lib.mkIf (osConfig.hardware.graphics.enable or false) {
|
||||||
};
|
};
|
||||||
|
|
||||||
services.mopidy = {
|
services.mopidy = {
|
||||||
enable = true;
|
# enable = true;
|
||||||
extensionPackages = with pkgs; [
|
extensionPackages = with pkgs; [
|
||||||
mopidy-iris
|
mopidy-iris
|
||||||
mopidy-local
|
mopidy-local
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
{ ... }: { config, lib, pkgs, ... }@args:
|
{ firefox, ... }: { config, lib, pkgs, ... }@args:
|
||||||
let
|
let
|
||||||
osConfig = args.osConfig or { };
|
osConfig = args.osConfig or { };
|
||||||
in lib.mkIf (osConfig.hardware.graphics.enable or false) {
|
in lib.mkIf (osConfig.hardware.graphics.enable or false) {
|
||||||
programs.thunderbird = {
|
programs.thunderbird = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.thunderbird;
|
package = firefox.packages.${pkgs.system}.thunderbird;
|
||||||
profiles = { };
|
profiles = { };
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,13 +4,25 @@ let inherit (nixpkgs) lib;
|
||||||
in lib.mapAttrs (system: platform: lib.systems.elaborate platform) {
|
in lib.mapAttrs (system: platform: lib.systems.elaborate platform) {
|
||||||
"x86_64-linux" = {
|
"x86_64-linux" = {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
|
config = "x86_64-unknown-linux-musl";
|
||||||
|
useLLVM = true;
|
||||||
|
linker = "lld";
|
||||||
|
gcc.arch = "x86-64-v3";
|
||||||
};
|
};
|
||||||
|
|
||||||
"aarch64-linux" = {
|
"aarch64-linux" = {
|
||||||
system = "aarch64-linux";
|
system = "aarch64-linux";
|
||||||
|
config = "aarch64-unknown-linux-musl";
|
||||||
|
useLLVM = true;
|
||||||
|
linker = "lld";
|
||||||
|
gcc.arch = "armv8-a";
|
||||||
};
|
};
|
||||||
|
|
||||||
"riscv64-linux" = {
|
"riscv64-linux" = {
|
||||||
system = "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
|
|
@ -174,8 +174,8 @@ imports = [
|
||||||
supportedFeatures = base ++ [ "gccarch-rv64imac" "gccarch-rv64imacfd" ];
|
supportedFeatures = base ++ [ "gccarch-rv64imac" "gccarch-rv64imacfd" ];
|
||||||
sshKey = "/etc/keys/nix-ssh";
|
sshKey = "/etc/keys/nix-ssh";
|
||||||
}
|
}
|
||||||
] ++ (lib.range 1 11 |> map (num: {
|
] ++ (lib.range 1 8 |> map (num: {
|
||||||
hostName = "build-worker-${lib.fixedWidthNumber 2 num}";
|
hostName = "build-worker-0${toString num}";
|
||||||
protocol = "ssh-ng";
|
protocol = "ssh-ng";
|
||||||
sshUser = "root";
|
sshUser = "root";
|
||||||
maxJobs = 4;
|
maxJobs = 4;
|
||||||
|
@ -190,7 +190,6 @@ imports = [
|
||||||
|
|
||||||
programs.ssh = {
|
programs.ssh = {
|
||||||
knownHosts = {
|
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]:2201".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDL2M97UBHg9aUfjDUxzmzg1r0ga0m3/stummBVwuEAB";
|
||||||
"[build-worker-kyoumanet.fly.dev]:2202".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOTwVKL0P0chPM2Gz23rbT94844+w1CGJdCaZdzfjThz";
|
"[build-worker-kyoumanet.fly.dev]:2202".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOTwVKL0P0chPM2Gz23rbT94844+w1CGJdCaZdzfjThz";
|
||||||
"[build-worker-kyoumanet.fly.dev]:2203".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAjy2eZGJQeAYy0+fLgW9jiS0jVY2LInY0NDMnzCvvKp";
|
"[build-worker-kyoumanet.fly.dev]:2203".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAjy2eZGJQeAYy0+fLgW9jiS0jVY2LInY0NDMnzCvvKp";
|
||||||
|
@ -199,18 +198,15 @@ imports = [
|
||||||
"[build-worker-kyoumanet.fly.dev]:2206".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGf0kxGgwOG9KhUhvxxTSiQC5YikrzZXKDgSpBw33qN4";
|
"[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]:2207".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL9z95a6Fn/dB+iNigEYpuJdBnBwCkIZYaKHcFbGP+RY";
|
||||||
"[build-worker-kyoumanet.fly.dev]:2208".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAk+FNMhTfAVqk3MfLp4QiG/i5ti53DlpnC0q+sOvU9O";
|
"[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";
|
|
||||||
"[build-worker-kyoumanet-cdg.fly.dev]:2211".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINlH+v2ZlcDQY3itw4b7aRbwRTqDsTE0R5Ua3vF0VaGr";
|
|
||||||
"integra.kyouma.net".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIBwEQiSfaDrUAwgul4mktusBPcIVxI4pLNDh9DPopVU";
|
"integra.kyouma.net".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIBwEQiSfaDrUAwgul4mktusBPcIVxI4pLNDh9DPopVU";
|
||||||
"schrodinger.kyouma.net".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKo7vZ6lS1wx76YsbAdhOsGcc20YMAW52ep8SZ/FCHDp";
|
"schrodinger.kyouma.net".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKo7vZ6lS1wx76YsbAdhOsGcc20YMAW52ep8SZ/FCHDp";
|
||||||
"zh1830.rsync.net".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJtclizeBy1Uo3D86HpgD3LONGVH0CJ0NT+YfZlldAJd";
|
"zh1830.rsync.net".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJtclizeBy1Uo3D86HpgD3LONGVH0CJ0NT+YfZlldAJd";
|
||||||
};
|
};
|
||||||
|
|
||||||
extraConfig = lib.range 0 11 |> map (num: ''
|
extraConfig = lib.range 1 8 |> map (num: ''
|
||||||
Host build-worker-${lib.fixedWidthNumber 2 num}
|
Host build-worker-0${toString num}
|
||||||
Hostname build-worker-kyoumanet${lib.optionalString (num > 8) "-cdg"}.fly.dev
|
Hostname build-worker-kyoumanet.fly.dev
|
||||||
Port ${toString (2200 + num)}
|
Port 220${toString num}
|
||||||
'') |> lib.concatStrings;
|
'') |> 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
|
ephemeral
|
||||||
iosched
|
iosched
|
||||||
kernel
|
kernel
|
||||||
locale-en_EU
|
musl
|
||||||
network
|
network
|
||||||
nix
|
nix
|
||||||
openssh
|
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
|
let
|
||||||
inherit (nixpkgs) lib;
|
inherit (nixpkgs) lib;
|
||||||
inherit (lib) toList;
|
inherit (lib) toList;
|
||||||
inherit (prev.stdenv) hostPlatform;
|
inherit (prev.stdenv) buildPlatform hostPlatform;
|
||||||
in {
|
inherit (self.lib) removePackages;
|
||||||
redis = prev.redis.overrideAttrs {
|
|
||||||
doCheck = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
python312 = prev.python312.override {
|
prev' = prev;
|
||||||
packageOverrides = final: prev: {
|
final' = final;
|
||||||
pywebview = prev.pywebview.overrideAttrs ({
|
in {
|
||||||
doCheck = false;
|
gst_all_1 = prev.gst_all_1 // {
|
||||||
doInstallCheck = false;
|
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: {
|
sioyek = prev.sioyek.overrideAttrs (prevAttrs: {
|
||||||
env = prevAttrs.env or { } // {
|
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: {
|
zeromq = prev.zeromq.overrideAttrs (prevAttrs: {
|
||||||
postPatch = prevAttrs.postPatch or "" + ''
|
postPatch = prevAttrs.postPatch or "" + ''
|
||||||
substituteInPlace CMakeLists.txt \
|
substituteInPlace CMakeLists.txt \
|
||||||
--replace-fail 'CACHELINE_SIZE EQUAL "undefined"' 'CACHELINE_SIZE STREQUAL "undefined"'
|
--replace-fail 'CACHELINE_SIZE EQUAL "undefined"' 'CACHELINE_SIZE STREQUAL "undefined"'
|
||||||
'';
|
'';
|
||||||
});
|
});
|
||||||
|
|
||||||
|
zlib = prev.zlib.override { splitStaticOutput = false; };
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,6 +4,7 @@ let
|
||||||
inherit (nixpkgs) lib;
|
inherit (nixpkgs) lib;
|
||||||
in {
|
in {
|
||||||
mimalloc = (prev.mimalloc.overrideAttrs (prevAttrs: {
|
mimalloc = (prev.mimalloc.overrideAttrs (prevAttrs: {
|
||||||
|
overrideAlloc = false;
|
||||||
postPatch = prevAttrs.postPatch or "" + ''
|
postPatch = prevAttrs.postPatch or "" + ''
|
||||||
sed -E -i \
|
sed -E -i \
|
||||||
-e 's/(\{ )1(, UNINIT, MI_OPTION_LEGACY\(purge_decommits,reset_decommits\) \})/\10\2/' \
|
-e 's/(\{ )1(, UNINIT, MI_OPTION_LEGACY\(purge_decommits,reset_decommits\) \})/\10\2/' \
|
||||||
|
@ -15,28 +16,8 @@ in {
|
||||||
secureBuild = true;
|
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: {
|
fractal = prev.fractal.overrideAttrs (prevAttrs: {
|
||||||
nativeBuildInputs = prevAttrs.nativeBuildInputs or [ ] ++ [ final.makeBinaryWrapper ];
|
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 "" + ''
|
postInstall = prevAttrs.postInstall or "" + ''
|
||||||
wrapProgram "$out/bin/fractal" \
|
wrapProgram "$out/bin/fractal" \
|
||||||
--set MIMALLOC_RESERVE_HUGE_OS_PAGES 1
|
--set MIMALLOC_RESERVE_HUGE_OS_PAGES 1
|
||||||
|
@ -47,47 +28,8 @@ in {
|
||||||
mpv = final.mpv-unwrapped;
|
mpv = final.mpv-unwrapped;
|
||||||
extraMakeWrapperArgs = [ "--set" "MIMALLOC_RESERVE_HUGE_OS_PAGES" "1" ];
|
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" ];
|
perl = prev.perl.overrideAttrs {
|
||||||
} // lib.optionalAttrs (!prevAttrs ? env.NIX_LDFLAGS) {
|
overrideAlloc = false;
|
||||||
NIX_LDFLAGS = lib.toList prevAttrs.NIX_LDFLAGS or [ ] ++ [ "-lmimalloc" ];
|
};
|
||||||
}))
|
}
|
||||||
|
|
|
@ -91,23 +91,6 @@ in genAttrs [
|
||||||
withSsh = false;
|
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 {
|
gammastep = prev.gammastep.override {
|
||||||
withRandr = false;
|
withRandr = false;
|
||||||
};
|
};
|
||||||
|
@ -344,17 +327,6 @@ in genAttrs [
|
||||||
withIptables = false;
|
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 {
|
w3m = prev.w3m.override {
|
||||||
x11Support = false;
|
x11Support = false;
|
||||||
imlib2 = final.imlib2;
|
imlib2 = final.imlib2;
|
||||||
|
|
Loading…
Reference in a new issue