Improve compatibility for home-manager modules

pdtpartners · Feb 17, 2024 · bf34e91 · bf34e91
1 parent 3ec1c57
commit bf34e91
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -178,7 +178,7 @@ easy installation.
       nix-snapshotter.homeModules.default
     ];
 
-    // # (2) Add overlay.
+    # (2) Add overlay.
     nixpkgs.overlays = [ nix-snapshotter.overlays.default ];
 
     # (3) Enable service.
@@ -255,7 +255,7 @@ easy installation.
   in {
     imports = [
       ./hardware-configuration.nix
-      # (1) Import home-manager module.
+      # (1) Import nixos module.
       nix-snapshotter.nixosModules.default
     ];
 

diff --git a/modules/common/containerd.nix b/modules/common/containerd.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ pkgs, lib, ... }:
 let
   inherit (lib)
     mkEnableOption
@@ -11,8 +11,6 @@ let
     GOARCH
   ;
 
-  cfg = config.virtualisation.containerd;
-
   options = {
     k3sIntegration = mkEnableOption "K3s integration";
 
@@ -84,11 +82,4 @@ in {
       internal = true;
     };
   };
-
-  config = lib.mkIf cfg.enable {
-    virtualisation.containerd = lib.mkIf cfg.nixSnapshotterIntegration {
-      setSnapshotter = lib.mkDefault "nix";
-      settings = mkNixSnapshotterSettings;
-    };
-  };
 }
diff --git a/modules/flake/overlays.nix b/modules/flake/overlays.nix
@@ -9,7 +9,8 @@
       # See: https://github.com/containerd/containerd/pull/9028
       containerd = super.containerd.overrideAttrs(o: {
         src = self.fetchFromGitHub {
-          inherit (o.src) owner repo;
+          owner = "containerd";
+          repo = "containerd";
           rev = "779875a057ff98e9b754371c193fe3b0c23ae7a2";
           hash = "sha256-sXMDMX0QPbnFvRYrAP+sVFjTI9IqzOmLnmqAo8lE9pg=";
         };

diff --git a/modules/nixos/containerd.nix b/modules/nixos/containerd.nix
@@ -65,6 +65,12 @@ in {
         };
       };
     })
+    (lib.mkIf cfg.nixSnapshotterIntegration {
+      virtualisation.containerd = {
+        setSnapshotter = lib.mkDefault "nix";
+        settings = cfg.lib.mkNixSnapshotterSettings;
+      };
+    })
     (lib.mkIf (cfg.k3sIntegration && cfg.nixSnapshotterIntegration) {
       services.k3s.moreFlags = [
         "--image-service-endpoint unix:///run/nix-snapshotter/nix-snapshotter.sock"