diff --git a/flake.nix b/flake.nix index d9e89ef..0542f4c 100644 --- a/flake.nix +++ b/flake.nix @@ -278,12 +278,12 @@ }; # Valere (powerful laptop). - nixosConfigurations.kanbaru = nixpkgs.lib.nixosSystem rec { + nixosConfigurations.valere = nixpkgs.lib.nixosSystem rec { system = "x86_64-linux"; specialArgs = mkSpecialArgs system; modules = linuxOfflineGuiModules [ - ./nixos/hosts/kanbaru.nix + ./nixos/hosts/valere ./nixos/configs/steam.nix ./nixos/configs/virtualbox.nix ./nixos/configs/power-saving.nix diff --git a/nixos/configs/gui/default.nix b/nixos/configs/gui/default.nix index 8293d9d..94a63fa 100644 --- a/nixos/configs/gui/default.nix +++ b/nixos/configs/gui/default.nix @@ -36,7 +36,7 @@ ]; # 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. systemd.user.services.espanso.serviceConfig.ConditionUser = "|1000"; diff --git a/nixos/hosts/valere/default.nix b/nixos/hosts/valere/default.nix index f4eac7a..fba2c24 100644 --- a/nixos/hosts/valere/default.nix +++ b/nixos/hosts/valere/default.nix @@ -47,50 +47,49 @@ }; # Override stylix font sizes. - stylix.fonts.sizes.desktop = lib.mkForce 18; + stylix.fonts.sizes.desktop = lib.mkForce 16; # # Intel+NVIDIA / prime setup. # # 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. hardware.nvidiaOptimus.disable = true; - # TEMPORARILY DISABLED DUE TO KERNEL WONK - #specialisation.optimus.configuration = { - # system.nixos.tags = [ "NVIDIA" ]; - # services.xserver.videoDrivers = [ "nvidia" ]; + specialisation.optimus.configuration = { + system.nixos.tags = [ "NVIDIA" ]; + services.xserver.videoDrivers = [ "nvidia" ]; - # # Set up the NVIDIA half of the GPU setup. - # # These are used only in the "enabled" configuration. - # hardware.nvidia = { - # modesetting.enable = true; + # Set up the NVIDIA half of the GPU setup. + # These are used only in the "enabled" configuration. + hardware.nvidia = { + modesetting.enable = true; - # # Prefer the open NVIDIA driver. - # open = true; + # Prefer the open NVIDIA driver. + open = true; - # # Enable the nvidia-settings command. - # nvidiaSettings = true; + # Enable the nvidia-settings command. + nvidiaSettings = true; - # # Offloading setup: use GPU when asked for by command, and not otherwise. - # prime = { - # sync.enable = true; + # Offloading setup: use GPU when asked for by command, and not otherwise. + prime = { + sync.enable = true; - # # Specify how to find our GPUs. - # intelBusId = "PCI:0:2:0"; - # nvidiaBusId = "PCI:1:0:0"; - # }; + # Specify how to find our GPUs. + intelBusId = "PCI:0:2:0"; + nvidiaBusId = "PCI:1:0:0"; + }; - # }; + }; - # # Include the NVIDIA X11 driver. - # boot.extraModulePackages = [ config.boot.kernelPackages.nvidia_x11 ]; + # Include the NVIDIA X11 driver. + boot.extraModulePackages = [ config.boot.kernelPackages.nvidia_x11 ]; - # # Don't disable optimus on this config. - # hardware.nvidiaOptimus.disable = lib.mkForce false; - #}; + # Don't disable optimus on this config. + hardware.nvidiaOptimus.disable = lib.mkForce false; + }; # Provide memtest86, since that's nice. boot.loader.systemd-boot.memtest86.enable = true; @@ -129,9 +128,7 @@ # Support virtualization, thunderbolt, and poking the APCI directly. >.> boot.kernelModules = [ "thunderbolt" - "acpi_call" ]; - boot.extraModulePackages = [ config.boot.kernelPackages.acpi_call ]; # Support thunderbolt. services.hardware.bolt.enable = true;