Merge branch 'main' of github.com:alexmickelson/infrastructure

This commit is contained in:
2026-03-04 10:02:54 -07:00

View File

@@ -5,7 +5,6 @@
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
#boot.kernelPackages = pkgs.linuxKernel.kernels.linux_6_6;
# boot.extraModulePackages = with config.boot.kernelPackages; [ xpadneo ]; # boot.extraModulePackages = with config.boot.kernelPackages; [ xpadneo ];
# boot.kernelModules = [ "hid_xpadneo" ]; # boot.kernelModules = [ "hid_xpadneo" ];
# boot.kernelModules = [ # boot.kernelModules = [
@@ -13,7 +12,16 @@
# "uinput" # "uinput"
# ]; # ];
boot.kernelPackages = pkgs.linuxPackages_6_1; boot.kernelPackages = pkgs.linuxPackages_6_6;
# boot.kernelPackages = pkgs.linuxPackages_6_1;
services.xserver.enable = true;
services.xserver.displayManager.gdm = {
enable = true;
wayland = false;
};
services.xserver.desktopManager.gnome.enable = true;
#boot.kernelParams = [ #boot.kernelParams = [
# "amdgpu.discovery=1" # "amdgpu.discovery=1"
#]; #];
@@ -38,9 +46,6 @@
LC_TIME = "en_US.UTF-8"; LC_TIME = "en_US.UTF-8";
}; };
services.xserver.enable = true;
services.displayManager.gdm.enable = true;
services.desktopManager.gnome.enable = true;
services.xserver.xkb = { services.xserver.xkb = {
layout = "us"; layout = "us";
variant = ""; variant = "";