From 298db108f052348a83581a315396ca1bd8d584e2 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Sat, 11 Jun 2022 16:03:15 +0200
Subject: update settings to build on 22.05

---
 system/settings/configuration/nix.nix           | 4 ++--
 system/settings/hardware/bare-metal.nix         | 2 +-
 system/settings/hardware/keyboardio-model01.nix | 4 ++--
 system/settings/hardware/mouse.nix              | 6 ++++--
 system/settings/services/xserver.nix            | 2 +-
 system/settings/user-interface.nix              | 2 +-
 6 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'system/settings')

diff --git a/system/settings/configuration/nix.nix b/system/settings/configuration/nix.nix
index 85e14e2c..0521ab1e 100644
--- a/system/settings/configuration/nix.nix
+++ b/system/settings/configuration/nix.nix
@@ -3,8 +3,8 @@
 { nix = {
     buildCores = 0;
 
-    daemonNiceLevel = 19;
-    daemonIONiceLevel = 7;
+    daemonCPUSchedPolicy = "idle";
+    daemonIOSchedClass = "idle";
 
     trustedUsers = [ "@wheel" ];
 
diff --git a/system/settings/hardware/bare-metal.nix b/system/settings/hardware/bare-metal.nix
index db668830..2dba6231 100644
--- a/system/settings/hardware/bare-metal.nix
+++ b/system/settings/hardware/bare-metal.nix
@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 
 { environment.systemPackages = with pkgs; [
-    fuse_exfat
+    exfat
     cryptsetup
     dmidecode
     hdparm
diff --git a/system/settings/hardware/keyboardio-model01.nix b/system/settings/hardware/keyboardio-model01.nix
index 7a624f56..9c44a916 100644
--- a/system/settings/hardware/keyboardio-model01.nix
+++ b/system/settings/hardware/keyboardio-model01.nix
@@ -6,8 +6,8 @@
   '';
 
   environment.systemPackages = with pkgs; [
-    arduino_core
+    arduino-core
   ];
 
-  environment.variables.ARDUINO_PATH = "${pkgs.arduino_core}/share/arduino";
+  environment.variables.ARDUINO_PATH = "${pkgs.arduino-core}/share/arduino";
 }
diff --git a/system/settings/hardware/mouse.nix b/system/settings/hardware/mouse.nix
index d43dba37..83e76d71 100644
--- a/system/settings/hardware/mouse.nix
+++ b/system/settings/hardware/mouse.nix
@@ -3,7 +3,9 @@
 { 
   services.xserver.libinput = {
     enable = true;
-    accelProfile = "flat";
-    accelSpeed = "0";
+    mouse = {
+      accelProfile = "flat";
+      accelSpeed = "0";
+    };
   };
 }
diff --git a/system/settings/services/xserver.nix b/system/settings/services/xserver.nix
index 42392224..b6a6a567 100644
--- a/system/settings/services/xserver.nix
+++ b/system/settings/services/xserver.nix
@@ -29,7 +29,7 @@ with lib;
   ];
 
   fonts = {
-    enableFontDir = true;
+    fontDir.enable = true;
     enableDefaultFonts = false;
     fontconfig = {
       antialias = true;
diff --git a/system/settings/user-interface.nix b/system/settings/user-interface.nix
index a83b6e73..c8eb18bc 100644
--- a/system/settings/user-interface.nix
+++ b/system/settings/user-interface.nix
@@ -68,7 +68,7 @@
 
   programs.dconf.enable = true;
   programs.seahorse.enable = true;
-  services.gnome3 = {
+  services.gnome = {
     gnome-keyring.enable = true;
     at-spi2-core.enable = true;
   };
-- 
cgit 1.4.1