From 26a11e0df092441a6d3241e4fd6fdb14c2f723b6 Mon Sep 17 00:00:00 2001
From: xinyangli <lixinyang411@gmail.com>
Date: Thu, 7 Mar 2024 12:03:59 +0800
Subject: [PATCH] fix: xkb options change, see nixpkgs#259891
---
machines/calcite/configuration.nix | 5 ++---
machines/calcite/hardware-configuration.nix | 5 +++++
machines/dolomite/default.nix | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/machines/calcite/configuration.nix b/machines/calcite/configuration.nix
index e02357e..a93f49d 100644
--- a/machines/calcite/configuration.nix
+++ b/machines/calcite/configuration.nix
@@ -73,8 +73,8 @@
# Configure keymap in X11
services.xserver = {
- layout = "us";
- xkbVariant = "";
+ xkb.layout = "us";
+ xkb.variant = "";
};
# Keyboard mapping on internal keyboard
services.keyd = {
@@ -294,7 +294,6 @@
libvirtd.enable = true;
podman = {
enable = true;
- enableNvidia = true;
};
docker = {
enable = true;
diff --git a/machines/calcite/hardware-configuration.nix b/machines/calcite/hardware-configuration.nix
index c84f41b..9ebd38d 100644
--- a/machines/calcite/hardware-configuration.nix
+++ b/machines/calcite/hardware-configuration.nix
@@ -49,4 +49,9 @@
enable = true;
driSupport32Bit = true;
};
+
+ hardware.nvidia = {
+ powerManagement.enable = true;
+ dynamicBoost.enable = lib.mkForce false;
+ };
}
diff --git a/machines/dolomite/default.nix b/machines/dolomite/default.nix
index 12aee75..1599db5 100644
--- a/machines/dolomite/default.nix
+++ b/machines/dolomite/default.nix
@@ -38,7 +38,7 @@
networking.firewall.allowedUDPPorts = [ ] ++ (lib.range 6311 6314);
custom.prometheus = {
- enable = true;
+ enable = false;
exporters.enable = true;
grafana = {
enable = true;