Commit 5b89da9
Changed files (5)
modules
core
security
desktop
app
nixpak
game
modules/core/security/network.nix
@@ -20,15 +20,6 @@
"net.ipv6.conf.all.accept_source_route" = lib.mkDefault "0";
"net.ipv6.conf.default.accept_source_route" = lib.mkDefault "0";
};
-
- # See https://github.com/NixOS/nixpkgs/pull/576390
- # TODO: remove this after the PR above merged into nixpkgs/nixos-unstable
- security.pki.caCertificateBlacklist = [
- "Comodo AAA Services root"
- "emSign ECC Root CA - G3"
- "emSign Root CA - C1"
- "emSign ECC Root CA - C3"
- ];
};
};
}
modules/desktop/app/nixpak/wechat.nix
@@ -27,11 +27,9 @@
flatpak = {inherit appId;};
bubblewrap = {
- # 4.1.1.8 runs on X11.
- # TODO: Use Wayland for 4.1.1.13 or later
sockets = {
- wayland = false;
- x11 = true;
+ wayland = true;
+ x11 = false;
};
bind.rw = with sloth; [
modules/desktop/app/obs-studio.nix
@@ -10,7 +10,17 @@
# From https://github.com/NixOS/nixpkgs/blob/f8cc9d1b80b6c75fec21ecc549f631c3eed5a5e1/nixos/modules/programs/obs-studio.nix
boot = {
kernelModules = ["v4l2loopback"];
- extraModulePackages = [config.boot.kernelPackages.v4l2loopback];
+ # TODO: Remove workaround after https://github.com/NixOS/nixpkgs/pull/575861 merged
+ # extraModulePackages = [config.boot.kernelPackages.v4l2loopback];
+ extraModulePackages = [
+ (config.boot.kernelPackages.v4l2loopback.overrideAttrs (old: {
+ preBuild = "";
+ installFlags = [
+ "DEPMOD=true"
+ "INSTALL_MOD_PATH=${placeholder "out"}"
+ ];
+ }))
+ ];
extraModprobeConfig = ''
options v4l2loopback devices=1 video_nr=1 card_label="OBS Cam" exclusive_caps=1
modules/desktop/game/gamepad.nix
@@ -15,11 +15,36 @@
./alsa-ucm-dualsense-haptics.patch
];
};
+
+ kernel = config.boot.kernelPackages.kernel;
+
+ # TODO: Drop workaround after https://github.com/NixOS/nixpkgs/pull/576469 merged
+ xpad-noone = config.boot.kernelPackages.xpad-noone.overrideAttrs (old: {
+ makeFlags =
+ old.makeFlags
+ ++ [
+ "KERNEL_SRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+ "INSTALL_MOD_PATH=${placeholder "out"}"
+ "INSTALL_MOD_DIR=kernel/drivers/xpad-noone"
+ "INSTALL_MOD_STRIP=1"
+ "DEPMOD=true"
+ ];
+ installTargets = ["modules_install"];
+ installFlags = [
+ "-C"
+ "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+ "M=$(PWD)"
+ ];
+ installPhase = null;
+ strictDeps = true;
+ __structuredAttrs = true;
+ });
in {
hardware = {
uinput.enable = true;
xone.enable = true;
xpadneo.enable = true;
+ xpad-noone.enable = false;
};
environment.sessionVariables.ALSA_CONFIG_UCM2 = "${alsa-ucm-conf-dualsense-haptics}/share/alsa/ucm2";
@@ -27,6 +52,7 @@
boot = {
extraModulePackages = [
config.boot.kernelPackages.xpadneo
+ xpad-noone
];
extraModprobeConfig = ''
options bluetooth disable_ertm=Y
flake.lock
@@ -304,11 +304,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1791956154,
- "narHash": "sha256-jBYGPi4udQ9uo4KQp9m2J0546nJVQitG15gvZSaVVAs=",
+ "lastModified": 1792502884,
+ "narHash": "sha256-IoNisKcGbUjdd45qCqywGMCYmZ5EnkxezvLII0FWwNA=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "55bfb4d7437bd4e09ab7cba58a43bd68eb310044",
+ "rev": "02c087f3fe673c9e317f206a627cb6b910336dbe",
"type": "github"
},
"original": {
@@ -328,11 +328,11 @@
]
},
"locked": {
- "lastModified": 1792246945,
- "narHash": "sha256-ow+XE2byto98IUdvXwr/37pxVbApcl0D34FUqNN5u+E=",
+ "lastModified": 1792296654,
+ "narHash": "sha256-ridFVaL1CVxoMMYtykxMzofj5NPs8UHDGLBL95IO3ks=",
"owner": "nix-community",
"repo": "NUR",
- "rev": "53b924bef05d4b4ead7d37572baccb3bffc036a6",
+ "rev": "be1c0983a8ab9ad07cb70cd37509a9d870bf33e9",
"type": "github"
},
"original": {
@@ -348,11 +348,11 @@
]
},
"locked": {
- "lastModified": 1792113686,
- "narHash": "sha256-DqMaz6bItT7FJToivhMX5nHiuyz29z+78AYBLqUbYqc=",
- "rev": "3295688aae205e9ee9a4bae0994c617dfc1b256e",
+ "lastModified": 1792296751,
+ "narHash": "sha256-xLNkhhxtCDp/L9Oj0HAqSHR3O1p7vySlDHluWuTwVwg=",
+ "rev": "15de7b93f701cf64acce511dfc494f0f6015e51b",
"type": "tarball",
- "url": "https://git.trin.one/api/v1/repos/HPCesia/nur-packages/archive/3295688aae205e9ee9a4bae0994c617dfc1b256e.tar.gz"
+ "url": "https://git.trin.one/api/v1/repos/HPCesia/nur-packages/archive/15de7b93f701cf64acce511dfc494f0f6015e51b.tar.gz"
},
"original": {
"type": "tarball",