diff --git a/systems/x86_64-linux/drivebystation-nix/configuration.nix b/systems/x86_64-linux/drivebystation-nix/configuration.nix index d95c3bc..8242def 100644 --- a/systems/x86_64-linux/drivebystation-nix/configuration.nix +++ b/systems/x86_64-linux/drivebystation-nix/configuration.nix @@ -46,7 +46,13 @@ services.xserver.enable = true; # Enable the GNOME Desktop Environment. - services.xserver.displayManager.gdm.enable = true; + services.xserver.displayManager.gdm.enable = true; + # services.xserver.displayManager.lightdm.enable = true; + # services.xserver.displayManager.autoLogin.enable = true; + # services.xserver.displayManager.autoLogin.user = "andreas"; + # systemd.services."getty@tty1".enable = false; + # systemd.services."autovt@tty1".enable = false; + services.xserver.desktopManager.gnome.enable = true; services.desktopManager.plasma6.enable = true; diff --git a/systems/x86_64-linux/drivebystation-nix/default.nix b/systems/x86_64-linux/drivebystation-nix/default.nix index bf906b2..e496efd 100644 --- a/systems/x86_64-linux/drivebystation-nix/default.nix +++ b/systems/x86_64-linux/drivebystation-nix/default.nix @@ -33,6 +33,7 @@ in # inherit system; imports = [ ./configuration.nix + ./steam.nix ]; config = { system.stateVersion = "24.05"; @@ -81,6 +82,15 @@ in pkgs.ntfsprogs pkgs.my-namespace.udev-steelseries pkgs.my-namespace.hello + + # pkgs.nvtopPackages.nvidia + # pkgs.mesa + # pkgs.vulkan-loader + # pkgs.vulkan-validation-layers + # pkgs.vulkan-extension-layer + # pkgs.vulkan-tools + # pkgs.libva + # pkgs.libva-utils # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. # wget ] diff --git a/systems/x86_64-linux/drivebystation-nix/hardware-configuration.nix b/systems/x86_64-linux/drivebystation-nix/hardware-configuration.nix index 55d774e..08118f3 100644 --- a/systems/x86_64-linux/drivebystation-nix/hardware-configuration.nix +++ b/systems/x86_64-linux/drivebystation-nix/hardware-configuration.nix @@ -10,7 +10,7 @@ ./nvidia.nix ./acer-monitor-edid.nix ]; - + boot.kernelPackages = pkgs.linuxPackages_latest; boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; boot.kernelModules = [ "kvm-amd" ]; boot.blacklistedKernelModules = [ ]; diff --git a/systems/x86_64-linux/drivebystation-nix/nvidia.nix b/systems/x86_64-linux/drivebystation-nix/nvidia.nix index 077c371..323b512 100644 --- a/systems/x86_64-linux/drivebystation-nix/nvidia.nix +++ b/systems/x86_64-linux/drivebystation-nix/nvidia.nix @@ -9,11 +9,14 @@ # Load nvidia driver for Xorg and Wayland # boot.extraModulePackages = [ config.boot.kernelPackages.nvidia_x11 ]; - boot.extraModulePackages = [ config.boot.kernelPackages.nvidia_x11_vulkan_beta ]; + # boot.extraModulePackages = [ config.boot.kernelPackages.nvidia_x11_production ]; + boot.extraModulePackages = [ config.boot.kernelPackages.nvidia_x11 ]; + boot.kernelParams = [ - "nvidia-drm.fbdev=1" + "nvidia-drm.fbdev=0" "nvidia-drm.modeset=1" + # "nvidia_drm.modeset=1" ]; boot.blacklistedKernelModules = [ "i915" @@ -25,9 +28,9 @@ "nvidia" "nvidia-drm" "nvidia-modeset" - "nvidia-uvm" - "nvidia_modeset" - "nvidia_uvm" + # "nvidia-uvm" + # "nvidia_modeset" + # "nvidia_uvm" "i2c-nvidia_gpu" ]; #boot.initrd.kernelModules = [ "nvidia" ]; @@ -61,11 +64,11 @@ nvidiaSettings = true; # Optionally, you may need to select the appropriate driver version for your specific GPU. - # package = config.boot.kernelPackages.nvidiaPackages.beta; - package = config.boot.kernelPackages.nvidiaPackages.vulkan_beta; + package = config.boot.kernelPackages.nvidiaPackages.stable; + # package = config.boot.kernelPackages.nvidiaPackages.production; }; - # users.users.andreas = { - # extraGroups = [ "video" "render" ]; - # }; + users.users.andreas = { + extraGroups = [ "video" "render" ]; + }; } diff --git a/systems/x86_64-linux/drivebystation-nix/steam.nix b/systems/x86_64-linux/drivebystation-nix/steam.nix index 7a38504..e1086b7 100644 --- a/systems/x86_64-linux/drivebystation-nix/steam.nix +++ b/systems/x86_64-linux/drivebystation-nix/steam.nix @@ -35,7 +35,7 @@ enable = true; env = { WLR_RENDERER = "vulkan"; - DXVK_HDR = "1"; + DXVK_HDR = "1 "; ENABLE_GAMESCOPE_WSI = "1"; WINE_FULLSCREEN_FSR = "1"; # Games allegedly prefer X11 @@ -48,9 +48,9 @@ "-e" # Enable steam integration "--steam" - # "--adaptive-sync" - # "--hdr-enabled" - # "--hdr-itm-enable" + "--adaptive-sync" + "--hdr-enabled" + "--hdr-itm-enable" # External monitor "--prefer-output DP-3"