motiejus/config
1
Fork 0
Code Packages Releases Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hosts/fwminex/configuration.nix
View File

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

2
hosts/mtworx/configuration.nix
View File

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

2
modules/base/default.nix
View File

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

18
modules/profiles/desktop/default.nix
View File

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