Compare commits

..

No commits in common. "3201e4c48baaf73669ecf324896e6a962b48bf63" and "a53d537c15f14858d0735c0c48a9575914c93853" have entirely different histories.

2 changed files with 16 additions and 24 deletions

View File

@ -18,11 +18,9 @@
];
boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "usb_storage" "usbhid" "sd_mod" "sdhci_pci" "rtsx_usb_sdmmc" ];
boot.initrd.kernelModules = [ "i915" "kvm_intel" ];
boot.initrd.kernelModules = [ "i915" ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModprobeConfig = ''
options i915 enable_guc=3 enable_fbc=1 fastboot=1
'';
boot.extraModulePackages = [ ];
boot.kernelParams = [ "mitigations=off" "luks.options=fido2-device=auto" ];
boot.tmpOnTmpfs = true;
zramSwap.enable = true;
@ -110,17 +108,17 @@
fsType = "vfat";
};
# fileSystems."/mnt/Pluto" =
# { device = "nas:/Pluto";
# fsType = "nfs";
# options = [ "noauto,users,x-systemd.automount,x-systemd.device-timeout=10,soft,timeo=14,x-systemd.idle-timeout=1min,sec=sys,exec,nfsvers=4.2" ];
# };
fileSystems."/mnt/Pluto" =
{ device = "nas:/Pluto";
fsType = "nfs";
options = [ "noauto,users,x-systemd.automount,x-systemd.device-timeout=10,soft,timeo=14,x-systemd.idle-timeout=1min,sec=sys,exec,nfsvers=4.2" ];
};
# fileSystems."/mnt/Mars" =
# { device = "nas:/Mars";
# fsType = "nfs";
# options = [ "noauto,users,x-systemd.automount,x-systemd.device-timeout=10,soft,timeo=14,x-systemd.idle-timeout=1min,sec=sys,exec,nfsvers=4.2" ];
# };
fileSystems."/mnt/Mars" =
{ device = "nas:/Mars";
fsType = "nfs";
options = [ "noauto,users,x-systemd.automount,x-systemd.device-timeout=10,soft,timeo=14,x-systemd.idle-timeout=1min,sec=sys,exec,nfsvers=4.2" ];
};
swapDevices = [ ];

View File

@ -13,23 +13,17 @@
{ criteria = "eDP-1"; status = "enable"; mode = "1920x1080"; position = "0,0"; }
];
};
#docked_c = {
# outputs = [
# { criteria = "eDP-1"; status = "enable"; mode = "1920x1080"; position = "2560,0"; }
# { criteria = "DP-1"; status = "enable"; mode = "2560x1080"; position = "0,0"; }
# ];
#};
docked_c = {
outputs = [
{ criteria = "eDP-1"; status = "enable"; mode = "1920x1080"; position = "0,0"; scale = 1.5; }
{ criteria = "DP-1"; status = "enable"; mode = "2560x1080"; position = "1920,0"; }
{ criteria = "eDP-1"; status = "enable"; mode = "1920x1080"; position = "2560,0"; }
{ criteria = "HDMI-A-1"; status = "enable"; mode = "2560x1080"; position = "0,0"; }
];
};
docked_triple = {
outputs = [
{ criteria = "eDP-1"; status = "disable"; mode = "1920x1080"; position = "4480,0"; }
{ criteria = "HDMI-A-1"; status = "enable"; mode = "1920x1080"; position = "0,0"; }
{ criteria = "DP-1"; status = "enable"; mode = "2560x1080"; position = "1920,0"; }
{ criteria = "DP-1"; status = "enable"; mode = "1920x1080"; position = "0,0"; }
{ criteria = "HDMI-A-1"; status = "enable"; mode = "2560x1080"; position = "1920,0"; }
];
};
};