Merge remote-tracking branch 'refs/remotes/origin/master'
This commit is contained in:
commit
9a921aa73f
@ -10,11 +10,11 @@
|
||||
|
||||
boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "xhci_pci" "firewire_ohci" "usb_storage" "sd_mod" "sr_mod" "sdhci_pci" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.kernelModules = [ ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/98ff21ae-1adf-469e-8cea-3bd04cc564ab";
|
||||
{ device = "/dev/disk/by-uuid/68a22707-e30a-469b-b24b-13fccd128929";
|
||||
fsType = "xfs";
|
||||
};
|
||||
|
||||
|
@ -112,6 +112,12 @@ in
|
||||
];
|
||||
|
||||
|
||||
hardware.bluetooth = {
|
||||
enable = true;
|
||||
settings.General.Enable = "Source,Sink,Media,Socket";
|
||||
};
|
||||
|
||||
|
||||
# Xorg
|
||||
security.rtkit.enable = true;
|
||||
services = {
|
||||
|
@ -1,11 +1,6 @@
|
||||
{
|
||||
services.distccd.maxJobs = 4;
|
||||
|
||||
hardware.bluetooth = {
|
||||
enable = true;
|
||||
settings.General.Enable = "Source,Sink,Media,Socket";
|
||||
};
|
||||
|
||||
services = {
|
||||
desktopManager.plasma6.enable = true;
|
||||
displayManager.sddm = {
|
||||
|
@ -12,11 +12,6 @@
|
||||
};
|
||||
};
|
||||
|
||||
hardware.bluetooth = {
|
||||
enable = true;
|
||||
settings.General.Enable = "Source,Sink,Media,Socket";
|
||||
};
|
||||
|
||||
services = {
|
||||
desktopManager.plasma6.enable = true;
|
||||
displayManager.sddm = {
|
||||
|
Loading…
Reference in New Issue
Block a user