Compare commits

..

No commits in common. "8bf5603afc2dc5383cd8424a7c22c9cb725cc590" and "10fba583b7815b043b5813141480c97b7e44942e" have entirely different histories.

3 changed files with 3 additions and 14 deletions

View File

@ -57,7 +57,6 @@
protonvpn-gui # Proton vpn gui app protonvpn-gui # Proton vpn gui app
beets # Music tagger beets # Music tagger
nicotine-plus # Amazing soulseek client nicotine-plus # Amazing soulseek client
prismlauncher # Best minecraft launcher
(nerdfonts.override { fonts = [ "CascadiaCode" ]; }) # Best font (nerdfonts.override { fonts = [ "CascadiaCode" ]; }) # Best font
(retroarch.override { cores = with libretro; [ snes9x ]; }) (retroarch.override { cores = with libretro; [ snes9x ]; })

View File

@ -7,21 +7,13 @@
./modules/wifi-dongle.nix ./modules/wifi-dongle.nix
./modules/disable-hibernation.nix ./modules/disable-hibernation.nix
./modules/dns-over-https.nix ./modules/dns-over-https.nix
# ./modules/nvidia.nix ./modules/nvidia.nix
]; ];
# Bootloader. # Bootloader.
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
# Latest kernel
boot.kernelPackages = pkgs.linuxPackages;
boot.kernelParams = [
"nouveau.config=NvGspRM=1"
"nouveau.debug=info,VBIOS=info,gsp=debug"
];
# Set the hostname # Set the hostname
networking.hostName = "nixos"; networking.hostName = "nixos";
@ -123,11 +115,11 @@
# Open Tablet Driver setup # Open Tablet Driver setup
hardware.opentabletdriver.enable = true; hardware.opentabletdriver.enable = true;
# load amdgpu and nouveau at boot # load amdgpu at boot
boot.initrd.kernelModules = [ "amdgpu" ]; boot.initrd.kernelModules = [ "amdgpu" ];
# Load nvidia driver for Xorg and Wayland # Load nvidia driver for Xorg and Wayland
services.xserver.videoDrivers = [ "amdgpu" ]; services.xserver.videoDrivers = [ "amdgpu" "nvidia" ];
# Steam settings # Steam settings
programs.steam = { programs.steam = {

View File

@ -1,7 +1,5 @@
{ config, ... }: { config, ... }:
{ {
services.xserver.videoDrivers = [ "nvidia" ];
# Nvidia settings # Nvidia settings
hardware.nvidia = { hardware.nvidia = {