From cd4e7048c573289c088e82ffb45035f7717ce9a4 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.dev>
Date: Sat, 21 Sep 2024 12:46:14 +0100
Subject: [PATCH] Extract Docker configuration to a mixin
---
lib/nixos/configuration.nix | 14 ++++----------
modules/mixins/docker.nix | 10 ++++++++++
2 files changed, 14 insertions(+), 10 deletions(-)
create mode 100644 modules/mixins/docker.nix
diff --git a/lib/nixos/configuration.nix b/lib/nixos/configuration.nix
index 29a7e50a..70ed52ac 100644
--- a/lib/nixos/configuration.nix
+++ b/lib/nixos/configuration.nix
@@ -9,7 +9,10 @@ let
username = "opdavies";
in
{
- imports = [ ../../modules/mixins/fonts.nix ];
+ imports = [
+ ../../modules/mixins/docker.nix
+ ../../modules/mixins/fonts.nix
+ ];
nixpkgs.config = {
allowUnfree = true;
@@ -200,15 +203,6 @@ in
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "22.11"; # Did you read the comment?
- virtualisation.docker = {
- enable = true;
-
- autoPrune = {
- enable = true;
- dates = "weekly";
- };
- };
-
programs.zsh.enable = true;
programs.zsh.histSize = 5000;
diff --git a/modules/mixins/docker.nix b/modules/mixins/docker.nix
new file mode 100644
index 00000000..1a9a4b9d
--- /dev/null
+++ b/modules/mixins/docker.nix
@@ -0,0 +1,10 @@
+{
+ virtualisation.docker = {
+ enable = true;
+
+ autoPrune = {
+ enable = true;
+ dates = "weekly";
+ };
+ };
+}