talon: switch community to submodule

This commit is contained in:
Kate 2024-11-25 09:36:34 -07:00
parent d0d10112c3
commit 712a66f7f6
2 changed files with 42 additions and 33 deletions

View file

@ -3,7 +3,10 @@
# #
{ config, ... }: { config, ... }:
{ {
programs.ccache.enable = true; programs.ccache = {
enable = true;
cacheDir = "/nix/var/cache/ccache";
};
nix.settings.extra-sandbox-paths = [ config.programs.ccache.cacheDir ]; nix.settings.extra-sandbox-paths = [ config.programs.ccache.cacheDir ];
nixpkgs.overlays = [ nixpkgs.overlays = [
@ -14,6 +17,11 @@
export CCACHE_DIR="${config.programs.ccache.cacheDir}" export CCACHE_DIR="${config.programs.ccache.cacheDir}"
export CCACHE_UMASK=007 export CCACHE_UMASK=007
ls -lah /tmp
ls -lah /nix
ls -lah /nix/var
ls -lah /nix/var/cache
if [ ! -d "$CCACHE_DIR" ]; then if [ ! -d "$CCACHE_DIR" ]; then
echo "=====" echo "====="
echo "Directory '$CCACHE_DIR' does not exist" echo "Directory '$CCACHE_DIR' does not exist"

View file

@ -50,11 +50,11 @@
# Intel+NVIDIA / prime setup. # Intel+NVIDIA / prime setup.
# #
services.xserver.videoDrivers = ["nvidia"]; services.xserver.videoDrivers = [ "nvidia" ];
# Set up the NVIDIA half of the GPU setup. # Set up the NVIDIA half of the GPU setup.
# These are used only in the "enabled" configuration. # These are used only in the "enabled" configuration.
system.nixos.tags = ["Intel"]; system.nixos.tags = [ "Intel" ];
hardware.nvidia = { hardware.nvidia = {
modesetting.enable = true; modesetting.enable = true;
@ -80,7 +80,7 @@
# Provide a configuration that uses the full GPU power of the system. # Provide a configuration that uses the full GPU power of the system.
specialisation.optimus.configuration = { specialisation.optimus.configuration = {
system.nixos.tags = lib.mkForce ["NVIDIA"]; system.nixos.tags = lib.mkForce [ "NVIDIA" ];
# Don't disable optimus on this config. # Don't disable optimus on this config.
hardware.nvidiaOptimus.disable = lib.mkForce false; hardware.nvidiaOptimus.disable = lib.mkForce false;
@ -93,10 +93,22 @@
# Hardware config. # Hardware config.
# #
# Use the latest kernel, until the Dell stuff makes it into # Use the latest kernel, and our patches, until the Dell+Alienware stuff makes it into
# more mainline kernels.~ # more mainline kernels. We'll include ccache so we can iterate sanely.
boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelPackages = pkgs.linuxPackages_latest;
# Support the Dell Privacy Driver.
boot.kernelPatches = [
{
name = "enable-dell-privacy";
patch = ./00-support-dell-smbios.patch;
extraStructuredConfig = with lib.kernel; {
DELL_WMI_PRIVACY = yes;
};
}
];
boot.initrd.availableKernelModules = [ boot.initrd.availableKernelModules = [
"xhci_pci" "xhci_pci"
"thunderbolt" "thunderbolt"
@ -115,17 +127,6 @@
]; ];
boot.extraModulePackages = [ config.boot.kernelPackages.acpi_call ]; boot.extraModulePackages = [ config.boot.kernelPackages.acpi_call ];
# Support the Dell Privacy Driver.
boot.kernelPatches = [ {
name = "enable-dell-privacy";
patch = ./00-support-dell-smbios.patch;
extraStructuredConfig = with lib.kernel; {
DELL_WMI_PRIVACY = yes;
};
} ];
# Support thunderbolt. # Support thunderbolt.
services.hardware.bolt.enable = true; services.hardware.bolt.enable = true;