flake: update lock; materusPC: remove useless caps config, change sddm to x11

This commit is contained in:
2024-03-02 19:43:32 +01:00
parent 547fd5165c
commit a7ad639465
4 changed files with 73 additions and 87 deletions
@@ -17,7 +17,7 @@ in
{
#Kernel
boot.kernelPackages = pkgs.linuxPackages_zen;
boot.kernelParams = [ "rcu_nocbs=8-15,24-31" "nohz_full=8-15,24-31" "pcie_acs_override=downstream,multifunction" /*"pci-stub.ids=1002:744c"*/ "nox2apic" "nvme_core.default_ps_max_latency_us=0" "nvme_core.io_timeout=255" "nvme_core.max_retries=10" "nvme_core.shutdown_timeout=10" "amd_iommu=on" "iommu=pt" ] ++ video;
boot.kernelParams = [ "rcu_nocbs=8-15,24-31" "nohz_full=8-15,24-31" "vfio_iommu_type1.allow_unsafe_interrupts=1" "pcie_acs_override=downstream,multifunction" /*"pci-stub.ids=1002:744c"*/ "nox2apic" "nvme_core.default_ps_max_latency_us=0" "nvme_core.io_timeout=255" "nvme_core.max_retries=10" "nvme_core.shutdown_timeout=10" "amd_iommu=on" "iommu=pt" ] ++ video;
boot.kernelModules = [ "pci-stub" "amdgpu" "i2c_dev" "kvm_amd" "vfio" "vfio_iommu_type1" "vfio-pci" "v4l2loopback" ];
boot.extraModprobeConfig = ''
options kvm_amd nested=1 avic=1 npt=1 sev=0
+2 -2
View File
@@ -28,7 +28,7 @@ in
services.xserver.displayManager.sddm.enable = true;
services.xserver.displayManager.sddm.settings = {
General = {
DisplayServer = "wayland";
#DisplayServer = "wayland";
InputMethod="";
};
Theme = {
@@ -36,7 +36,7 @@ in
CursorSize = "24";
};
Wayland = {
CompositorCommand = "${pkgs.weston}/bin/weston -c ${westonSddm}";
#CompositorCommand = "${pkgs.weston}/bin/weston -c ${westonSddm}";
};
};
+1 -15
View File
@@ -32,21 +32,7 @@
# keyMap = "pl";
useXkbConfig = true; # use xkbOptions in tty.
};
services.xserver.extraLayouts.hyper-pl = {
description = "PL, hyper mod3";
languages = [ "pol" ];
symbolsFile = pkgs.writeText "hyper-pl" ''
xkb_symbols "hyper-pl"
{
include "pl(basic)"
name[Group1]="Polish HYPR";
modifier_map Mod3 { <HYPR> };
};'';
};
services.xserver.layout = "hyper-pl";
services.xserver.xkbOptions = "caps:hyper";
services.xserver.enable = true;
services.xserver.videoDrivers = [ "amdgpu" ];
services.dbus.enable = true;
@@ -135,7 +121,7 @@
QT_IM_MODULE="fcitx";
XMODIFIERS="@im=fcitx";
SDL_IM_MODULE="fcitx";
SDL_AUDIODRIVER = "pipewire";
#SDL_AUDIODRIVER = "pipewire";
#SSH_ASKPASS_REQUIRE = "prefer";