Merge branch 'master' into 'feature/ha-zbt-2-thread'
# Conflicts: # machines/mibook/configuration.nix
This commit is contained in:
@@ -36,7 +36,7 @@
|
||||
|
||||
|
||||
hardware.nvidia.prime = {
|
||||
sync.enable = true;
|
||||
sync.enable = false;
|
||||
|
||||
nvidiaBusId = "PCI:01:00:0";
|
||||
intelBusId = "PCI:00:2:0";
|
||||
|
||||
@@ -19,7 +19,7 @@ in
|
||||
my.hardware = {
|
||||
bluetooth.enable = true;
|
||||
sound.enable = false;
|
||||
nvidia.enable = true;
|
||||
nvidia.enable = false;
|
||||
};
|
||||
my.services = {
|
||||
vpn.enable = true;
|
||||
|
||||
Reference in New Issue
Block a user