valere: updates~
This commit is contained in:
parent
302a8ec1b3
commit
ef5d5b7e02
3 changed files with 29 additions and 32 deletions
|
@ -278,12 +278,12 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
# Valere (powerful laptop).
|
# Valere (powerful laptop).
|
||||||
nixosConfigurations.kanbaru = nixpkgs.lib.nixosSystem rec {
|
nixosConfigurations.valere = nixpkgs.lib.nixosSystem rec {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
specialArgs = mkSpecialArgs system;
|
specialArgs = mkSpecialArgs system;
|
||||||
|
|
||||||
modules = linuxOfflineGuiModules [
|
modules = linuxOfflineGuiModules [
|
||||||
./nixos/hosts/kanbaru.nix
|
./nixos/hosts/valere
|
||||||
./nixos/configs/steam.nix
|
./nixos/configs/steam.nix
|
||||||
./nixos/configs/virtualbox.nix
|
./nixos/configs/virtualbox.nix
|
||||||
./nixos/configs/power-saving.nix
|
./nixos/configs/power-saving.nix
|
||||||
|
|
|
@ -36,7 +36,7 @@
|
||||||
];
|
];
|
||||||
|
|
||||||
# Enable espanso, when not on wayland.
|
# Enable espanso, when not on wayland.
|
||||||
services.espanso.enable = true;
|
# services.espanso.enable = true;
|
||||||
|
|
||||||
# Espanso will try to run in any session; so we'll tell it not to run for _system_ users.
|
# Espanso will try to run in any session; so we'll tell it not to run for _system_ users.
|
||||||
systemd.user.services.espanso.serviceConfig.ConditionUser = "|1000";
|
systemd.user.services.espanso.serviceConfig.ConditionUser = "|1000";
|
||||||
|
|
|
@ -47,50 +47,49 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
# Override stylix font sizes.
|
# Override stylix font sizes.
|
||||||
stylix.fonts.sizes.desktop = lib.mkForce 18;
|
stylix.fonts.sizes.desktop = lib.mkForce 16;
|
||||||
|
|
||||||
#
|
#
|
||||||
# Intel+NVIDIA / prime setup.
|
# Intel+NVIDIA / prime setup.
|
||||||
#
|
#
|
||||||
# Provide a configuration that uses the full GPU power of the system.
|
# Provide a configuration that uses the full GPU power of the system.
|
||||||
system.nixos.tags = [ "AMD" ];
|
system.nixos.tags = [ "Intel" ];
|
||||||
|
|
||||||
# Disable the NVIDIA GPU unless we explicitly request it.
|
# Disable the NVIDIA GPU unless we explicitly request it.
|
||||||
hardware.nvidiaOptimus.disable = true;
|
hardware.nvidiaOptimus.disable = true;
|
||||||
|
|
||||||
# TEMPORARILY DISABLED DUE TO KERNEL WONK
|
specialisation.optimus.configuration = {
|
||||||
#specialisation.optimus.configuration = {
|
system.nixos.tags = [ "NVIDIA" ];
|
||||||
# system.nixos.tags = [ "NVIDIA" ];
|
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.
|
||||||
# hardware.nvidia = {
|
hardware.nvidia = {
|
||||||
# modesetting.enable = true;
|
modesetting.enable = true;
|
||||||
|
|
||||||
# # Prefer the open NVIDIA driver.
|
# Prefer the open NVIDIA driver.
|
||||||
# open = true;
|
open = true;
|
||||||
|
|
||||||
# # Enable the nvidia-settings command.
|
# Enable the nvidia-settings command.
|
||||||
# nvidiaSettings = true;
|
nvidiaSettings = true;
|
||||||
|
|
||||||
# # Offloading setup: use GPU when asked for by command, and not otherwise.
|
# Offloading setup: use GPU when asked for by command, and not otherwise.
|
||||||
# prime = {
|
prime = {
|
||||||
# sync.enable = true;
|
sync.enable = true;
|
||||||
|
|
||||||
# # Specify how to find our GPUs.
|
# Specify how to find our GPUs.
|
||||||
# intelBusId = "PCI:0:2:0";
|
intelBusId = "PCI:0:2:0";
|
||||||
# nvidiaBusId = "PCI:1:0:0";
|
nvidiaBusId = "PCI:1:0:0";
|
||||||
# };
|
};
|
||||||
|
|
||||||
# };
|
};
|
||||||
|
|
||||||
# # Include the NVIDIA X11 driver.
|
# Include the NVIDIA X11 driver.
|
||||||
# boot.extraModulePackages = [ config.boot.kernelPackages.nvidia_x11 ];
|
boot.extraModulePackages = [ config.boot.kernelPackages.nvidia_x11 ];
|
||||||
|
|
||||||
# # 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;
|
||||||
#};
|
};
|
||||||
|
|
||||||
# Provide memtest86, since that's nice.
|
# Provide memtest86, since that's nice.
|
||||||
boot.loader.systemd-boot.memtest86.enable = true;
|
boot.loader.systemd-boot.memtest86.enable = true;
|
||||||
|
@ -129,9 +128,7 @@
|
||||||
# Support virtualization, thunderbolt, and poking the APCI directly. >.>
|
# Support virtualization, thunderbolt, and poking the APCI directly. >.>
|
||||||
boot.kernelModules = [
|
boot.kernelModules = [
|
||||||
"thunderbolt"
|
"thunderbolt"
|
||||||
"acpi_call"
|
|
||||||
];
|
];
|
||||||
boot.extraModulePackages = [ config.boot.kernelPackages.acpi_call ];
|
|
||||||
|
|
||||||
# Support thunderbolt.
|
# Support thunderbolt.
|
||||||
services.hardware.bolt.enable = true;
|
services.hardware.bolt.enable = true;
|
||||||
|
|
Loading…
Add table
Reference in a new issue