Merge branch 'main' of github.com:itepastra/nixconf
This commit is contained in:
commit
585b1b1b54
1 changed files with 18 additions and 16 deletions
|
|
@ -12,14 +12,14 @@
|
||||||
../../modules/websites
|
../../modules/websites
|
||||||
../../modules/plasma
|
../../modules/plasma
|
||||||
|
|
||||||
../../common
|
../../common
|
||||||
];
|
];
|
||||||
|
|
||||||
boot = rec {
|
boot = rec {
|
||||||
kernelPackages = pkgs.linuxPackages_6_8;
|
kernelPackages = pkgs.linuxPackages_6_8;
|
||||||
extraModulePackages = with kernelPackages; [
|
extraModulePackages = with kernelPackages; [
|
||||||
v4l2loopback
|
v4l2loopback
|
||||||
];
|
];
|
||||||
consoleLogLevel = 0;
|
consoleLogLevel = 0;
|
||||||
initrd.verbose = false;
|
initrd.verbose = false;
|
||||||
plymouth = rec {
|
plymouth = rec {
|
||||||
|
|
@ -38,15 +38,15 @@
|
||||||
"udev.log_priority=3"
|
"udev.log_priority=3"
|
||||||
];
|
];
|
||||||
|
|
||||||
kernelModules = [
|
kernelModules = [
|
||||||
"v4l2loopback"
|
"v4l2loopback"
|
||||||
"nct6775"
|
"nct6775"
|
||||||
"k10temp"
|
"k10temp"
|
||||||
];
|
];
|
||||||
|
|
||||||
extraModprobeConfig = ''
|
extraModprobeConfig = ''
|
||||||
options v4l2loopback devices=1 video_nr=2 card_label="OBS Cam" exclusive_caps=1
|
options v4l2loopback devices=1 video_nr=2 card_label="OBS Cam" exclusive_caps=1
|
||||||
'';
|
'';
|
||||||
|
|
||||||
loader = {
|
loader = {
|
||||||
timeout = lib.mkDefault 0;
|
timeout = lib.mkDefault 0;
|
||||||
|
|
@ -74,10 +74,10 @@
|
||||||
nvidiaSettings = true;
|
nvidiaSettings = true;
|
||||||
package = config.boot.kernelPackages.nvidiaPackages.beta;
|
package = config.boot.kernelPackages.nvidiaPackages.beta;
|
||||||
};
|
};
|
||||||
hardware.graphics = {
|
hardware.graphics = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enable32Bit = true;
|
enable32Bit = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
# Allow unfree packages
|
# Allow unfree packages
|
||||||
nixpkgs.config = {
|
nixpkgs.config = {
|
||||||
|
|
@ -299,6 +299,7 @@
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
Type = "oneshot";
|
Type = "oneshot";
|
||||||
User = "root";
|
User = "root";
|
||||||
|
RemainAfterExit = true;
|
||||||
};
|
};
|
||||||
wants = [
|
wants = [
|
||||||
"network-online.target"
|
"network-online.target"
|
||||||
|
|
@ -306,6 +307,7 @@
|
||||||
after = [
|
after = [
|
||||||
"network-online.target"
|
"network-online.target"
|
||||||
];
|
];
|
||||||
|
restartIfChanged = false;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue