chayleaf/dotfiles
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

update inputs

Browse source
This commit is contained in:
chayleaf 2024-01-27 03:57:21 +07:00
parent d96c7fefb9
commit 3c4ca982ec
Signed by: chayleaf
GPG key ID: 78171AD46227E68E
18 changed files with 3297 additions and 30723 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

119
flake.lock
View file

@ -92,22 +92,6 @@
} }
}, },
"flake-compat_3": { "flake-compat_3": {
"flake": false,
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_4": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1668681692, "lastModified": 1668681692,
@ -128,11 +112,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1698882062, "lastModified": 1704982712,
"narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=", "narHash": "sha256-2Ptt+9h8dczgle2Oo6z5ni5rt/uLMG47UFTR1ry/wgg=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "8c9fa2545007b49a5db5f650ae91f227672c3877", "rev": "07f6395285469419cf9d078f59b5b49993198c00",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -166,11 +150,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1700553346, "lastModified": 1706473109,
"narHash": "sha256-kW7uWsCv/lxuA824Ng6EYD9hlVYRyjuFn0xBbYltAeQ=", "narHash": "sha256-iyuAvpKTsq2u23Cr07RcV5XlfKExrG8gRpF75hf1uVc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1aabb0a31b25ad83cfaa37c3fe29053417cd9a0f", "rev": "d634c3abafa454551f2083b054cd95c3f287be61",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -181,11 +165,11 @@
}, },
"impermanence": { "impermanence": {
"locked": { "locked": {
"lastModified": 1697303681, "lastModified": 1703656108,
"narHash": "sha256-caJ0rXeagaih+xTgRduYtYKL1rZ9ylh06CIrt1w5B4g=", "narHash": "sha256-hCSUqdFJKHHbER8Cenf5JRzjMlBjIdwdftGQsO0xoJs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "impermanence", "repo": "impermanence",
"rev": "0f317c2e9e56550ce12323eb39302d251618f5b5", "rev": "033643a45a4a920660ef91caa391fbffb14da466",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -194,27 +178,6 @@
"type": "github" "type": "github"
} }
}, },
"maubot": {
"inputs": {
"flake-compat": "flake-compat_3",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1700661503,
"narHash": "sha256-2GGbVFmAC8G1FLxIabCBYhfbUeUIZM/3p2VW9Eia60Q=",
"owner": "chayleaf",
"repo": "maubot.nix",
"rev": "71d397c5897233c592d35be6c4f28c295ce2e79d",
"type": "github"
},
"original": {
"owner": "chayleaf",
"repo": "maubot.nix",
"type": "github"
}
},
"mobile-nixos": { "mobile-nixos": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -240,11 +203,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1700616016, "lastModified": 1706482802,
"narHash": "sha256-GCD2U3jMWmBqJccDDXr8pf2Ia2NnFiIYqnm9wK1DxLk=", "narHash": "sha256-KXwKTfqFkoPpV8QqaVlpmO8w8rD/jHZL2315RL5QQ8w=",
"owner": "fufexan", "owner": "fufexan",
"repo": "nix-gaming", "repo": "nix-gaming",
"rev": "7d81bdbf62936d50906609097b1fd6e68e59daa7", "rev": "8f354ef64cd18898b8980ecf7fe90118808b514b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -260,11 +223,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1700967448, "lastModified": 1706411424,
"narHash": "sha256-sWVi7Nm/fuTgwN8R7Tt3GM3vBP3r6M1/lhX0+LK3p7E=", "narHash": "sha256-BzziJYucEZvdCE985vjPoo3ztWcmUiSQ1wJ2CoT6jCc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "d189d05f9de237d3b554c91029f9cb78efec8ace", "rev": "c782f2a4f6fc94311ab5ef31df2f1149a1856181",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -275,11 +238,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1700559156, "lastModified": 1706182238,
"narHash": "sha256-gL4epO/qf+wo30JjC3g+b5Bs8UrpxzkhNBBsUYxpw2g=", "narHash": "sha256-Ti7CerGydU7xyrP/ow85lHsOpf+XMx98kQnPoQCSi1g=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "c3abafb01cd7045dba522af29b625bd1e170c2fb", "rev": "f84eaffc35d1a655e84749228cde19922fcf55f1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -291,24 +254,24 @@
"nixos-mailserver": { "nixos-mailserver": {
"inputs": { "inputs": {
"blobs": "blobs", "blobs": "blobs",
"flake-compat": "flake-compat_4", "flake-compat": "flake-compat_3",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"nixpkgs-22_11": [
"nixpkgs"
],
"nixpkgs-23_05": [ "nixpkgs-23_05": [
"nixpkgs" "nixpkgs"
], ],
"nixpkgs-23_11": [
"nixpkgs"
],
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1700085753, "lastModified": 1706219574,
"narHash": "sha256-qtib7f3eRwfaUF+VziJXiBcZFqpHCAXS4HlrFsnzzl4=", "narHash": "sha256-qO+8UErk+bXCq2ybHU4GzXG4Ejk4Tk0rnnTPNyypW4g=",
"owner": "simple-nixos-mailserver", "owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver", "repo": "nixos-mailserver",
"rev": "008d78cc21959e33d0d31f375b88353a7d7121ae", "rev": "e47f3719f1db3e0961a4358d4cb234a0acaa7baf",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -324,11 +287,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1701027558, "lastModified": 1706386221,
"narHash": "sha256-rINl9hvpQLfQtrXUy+R8bAtkKnU/1yOajVLfpFh0qWg=", "narHash": "sha256-fMBhmJqm6yihdweMmi+NPV4SFj2WXOQSpAwfKoLGyRE=",
"owner": "chayleaf", "owner": "chayleaf",
"repo": "nixos-router", "repo": "nixos-router",
"rev": "c69ede702d9e8d367cc45cc8869f549eccc90ea1", "rev": "af7d975e755702b649a386c57b44665d56c80d7a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -339,15 +302,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1701951621, "lastModified": 1706397479,
"narHash": "sha256-97wdVG/CHlHkWqd8Y+1PvLrNBp91tf0esBURFVT8KSA=", "narHash": "sha256-f5aOlL5eKiOkQy89sOvN653Yue1r/aXWTCL/Kz1iRMc=",
"owner": "chayleaf", "owner": "chayleaf",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b4ba55d440f4eb00379307b7c2f0279b5d24b68b", "rev": "74ece655ded61dc9cb4a718cb574a73bb34a68bf",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "chayleaf", "owner": "chayleaf",
"ref": "ci",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -355,11 +319,11 @@
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"dir": "lib", "dir": "lib",
"lastModified": 1698611440, "lastModified": 1703961334,
"narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=", "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735", "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -412,11 +376,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1700660661, "lastModified": 1706607970,
"narHash": "sha256-1+//5oLdqYo8ptS/ZpaGEzgnQ6FWJOjLPyTuiD6mPjY=", "narHash": "sha256-q5W32qx3HhozhAT75AerVqOnhgvNrSyFrjAlu4qNYCU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "0707dd061f4fb82393f3c96c6ed10c60396d7f9c", "rev": "d7e286c21530da5d6da54424d64e15de14f7c07a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -431,7 +395,6 @@
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
"home-manager": "home-manager", "home-manager": "home-manager",
"impermanence": "impermanence", "impermanence": "impermanence",
"maubot": "maubot",
"mobile-nixos": "mobile-nixos", "mobile-nixos": "mobile-nixos",
"nix-gaming": "nix-gaming", "nix-gaming": "nix-gaming",
"nix-index-database": "nix-index-database", "nix-index-database": "nix-index-database",
@ -453,11 +416,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1700619457, "lastModified": 1706580650,
"narHash": "sha256-zjmlh8xo4UsNdw7nMyiHgQg1xXNcJnpdMLvyunnnitQ=", "narHash": "sha256-e6q4Pn1dp3NoQJdMYdyNdDHU5IRBW9i3bHSJ3jThEL0=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "7c94410d52d4e8bd72803fc1fe6c51fe179edaf5", "rev": "39e20b3c02caa91c9970beef325a04975d83d77f",
"type": "github" "type": "github"
}, },
"original": { "original": {

9
flake.nix
View file

@ -4,7 +4,7 @@
inputs = { inputs = {
#nixpkgs.url = "github:NixOS/nixpkgs/3dc2b4f8166f744c3b3e9ff8224e7c5d74a5424f"; #nixpkgs.url = "github:NixOS/nixpkgs/3dc2b4f8166f744c3b3e9ff8224e7c5d74a5424f";
# nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; # nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs.url = "github:chayleaf/nixpkgs"; nixpkgs.url = "github:chayleaf/nixpkgs/ci";
nixos-hardware.url = "github:NixOS/nixos-hardware"; nixos-hardware.url = "github:NixOS/nixos-hardware";
nix-index-database = { nix-index-database = {
url = "github:nix-community/nix-index-database"; url = "github:nix-community/nix-index-database";
@ -45,17 +45,13 @@
url = "github:chayleaf/nixos-router"; url = "github:chayleaf/nixos-router";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
maubot = {
url = "github:chayleaf/maubot.nix";
inputs.nixpkgs.follows = "nixpkgs";
};
nixos-mailserver = { nixos-mailserver = {
url = "gitlab:simple-nixos-mailserver/nixos-mailserver"; url = "gitlab:simple-nixos-mailserver/nixos-mailserver";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
# prevent extra input from being in flake.lock # prevent extra input from being in flake.lock
# (this doesn't affect any behavior) # (this doesn't affect any behavior)
inputs.nixpkgs-22_11.follows = "nixpkgs";
inputs.nixpkgs-23_05.follows = "nixpkgs"; inputs.nixpkgs-23_05.follows = "nixpkgs";
inputs.nixpkgs-23_11.follows = "nixpkgs";
}; };
flake-compat = { flake-compat = {
url = "github:edolstra/flake-compat"; url = "github:edolstra/flake-compat";
@ -69,7 +65,6 @@
# it takes the paths for modules from filesystem as opposed to flake inputs # it takes the paths for modules from filesystem as opposed to flake inputs
dev = { dev = {
# coop-ofd = true; # coop-ofd = true;
# maubot = true;
# mobile-nixos = true; # mobile-nixos = true;
# nixos-router = true; # nixos-router = true;
# notnft = true; # notnft = true;

2
home/modules/gui.nix
View file

@ -187,7 +187,7 @@
# profiles = { }; # profiles = { };
package = pkgs.wrapMpv ((pkgs.mpv-unwrapped.override { package = pkgs.wrapMpv ((pkgs.mpv-unwrapped.override {
# webp support # webp support
ffmpeg = pkgs.ffmpeg-custom; ffmpeg = pkgs.ffmpeg-full;
}).overrideAttrs (old: { }).overrideAttrs (old: {
patches = old.patches or [] ++ [ patches = old.patches or [] ++ [
(pkgs.fetchpatch { (pkgs.fetchpatch {

7
overlays.nix
View file

@ -1,2 +1,5 @@
# [ (import (builtins.fetchTarball "https://github.com/oxalica/rust-overlay/archive/master.tar.gz")) ] [
[ (import <self>).overlays.default (import <rust-overlay>) (import <nix-gaming>).overlays.default ] (import <self>).overlays.default
(import <rust-overlay>)
(import <nix-gaming>).overlays.default
]

14
pkgs/_sources/generated.json
View file

@ -22,24 +22,24 @@
"pinned": false, "pinned": false,
"src": { "src": {
"name": null, "name": null,
"sha256": "sha256-72jxUJdn4j0FV1qFH0r7UEVrAvSwrWgWsxCXyT1N/1A=", "sha256": "sha256-5fEYhazqXcMENjp+37IcF5U81vZ9bPDkS0siUVi9mdg=",
"type": "url", "type": "url",
"url": "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton8-24/GE-Proton8-24.tar.gz" "url": "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton8-27/GE-Proton8-27.tar.gz"
}, },
"version": "GE-Proton8-24" "version": "GE-Proton8-27"
}, },
"searxng": { "searxng": {
"cargoLocks": null, "cargoLocks": null,
"date": "2023-11-14", "date": "2024-01-25",
"extract": null, "extract": null,
"name": "searxng", "name": "searxng",
"passthru": null, "passthru": null,
"pinned": false, "pinned": false,
"src": { "src": {
"sha256": "sha256-vgDQ7cdWN79TFEbJGq0AdvC8p2YOmogk9iVViDkZDXw=", "sha256": "sha256-QW1xC6RsHpn5P/QHjyc3O24tSmLvRCVIJwNqPyp1DV0=",
"type": "tarball", "type": "tarball",
"url": "https://github.com/searxng/searxng/archive/b3d29cb86db4cc1a4e6320016529d1361451e1f1.tar.gz" "url": "https://github.com/searxng/searxng/archive/8c73aa772b7d4446f77be82d8f9d9eef1e348deb.tar.gz"
}, },
"version": "b3d29cb86db4cc1a4e6320016529d1361451e1f1" "version": "8c73aa772b7d4446f77be82d8f9d9eef1e348deb"
} }
} }

14
pkgs/_sources/generated.nix
View file

@ -12,19 +12,19 @@
}; };
proton-ge = { proton-ge = {
pname = "proton-ge"; pname = "proton-ge";
version = "GE-Proton8-24"; version = "GE-Proton8-27";
src = fetchurl { src = fetchurl {
url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton8-24/GE-Proton8-24.tar.gz"; url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton8-27/GE-Proton8-27.tar.gz";
sha256 = "sha256-72jxUJdn4j0FV1qFH0r7UEVrAvSwrWgWsxCXyT1N/1A="; sha256 = "sha256-5fEYhazqXcMENjp+37IcF5U81vZ9bPDkS0siUVi9mdg=";
}; };
}; };
searxng = { searxng = {
pname = "searxng"; pname = "searxng";
version = "b3d29cb86db4cc1a4e6320016529d1361451e1f1"; version = "8c73aa772b7d4446f77be82d8f9d9eef1e348deb";
src = fetchTarball { src = fetchTarball {
url = "https://github.com/searxng/searxng/archive/b3d29cb86db4cc1a4e6320016529d1361451e1f1.tar.gz"; url = "https://github.com/searxng/searxng/archive/8c73aa772b7d4446f77be82d8f9d9eef1e348deb.tar.gz";
sha256 = "sha256-vgDQ7cdWN79TFEbJGq0AdvC8p2YOmogk9iVViDkZDXw="; sha256 = "sha256-QW1xC6RsHpn5P/QHjyc3O24tSmLvRCVIJwNqPyp1DV0=";
}; };
date = "2023-11-14"; date = "2024-01-25";
}; };
} }

67
pkgs/default.nix
View file

@ -22,12 +22,12 @@ in
inherit (inputs.nix-gaming.packages.${pkgs.system}) faf-client osu-lazer-bin; inherit (inputs.nix-gaming.packages.${pkgs.system}) faf-client osu-lazer-bin;
inherit nixForNixPlugins; inherit nixForNixPlugins;
nix = nixForNixPlugins; nix = nixForNixPlugins;
nixVersions = pkgs.nixVersions.extend (self: super: { nixVersions = pkgs.nixVersions // {
stable = nixForNixPlugins; stable = nixForNixPlugins;
unstable = nixForNixPlugins; unstable = nixForNixPlugins;
}); };
# Various patches to change Nix version of existing packages so they don't error out because of nix-plugins in nix.conf # Various patches to change Nix version of existing packages so they don't error out because of nix-plugins in nix.conf
nix-plugins = (pkgs.nix-plugins.override { nix = nixForNixPlugins; }).overrideAttrs (old: { /*nix-plugins = (pkgs.nix-plugins.override { nix = nixForNixPlugins; }).overrideAttrs (old: {
version = "13.0.0"; version = "13.0.0";
patches = [ patches = [
(pkgs.fetchpatch { (pkgs.fetchpatch {
@ -36,37 +36,30 @@ in
hash = "sha256-pOogMtjXYkSDtXW12TmBpGr/plnizJtud2nP3q2UldQ="; hash = "sha256-pOogMtjXYkSDtXW12TmBpGr/plnizJtud2nP3q2UldQ=";
}) })
]; ];
});*/
harmonia = (pkgs.harmonia.override { nixVersions.nix_2_19 = nixForNixPlugins; }).overrideAttrs (old: rec {
version = "0.7.3";
src = old.src.override {
rev = "refs/tags/${old.pname}-v${version}";
hash = "sha256-XtnK54HvZMKZGSCrVD0FO5PQLMo3Vkj8ezUlsfqStq0=";
};
cargoDeps = pkgs.rustPlatform.importCargoLock { lockFile = "${src}/Cargo.lock"; };
}); });
harmonia = (pkgs.harmonia.override { nix = nixForNixPlugins; }); /*.overrideAttrs {
patches = [
(pkgs.fetchpatch {
url = "https://github.com/nix-community/harmonia/pull/145/commits/394c939a45fa9c590347e149400876c318610b1e.patch";
hash = "sha256-DvyE7/0PW3XRtFgIrl4IQa7RIQLQZoKLddxCZvhpu3I=";
})
];
};*/
nix-init = pkgs.nix-init.override { nix = nixForNixPlugins; }; nix-init = pkgs.nix-init.override { nix = nixForNixPlugins; };
nix-serve = pkgs.nix-serve.override { nix = nixForNixPlugins; }; nix-serve = pkgs.nix-serve.override { nix = nixForNixPlugins; };
nix-serve-ng = pkgs.nix-serve-ng.override { nix = nixForNixPlugins; }; nix-serve-ng = pkgs.nix-serve-ng.override { nix = nixForNixPlugins; };
hydra_unstable = (pkgs.hydra_unstable.override { hydra_unstable = (pkgs.hydra_unstable.override {
nix = nixForNixPlugins; /*.overrideAttrs (old: { nix = nixForNixPlugins;
# TODO: remove when https://github.com/NixOS/nix/issues/8796 is fixed or hydra code stops needing a fix
configureFlags = builtins.filter (x: x != "--enable-lto") (old.configureFlags or []);
});*/
}).overrideAttrs (old: { }).overrideAttrs (old: {
# who cares about failing tests amirite version = "2023-12-01";
# who cares about tests amirite
doCheck = false; doCheck = false;
patches = (old.patches or [ ]) ++ [ src = old.src.override {
(pkgs.fetchpatch { rev = "4d1c8505120961f10897b8fe9a070d4e193c9a13";
url = "https://github.com/chayleaf/hydra/commit/e9da80fff6234fab2458173272ee0bedbe8935c3.patch"; hash = "sha256-vXTuE83GL15mgZHegbllVAsVdDFcWWSayPfZxTJN5ys=";
hash = "sha256-PS8rwe5lIzvaVlh/DogYmW5OccVfpKQ6JehTQibx2XQ="; };
})
];
}); });
nurl = pkgs.nurl.override { nix = nixForNixPlugins; }; nurl = pkgs.nurl.override { nix = nixForNixPlugins; };
/*nvfetcher = pkgs.nvfetcher.overrideAttrs (old: {
meta = builtins.removeAttrs old.meta [ "broken" ];
});*/
buffyboard = pkgs.callPackage ./buffyboard { }; buffyboard = pkgs.callPackage ./buffyboard { };
clang-tools_latest = pkgs.clang-tools_16; clang-tools_latest = pkgs.clang-tools_16;
@ -74,30 +67,6 @@ in
/*ghidra = pkgs.ghidra.overrideAttrs (old: { /*ghidra = pkgs.ghidra.overrideAttrs (old: {
patches = old.patches ++ [ ./ghidra-stdcall.patch ]; patches = old.patches ++ [ ./ghidra-stdcall.patch ];
});*/ });*/
ffmpeg-custom = (pkgs.callPackage (import /${pkgs.path}/pkgs/development/libraries/ffmpeg/generic.nix {
version = "6.1";
sha256 = "sha256-NzhD2D16bCVCyCXo0TRwZYp3Ta5eFSfoQPa+iRkeNZg=";
}) {
ffmpegVariant = "full";
withCuda = false;
withCudaLLVM = false;
withNvdec = false;
withNvenc = false;
inherit (pkgs'.darwin.apple_sdk.frameworks)
Cocoa CoreServices CoreAudio CoreMedia AVFoundation MediaToolbox
VideoDecodeAcceleration VideoToolbox;
}).overrideAttrs (old: {
postPatch = ''
${old.postPatch or ""}
substituteInPlace libavutil/hwcontext_vulkan.c \
--replace FF_VK_KHR_VIDEO_DECODE_QUEUE FF_VK_EXT_VIDEO_DECODE_QUEUE \
--replace FF_VK_KHR_VIDEO_DECODE_H264 FF_VK_EXT_VIDEO_DECODE_H264 \
--replace FF_VK_KHR_VIDEO_DECODE_H265 FF_VK_EXT_VIDEO_DECODE_H265 \
--replace FF_VK_KHR_VIDEO_DECODE_AV1 FF_VK_EXT_VIDEO_DECODE_AV1
'';
buildInputs = old.buildInputs ++ [ pkgs.libaribcaption ];
configureFlags = old.configureFlags ++ [ "--enable-libaribcaption" ];
});
gimp = callPackage ./gimp { inherit (pkgs) gimp; }; gimp = callPackage ./gimp { inherit (pkgs) gimp; };
home-daemon = callPackage ./home-daemon { }; home-daemon = callPackage ./home-daemon { };
# pin version # pin version

16
pkgs/firefox-addons/generated.nix
View file

@ -37,23 +37,21 @@
}; };
"rikaitan" = buildFirefoxXpiAddon { "rikaitan" = buildFirefoxXpiAddon {
pname = "rikaitan"; pname = "rikaitan";
version = "23.9.25.1"; version = "24.1.22.0";
addonId = "tatsu@autistici.org"; addonId = "tatsu@autistici.org";
url = "https://addons.mozilla.org/firefox/downloads/file/4172402/rikaitan-23.9.25.1.xpi"; url = "https://addons.mozilla.org/firefox/downloads/file/4224979/rikaitan-24.1.22.0.xpi";
sha256 = "d954f90939455dd52ce161729d7175fac63cf10daea386a1eab34529e03c8f29"; sha256 = "7df217a68077d45b9f41fe0170193c9224abc2a543c121429ebef4e7e857b0df";
meta = with lib; meta = with lib;
{ {
homepage = "https://github.com/Ajatt-Tools/rikaitan"; homepage = "https://github.com/Ajatt-Tools/rikaitan";
description = "Japanese dictionary with Anki integration. \n\nThis project is a community-driven fork of Yomichan, which is no longer maintained."; description = "Japanese dictionary with Anki integration and flashcard creation support.";
license = licenses.lgpl3; license = licenses.gpl3;
mozPermissions = [ mozPermissions = [
"<all_urls>"
"storage" "storage"
"clipboardWrite" "clipboardWrite"
"unlimitedStorage" "unlimitedStorage"
"webRequest" "declarativeNetRequest"
"webRequestBlocking" "scripting"
"nativeMessaging"
"http://*/*" "http://*/*"
"https://*/*" "https://*/*"
"file://*/*" "file://*/*"

7
system/devices/radxa-rock5a-server.nix
View file

@ -73,11 +73,14 @@ in
}; };
}; };
};*/ };*/
# eth0 on some kernels
# end0 on other kernels
# sometimes even version dependent
preLVMCommands = lib.mkOrder 499 '' preLVMCommands = lib.mkOrder 499 ''
ip link set eth0 address ${router-config.router-settings.serverInitrdMac} || true ip link set end0 address ${router-config.router-settings.serverInitrdMac} || ip link set eth0 address ${router-config.router-settings.serverInitrdMac} || true
''; '';
postMountCommands = '' postMountCommands = ''
ip link set eth0 address ${router-config.router-settings.serverMac} || true ip link set end0 address ${router-config.router-settings.serverMac} || ip link set eth0 address ${router-config.router-settings.serverInitrdMac} || true
''; '';
network.enable = true; network.enable = true;
network.udhcpc.extraArgs = [ "-t6" ]; network.udhcpc.extraArgs = [ "-t6" ];

16153
system/hardware/oneplus-enchilada/linux_6_7.patch
View file

File diff suppressed because it is too large Load diff

11
system/hardware/oneplus-enchilada/pkgs.nix
View file

@ -119,10 +119,7 @@ in {
meta.license = lib.licenses.unfreeRedistributableFirmware; meta.license = lib.licenses.unfreeRedistributableFirmware;
}; };
linux_enchilada = pkgs.linux_testing.override { linux_enchilada = pkgs.linux_latest.override {
argsOverride.version = "6.7-rc3";
argsOverride.modDirVersion = lib.versions.pad 3 "6.7-rc3";
# TODO: uncomment # TODO: uncomment
# ignoreConfigErrors = false; # ignoreConfigErrors = false;
kernelPatches = [ kernelPatches = [
@ -136,12 +133,6 @@ in {
} }
]; ];
postPatch = ''
substituteInPlace arch/arm64/configs/defconfig \
--replace CONFIG_QCOM_LLCC=m CONFIG_QCOM_LLCC=y \
--replace CONFIG_QCOM_OCMEM=m CONFIG_QCOM_OCMEM=y
'';
stdenv = lib.recursiveUpdate pkgs.stdenv { stdenv = lib.recursiveUpdate pkgs.stdenv {
hostPlatform.linux-kernel.extraConfig = ""; hostPlatform.linux-kernel.extraConfig = "";
}; };

14
system/hardware/radxa-rock5a/default.nix
View file

@ -3,17 +3,13 @@
, ... }: , ... }:
{ {
boot.initrd.availableKernelModules = [ "ahci" "usbhid" "usb_storage" ]; boot.initrd.availableKernelModules = [
"ahci" "usbhid" "usb_storage"
# TODO: switch to mainline when PCIe support works "phy-rockchip-naneng-combphy"
boot.kernelPackages = pkgs.linuxPackagesFor (pkgs.buildLinuxWithCcache pkgs.linux_testing);
boot.kernelPatches = [
{
name = "linux_6.7.patch";
patch = ./linux_6.7.patch;
}
]; ];
boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_6_7;
boot.kernelParams = [ "dtb=/${config.hardware.deviceTree.name}" ]; boot.kernelParams = [ "dtb=/${config.hardware.deviceTree.name}" ];
hardware.deviceTree.enable = true; hardware.deviceTree.enable = true;
hardware.deviceTree.name = "rockchip/rk3588s-rock-5a.dtb"; hardware.deviceTree.name = "rockchip/rk3588s-rock-5a.dtb";

17516
system/hardware/radxa-rock5a/linux_6.7.patch
View file

File diff suppressed because it is too large Load diff

2
system/hosts/router/metrics.nix
View file

@ -31,7 +31,7 @@ in {
]; ];
listenAddress = netAddresses.lan4; listenAddress = netAddresses.lan4;
}; };
ping = { ping2 = {
enable = true; enable = true;
listenAddress = netAddresses.lan4; listenAddress = netAddresses.lan4;
port = 9380; port = 9380;

4
system/hosts/server/files.nix
View file

@ -72,7 +72,7 @@ in {
}; };
services.nextcloud = { services.nextcloud = {
enable = true; enable = true;
package = pkgs.nextcloud27; package = pkgs.nextcloud28;
autoUpdateApps.enable = true; autoUpdateApps.enable = true;
# TODO: use socket auth and remove the next line # TODO: use socket auth and remove the next line
database.createLocally = false; database.createLocally = false;
@ -81,8 +81,8 @@ in {
dbpassFile = "/var/lib/nextcloud/db_password"; dbpassFile = "/var/lib/nextcloud/db_password";
dbtype = "pgsql"; dbtype = "pgsql";
dbhost = "/run/postgresql"; dbhost = "/run/postgresql";
overwriteProtocol = "https";
}; };
extraOptions.overwriteprotocol = "https";
hostName = "cloud.${cfg.domainName}"; hostName = "cloud.${cfg.domainName}";
https = true; https = true;
}; };

14
system/hosts/server/home.nix
View file

@ -108,12 +108,13 @@ in {
# so normal nix evals don't have access to builtins # so normal nix evals don't have access to builtins
nix.settings.extra-builtins-file = "/secrets/nixos/extra-builtins.nix"; nix.settings.extra-builtins-file = "/secrets/nixos/extra-builtins.nix";
nix.settings.allowed-uris = [ nix.settings.allowed-uris = [
# required for home-manager # required for home-manager (no idea if it's required at this point)
"https://git.sr.ht/~rycee/nmd/" "https://git.sr.ht/~rycee/nmd/"
# required for server (I suppose since nvfetcher uses fetchTarball here...) # ...for the rest of the home config
"https://github.com/searxng/searxng/"
# required for home config (nvfetcher again)
"https://api.github.com/repos/FAForever/" "https://api.github.com/repos/FAForever/"
"https://github.com/nix-community/nix-index-database/releases/download/"
# required for server (I suppose since nvfetcher uses fetchTarball here...)
"https://github.com/searxng/searxng/releases/download/"
# for nginx CF-Connecting-IP config generation # for nginx CF-Connecting-IP config generation
"https://www.cloudflare.com/ips-v4" "https://www.cloudflare.com/ips-v4"
"https://www.cloudflare.com/ips-v6" "https://www.cloudflare.com/ips-v6"
@ -146,6 +147,11 @@ in {
notificationSender = "noreply@${cfg.domainName}"; notificationSender = "noreply@${cfg.domainName}";
# smtpHost = "mail.${cfg.domainName}"; # smtpHost = "mail.${cfg.domainName}";
useSubstitutes = true; useSubstitutes = true;
# I really don't want to do this... but nix-plugins refuses to work otherwise
# TODO: fix, hopefully
extraConfig = ''
evaluator_pure_eval = 0
'';
}; };
# boot.binfmt.emulatedSystems = builtins.filter (x: x != pkgs.system) [ "aarch64-linux" "x86_64-linux" ]; # boot.binfmt.emulatedSystems = builtins.filter (x: x != pkgs.system) [ "aarch64-linux" "x86_64-linux" ];
nix.buildMachines = [ nix.buildMachines = [

3
system/hosts/server/maubot.nix
View file

@ -1,14 +1,11 @@
{ config { config
, lib , lib
, pkgs , pkgs
, inputs
, ... }: , ... }:
let let
cfg = config.server; cfg = config.server;
in { in {
imports = [ inputs.maubot.nixosModules.default ];
services.nginx.virtualHosts."matrix.${cfg.domainName}".locations = let services.nginx.virtualHosts."matrix.${cfg.domainName}".locations = let
inherit (config.services.maubot) settings; inherit (config.services.maubot) settings;
in { in {

6
system/modules/ping-exporter.nix
View file

@ -5,7 +5,7 @@
}: }:
let let
cfg = config.services.prometheus.exporters.ping; cfg = config.services.prometheus.exporters.ping2;
inherit (lib) concatStrings literalExpression mkMerge mkDefault mkEnableOption mkIf mkOption types; inherit (lib) concatStrings literalExpression mkMerge mkDefault mkEnableOption mkIf mkOption types;
# copied from nixpkgs/nixos/modules/services/monitoring/prometheus/exporters # copied from nixpkgs/nixos/modules/services/monitoring/prometheus/exporters
mkExporterOpts = { name, port }: { mkExporterOpts = { name, port }: {
@ -118,7 +118,7 @@ let
}; };
format = pkgs.formats.toml { }; format = pkgs.formats.toml { };
in { in {
options.services.prometheus.exporters.ping = mkExporterOpts { name = "ping"; port = 9390; } // { options.services.prometheus.exporters.ping2 = mkExporterOpts { name = "ping2"; port = 9390; } // {
config = mkOption { config = mkOption {
type = format.type; type = format.type;
default = { }; default = { };
@ -126,7 +126,7 @@ in {
}; };
}; };
config = mkExporterConf { config = mkExporterConf {
name = "ping"; name = "ping2";
conf = cfg; conf = cfg;
serviceOpts = { serviceOpts = {
serviceConfig = rec { serviceConfig = rec {