andreas/nixos-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

this does not

Browse Source
This commit is contained in:
Andreas Schaafsma 2024-11-13 05:22:44 +01:00
parent 96acd705cb
commit 2048c12baa
5 changed files with 35 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
systems/x86_64-linux/drivebystation-nix/configuration.nix
View File

@ -46,7 +46,13 @@
services.xserver.enable = true; services.xserver.enable = true;
# Enable the GNOME Desktop Environment. # 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.xserver.desktopManager.gnome.enable = true;
services.desktopManager.plasma6.enable = true; services.desktopManager.plasma6.enable = true;

10
systems/x86_64-linux/drivebystation-nix/default.nix
View File

@ -33,6 +33,7 @@ in
# inherit system; # inherit system;
imports = [ imports = [
./configuration.nix ./configuration.nix
./steam.nix
]; ];
config = { config = {
system.stateVersion = "24.05"; system.stateVersion = "24.05";
@ -81,6 +82,15 @@ in
pkgs.ntfsprogs pkgs.ntfsprogs
pkgs.my-namespace.udev-steelseries pkgs.my-namespace.udev-steelseries
pkgs.my-namespace.hello 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. # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
# wget # wget
] ]

2
systems/x86_64-linux/drivebystation-nix/hardware-configuration.nix
View File

@ -10,7 +10,7 @@
./nvidia.nix ./nvidia.nix
./acer-monitor-edid.nix ./acer-monitor-edid.nix
]; ];
boot.kernelPackages = pkgs.linuxPackages_latest;
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
boot.kernelModules = [ "kvm-amd" ]; boot.kernelModules = [ "kvm-amd" ];
boot.blacklistedKernelModules = [ ]; boot.blacklistedKernelModules = [ ];

23
systems/x86_64-linux/drivebystation-nix/nvidia.nix
View File

@ -9,11 +9,14 @@
# Load nvidia driver for Xorg and Wayland # Load nvidia driver for Xorg and Wayland
# boot.extraModulePackages = [ config.boot.kernelPackages.nvidia_x11 ]; # 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 = [ boot.kernelParams = [
"nvidia-drm.fbdev=1" "nvidia-drm.fbdev=0"
"nvidia-drm.modeset=1" "nvidia-drm.modeset=1"
# "nvidia_drm.modeset=1"
]; ];
boot.blacklistedKernelModules = [ boot.blacklistedKernelModules = [
"i915" "i915"
@ -25,9 +28,9 @@
"nvidia" "nvidia"
"nvidia-drm" "nvidia-drm"
"nvidia-modeset" "nvidia-modeset"
"nvidia-uvm" # "nvidia-uvm"
"nvidia_modeset" # "nvidia_modeset"
"nvidia_uvm" # "nvidia_uvm"
"i2c-nvidia_gpu" "i2c-nvidia_gpu"
]; ];
#boot.initrd.kernelModules = [ "nvidia" ]; #boot.initrd.kernelModules = [ "nvidia" ];
@ -61,11 +64,11 @@
nvidiaSettings = true; nvidiaSettings = true;
# Optionally, you may need to select the appropriate driver version for your specific GPU. # 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.stable;
package = config.boot.kernelPackages.nvidiaPackages.vulkan_beta; # package = config.boot.kernelPackages.nvidiaPackages.production;
}; };
# users.users.andreas = { users.users.andreas = {
# extraGroups = [ "video" "render" ]; extraGroups = [ "video" "render" ];
# }; };
} }

8
systems/x86_64-linux/drivebystation-nix/steam.nix
View File

@ -35,7 +35,7 @@
enable = true; enable = true;
env = { env = {
WLR_RENDERER = "vulkan"; WLR_RENDERER = "vulkan";
DXVK_HDR = "1"; DXVK_HDR = "1 ";
ENABLE_GAMESCOPE_WSI = "1"; ENABLE_GAMESCOPE_WSI = "1";
WINE_FULLSCREEN_FSR = "1"; WINE_FULLSCREEN_FSR = "1";
# Games allegedly prefer X11 # Games allegedly prefer X11
@ -48,9 +48,9 @@
"-e" # Enable steam integration "-e" # Enable steam integration
"--steam" "--steam"
# "--adaptive-sync" "--adaptive-sync"
# "--hdr-enabled" "--hdr-enabled"
# "--hdr-itm-enable" "--hdr-itm-enable"
# External monitor # External monitor
"--prefer-output DP-3" "--prefer-output DP-3"