fixed X-server conflict

This commit is contained in:
KaitoTLex 2025-06-03 21:50:23 -07:00
parent 511afa919a
commit 8ded4506da
No known key found for this signature in database
GPG key ID: 8AB934746F475D0B
9 changed files with 78 additions and 60 deletions

View file

@ -18,7 +18,7 @@
# Bootloader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
# boot.extraModulePackages = [ config.boot.kernelPackages.nvidia_x11 ];
#boot.extraModulePackages = [ config.boot.kernelPackages.nvidia_x11 ];
virtualisation.waydroid.enable = true;
boot.kernelPackages = pkgs.linuxPackages_latest;
#systemdefaults
@ -110,7 +110,9 @@
LC_TELEPHONE = "en_US.UTF-8";
LC_TIME = "en_US.UTF-8";
};
nixpkgs.config.permittedInsecurePackages = [
"olm-3.2.16"
];
services.keyd = {
enable = true;
keyboards.default = {
@ -148,6 +150,10 @@
};
};
#Asus Specific Packages
services.asusd.enable = true;
programs.rog-control-center.enable = true;
#System specific packages to install
environment.systemPackages = with pkgs; [
# nvtop
@ -155,6 +161,9 @@
davinci-resolve
wacomtablet
obs-studio
asusctl
supergfxctl
thinkfan
];
# List services that you want to enable:

View file

@ -161,16 +161,16 @@
events = [ "key" ];
command = "pamixer -d 5";
}
{
keys = [ 237 ];
events = [ "key" ];
command = "brightnessctl -d asus::kbd_backlight set 1-";
}
{
keys = [ 238 ];
events = [ "key" ];
command = "brightnessctl -d asus::kbd_backlight set +1";
}
# {
# keys = [ 237 ];
# events = [ "key" ];
# command = "${pkgs.brightnessctl} -d asus::kbd_backlight set 1-";
# }
# {
# keys = [ 238 ];
# events = [ "key" ];
# command = "${pkgs.brightnessctl} -d asus::kbd_backlight set +1";
# }
#{ keys = [ ]; events = [ "key" ]; command = "brightnessctl -d amdgpu_bl2 set +10%"; }
#{ keys = [ ]; events = [ "key" ]; command = "brightnessctl -d amdgpu_bl2 set +10%"; }

View file

@ -36,6 +36,9 @@
enable = true;
dockerCompat = true;
};
nixpkgs.config.permittedInsecurePackages = [
"olm-3.2.16"
];
boot = {
# Bootloader.
loader.systemd-boot.enable = true;