modules/home-manager/programs/calendar.nix

@@ -1,14 +1,11 @@
-{ config, lib, ... }:
+{ config, pkgs, lib, ... }:
 
 let
   cfg = config.local.programs.calendar;
 
   mkCalOpts = name: {
     enable = lib.mkEnableOption name;
-
+    package = lib.mkPackageOption pkgs name { };
-    # Custom package doesn't work yet.
-    # See: https://github.com/nix-community/home-manager/pull/5428
-    # package = lib.mkPackageOption pkgs name { };
   };
 in
 {
@@ -16,20 +13,6 @@ in
     khal = mkCalOpts "khal";
   };
 
-  config = {
+  config.home.packages =
-    accounts.calendar.basePath = "${config.xdg.dataHome}/calendars";
+    lib.optional cfg.khal.enable cfg.khal.package;
-
-    programs.khal = lib.mkIf cfg.khal.enable {
-      enable = true;
-      locale = rec {
-        timeformat = "%H:%M";
-        dateformat = "%Y-%m-%d";
-        longdateformat = dateformat;
-        datetimeformat = "${dateformat} ${timeformat}";
-        longdatetimeformat = datetimeformat;
-      };
-      # See: https://khal.readthedocs.io/en/latest/configure.html
-      settings = {};
-    };
-  };
 }

modules/nixos/configs/nix.nix

@@ -42,9 +42,6 @@ in
           };
         };
       })
-      (final: prev: {
-        khal = (import inputs.nixpkgs-unstable { inherit (config.nixpkgs) system; }).khal;
-      })
       (final: prev: {
         unstable = import inputs.nixpkgs-unstable {
           inherit (config.nixpkgs) config overlays system;

users/jan/default.nix

@@ -55,8 +55,7 @@
 
   home-manager.users.jan = {
     imports = [
-      ./email_accounts.secret.nix
+      ./accounts.secret.nix
-      ./calendars.secret.nix
       ./git
     ];
 
@@ -78,6 +77,7 @@
 
     local.shell.enable = lib.mkDefault true;
 
+
     ################################################################################
     # Programs
     ################################################################################
@@ -96,10 +96,6 @@
     local.programs.file-managers.vifm.enable = lib.mkDefault true;
 
     local.programs.aerc.enable = lib.mkDefault true;
-    local.programs.calendar.khal = {
-      enable = lib.mkDefault true;
-      # package = pkgs.unstable.khal;
-    };
 
     local.programs.communication = {
       telegram.enable = lib.mkDefault true;