From 0ab94bc9615801afecc4be268bd0b8fbf7a7fe32 Mon Sep 17 00:00:00 2001
From: Kenny Ballou <kb@devnulllabs.io>
Date: Mon, 3 May 2021 14:35:34 -0600
Subject: update channel: use nixos-unstable

Using `nixos-unstable` channel, various configuration keys have changed
and need to be updated to build system configuration.

Signed-off-by: Kenny Ballou <kb@devnulllabs.io>
---
 overlays/00-gnome-applications.nix |  1 -
 services/podman.nix                | 19 ++++++++++---------
 services/printing.nix              |  2 +-
 services/x11-laptop.nix            | 12 +++++++-----
 system/security.nix                |  1 -
 5 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/overlays/00-gnome-applications.nix b/overlays/00-gnome-applications.nix
index 8f888a9..8ccc3c2 100644
--- a/overlays/00-gnome-applications.nix
+++ b/overlays/00-gnome-applications.nix
@@ -8,7 +8,6 @@ self: super:
       gnome3.gnome-boxes
       gnome3.gnome-dictionary
       gnome3.evolution-data-server
-      gnome3.evolution
       gnome3.gnome-shell-extensions
       gnome3.gnome-tweak-tool
       gnome3.gnome-themes-extra
diff --git a/services/podman.nix b/services/podman.nix
index f6a8c49..f3b5f51 100644
--- a/services/podman.nix
+++ b/services/podman.nix
@@ -5,15 +5,16 @@
       enable = true;
       dockerCompat = true;
     };
-    containers.containersConf.extraConfig = ''
-      [engine.runtimes]
-      runc = [
-         "${pkgs.runc}"
-      ]
-      crun = [
-        "${pkgs.crun}"
-      ]
-    '';
+    containers.containersConf.settings = {
+      engine.runtimes = {
+        runc = [
+          "${pkgs.runc}"
+        ];
+        crun = [
+          "${pkgs.crun}"
+        ];
+      };
+    };
     oci-containers.backend = "podman";
   };
 }
diff --git a/services/printing.nix b/services/printing.nix
index 39eccab..0d0a8c9 100644
--- a/services/printing.nix
+++ b/services/printing.nix
@@ -4,6 +4,6 @@
   services.printing = {
     enable = true;
     startWhenNeeded = true;
-    drivers = with pkgs; [ gutenprint hplip cups-googlecloudprint ];
+    drivers = with pkgs; [ gutenprint hplip ];
   };
 }
diff --git a/services/x11-laptop.nix b/services/x11-laptop.nix
index a14bf8d..4ff0513 100644
--- a/services/x11-laptop.nix
+++ b/services/x11-laptop.nix
@@ -3,10 +3,12 @@
   # Enable touchpad support.
   services.xserver.libinput = {
     enable = true;
-    accelProfile = "adaptive";
-    accelSpeed = "0.5";
-    disableWhileTyping = true;
-    scrollMethod = "twofinger";
-    horizontalScrolling = false;
+    touchpad = {
+      accelProfile = "adaptive";
+      accelSpeed = "0.5";
+      disableWhileTyping = true;
+      scrollMethod = "twofinger";
+      horizontalScrolling = false;
+    };
   };
 }
diff --git a/system/security.nix b/system/security.nix
index 486f714..a31d7fb 100644
--- a/system/security.nix
+++ b/system/security.nix
@@ -1,4 +1,3 @@
 { config, ... }:
 {
-  security.hideProcessInformation = true;
 }
-- 
cgit v1.2.1