Merge remote-tracking branch 'origin/master'

This commit is contained in:
Chris Cochrun 2022-07-05 17:05:22 -05:00
commit 57ec05b532
5 changed files with 33 additions and 9 deletions

View file

@ -49,7 +49,13 @@
# NVIDIA
services.xserver.videoDrivers = [ "nvidia" ];
hardware = {
opengl.enable = true;
opengl = {
enable = true;
extraPackages = with pkgs; [
vaapiVdpau
libvdpau-va-gl
];
};
nvidia.modesetting.enable = true;
};
@ -100,6 +106,7 @@
VISUAL = "emacsclient -c -a";
# Fixing Qt apps in other environments
# Thought I needed this but apparently they are working fine without it.
# QT_XCB_GL_INTEGRATION = "xcb_egl";
# QT_QPA_PLATFORM_PLUGIN_PATH = "${pkgs.qt5.qtbase.bin}/lib/qt-${pkgs.qt5.qtbase.qtCompatVersion}/plugins/platforms";
};
@ -160,6 +167,7 @@
usbutils
binutils
hunspell
caffeine-ng
hunspellDicts.en_US
git
transmission
@ -258,10 +266,11 @@
# hyprland
blender
neofetch
ethminer
# ethminer
lutris
protonup
# Dev tools
direnv
android-tools
nix-index
meson
@ -296,7 +305,7 @@
(import (builtins.fetchTarball {
url = https://github.com/nix-community/emacs-overlay/archive/master.tar.gz;
sha256 = "07nj3ab2jbcmr66krxy6wli23srw0vgx1jhjg2b89amzllnzbi93";
sha256 = "1v1n30a2ai5mnlkrkwv4mfczd3601sqxxlawadxariblfvg7qz4j";
}))
(self: super:

View file

@ -127,6 +127,7 @@
VISUAL = "emacsclient -c -a";
# Fixing Qt apps in other environments
# Thought I needed this but apparently they are working fine without it.
# QT_XCB_GL_INTEGRATION = "xcb_egl";
# QT_QPA_PLATFORM_PLUGIN_PATH = "${pkgs.qt5.qtbase.bin}/lib/qt-${pkgs.qt5.qtbase.qtCompatVersion}/plugins/platforms";
};
@ -174,6 +175,7 @@
usbutils
binutils
hunspell
caffeine-ng
hunspellDicts.en_US
git
transmission
@ -279,6 +281,7 @@
fet-sh
macchina
# Dev tools
direnv
android-tools
nix-index
meson