diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/common.nix | 12 | ||||
| -rw-r--r-- | modules/gnome.nix | 18 | ||||
| -rw-r--r-- | modules/nvidia.nix | 51 |
3 files changed, 11 insertions, 70 deletions
diff --git a/modules/common.nix b/modules/common.nix index fdef280..c696bc7 100644 --- a/modules/common.nix +++ b/modules/common.nix @@ -66,12 +66,12 @@ inetutils arp-scan pciutils lshw lsof inxi iw pmutils acpi acpid sysprof wireshark hardinfo remmina vlc celluloid foliate calibre - yt-dlp ffmpeg_7-full handbrake subtitlecomposer mpv helvum - gimp krita aseprite mypaint rnote - blender inkscape obs-studio darktable + yt-dlp ffmpeg_7-full handbrake mpv helvum + gimp krita aseprite rnote + blender inkscape obs-studio darktable davinci-resolve renderdoc - audacity musescore reaper bitwig-studio - lagrange senpai signal-desktop + audacity musescore muse-sounds-manager reaper bitwig-studio + lagrange senpai signal-desktop alpaca qemu_full virtiofsd openvpn openvpn3 update-resolv-conf @@ -95,8 +95,6 @@ borgbackup pika-backup prismlauncher xonotic - ]) ++ (with unstablePkgs; [ - davinci-resolve muse-sounds-manager alpaca ]) ++ (with auxiliaryPkgs; [ ghidra ngfx retroarch ]); diff --git a/modules/gnome.nix b/modules/gnome.nix index 7fde00d..39495fa 100644 --- a/modules/gnome.nix +++ b/modules/gnome.nix @@ -43,22 +43,4 @@ gtk-application-prefer-dark-theme = 1 ''; }; - - # enable triple buffering which makes mutter supposedly feel smoother - nixpkgs.overlays = [ - # GNOME 46: triple-buffering-v4-46 - (final: prev: { - gnome = prev.gnome.overrideScope (gnomeFinal: gnomePrev: { - mutter = gnomePrev.mutter.overrideAttrs (old: { - src = pkgs.fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "vanvugt"; - repo = "mutter"; - rev = "triple-buffering-v4-46"; - hash = "sha256-C2VfW3ThPEZ37YkX7ejlyumLnWa9oij333d5c4yfZxc="; - }; - }); - }); - }) - ]; } diff --git a/modules/nvidia.nix b/modules/nvidia.nix index efb38a3..c12bfdc 100644 --- a/modules/nvidia.nix +++ b/modules/nvidia.nix @@ -1,63 +1,24 @@ -{ config, lib, pkgs, fetchpatch, ... }: +{ config, lib, pkgs, ... }: -let - # Fixes framebuffer with linux 6.11 - fbdev_linux_611_patch = fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/NVIDIA/open-gpu-kernel-modules/pull/692.patch"; - hash = "sha256-OYw8TsHDpBE5DBzdZCBT45+AiznzO9SfECz5/uXN5Uc="; - }; -in { - # Enable OpenGL - hardware.opengl = { + hardware.graphics = { enable = true; - driSupport = true; - driSupport32Bit = true; + enable32Bit = true; }; - # Load nvidia driver for Xorg and Wayland services.xserver.videoDrivers = ["nvidia"]; hardware.nvidia = { - - # Modesetting is required. modesetting.enable = true; - - # Nvidia power management. Experimental, and can cause sleep/suspend to fail. powerManagement.enable = true; - # Fine-grained power management. Turns off GPU when not in use. - # Experimental and only works on modern Nvidia GPUs (Turing or newer). powerManagement.finegrained = false; - # Use the NVidia open source kernel module (not to be confused with the - # independent third-party "nouveau" open source driver). - # Support is limited to the Turing and later architectures. Full list of - # supported GPUs is at: - # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus - # Only available from driver 515.43.04+ - # Currently alpha-quality/buggy, so false is currently the recommended setting. - # open = false; - - # Enable the Nvidia settings menu, - # accessible via `nvidia-settings`. # note: fails to build after 560 nvidiaSettings = false; - # Optionally, you may need to select the appropriate driver version for your specific GPU. - # package = config.boot.kernelPackages.nvidiaPackages.beta; - - # note: this is enabled by default for nvidia 555 so maybe it should be true? - # very crashy :( - open = false; + # sadly still very crashy :( + open = false; - package = config.boot.kernelPackages.nvidiaPackages.mkDriver { - version = "560.35.03"; - sha256_64bit = "sha256-8pMskvrdQ8WyNBvkU/xPc/CtcYXCa7ekP73oGuKfH+M="; - sha256_aarch64 = "sha256-s8ZAVKvRNXpjxRYqM3E5oss5FdqW+tv1qQC2pDjfG+s="; - openSha256 = "sha256-/32Zf0dKrofTmPZ3Ratw4vDM7B+OgpC4p7s+RHUjCrg="; - settingsSha256 = "sha256-kQsvDgnxis9ANFmwIwB7HX5MkIAcpEEAHc8IBOLdXvk="; - persistencedSha256 = "sha256-E2J2wYYyRu7Kc3MMZz/8ZIemcZg68rkzvqEwFAL3fFs="; - #patchesOpen = [ fbdev_linux_611_patch ]; - }; + package = config.boot.kernelPackages.nvidiaPackages.beta; }; } |