summaryrefslogtreecommitdiff
path: root/services
diff options
context:
space:
mode:
authorKenny Ballou <kb@devnulllabs.io>2021-05-03 14:35:34 -0600
committerKenny Ballou <kb@devnulllabs.io>2021-05-03 14:35:34 -0600
commit0ab94bc9615801afecc4be268bd0b8fbf7a7fe32 (patch)
tree7d2728da6998ea67425e2e88dbfa0ac424eb1cf6 /services
parentf1163df1851aff6ac558375f2d6da391a9f5c57c (diff)
downloadcfg.nix-0ab94bc9615801afecc4be268bd0b8fbf7a7fe32.tar.gz
cfg.nix-0ab94bc9615801afecc4be268bd0b8fbf7a7fe32.tar.xz
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>
Diffstat (limited to 'services')
-rw-r--r--services/podman.nix19
-rw-r--r--services/printing.nix2
-rw-r--r--services/x11-laptop.nix12
3 files changed, 18 insertions, 15 deletions
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;
+ };
};
}