desktop: minor moving around xorg/displaymanager, use stable kernel pkgs

This commit is contained in:
Motiejus Jakštys 2024-05-30 17:25:54 +03:00
parent 178aa66a03
commit da17773e51
4 changed files with 15 additions and 20 deletions

View File

@ -10,7 +10,6 @@
boot = {
initrd.availableKernelModules = ["usb_storage" "sd_mod" "xhci_pci" "thunderbolt" "nvme" "usbhid"];
kernelPackages = pkgs.zfs.latestCompatibleLinuxPackages;
loader.systemd-boot.enable = true;
supportedFilesystems = ["zfs"];
zfs = {

View File

@ -1,5 +1,4 @@
{
pkgs,
config,
myData,
...
@ -15,7 +14,6 @@ in {
];
boot = {
kernelPackages = pkgs.linuxPackages_latest;
kernelModules = ["kvm-intel"];
#kernelParams = ["intel_pstate=disable"];
loader.systemd-boot.enable = true;

View File

@ -48,7 +48,7 @@ in {
"kernel.kptr_restrict" = "0";
};
kernelPackages = lib.mkDefault pkgs.zfs.latestCompatibleLinuxPackages;
kernelPackages = lib.mkDefault pkgs.linuxPackages;
supportedFilesystems = ["btrfs"];
};

View File

@ -53,27 +53,29 @@ in {
avahi = {
enable = true;
nssmdns = true;
nssmdns4 = true;
openFirewall = true;
};
xserver = {
enable = true;
xkb = {
layout = "us,lt";
xkbOptions = "grp:alt_shift_toggle";
options = "grp:alt_shift_toggle";
};
desktopManager.xfce.enable = true;
windowManager.awesome.enable = true;
displayManager.lightdm.enable = true;
};
displayManager = {
lightdm.enable = true;
defaultSession = "none+awesome";
autoLogin = {
enable = true;
user = username;
};
};
};
pipewire = {
enable = true;
@ -238,12 +240,8 @@ in {
]
(lib.mkIf (pkgs.stdenv.hostPlatform.system == "x86_64-linux") [
i7z
(nvtop.override {
amd = true;
intel = true;
msm = false;
nvidia = false;
})
nvtopPackages.amd
nvtopPackages.intel
joplin-desktop
intel-gpu-tools