2 files changed, 19 insertions, 5 deletions
diff --git a/modules/office/calcurse/conf b/modules/office/calcurse/conf
index 79e3189..98aa9af 100644
--- a/modules/office/calcurse/conf
+++ b/modules/office/calcurse/conf
@@ -11,7 +11,7 @@ appearance.emptyday=--
 appearance.notifybar=yes
 appearance.sidebarwidth=0
 appearance.theme=green on black
-appearance.todoview=hide-completed
+appearance.todoview=show-completed
 appearance.headingpos=right-justified
 
 # Daemon
diff --git a/modules/office/calcurse/default.nix b/modules/office/calcurse/default.nix
index 619ee23..6de00cc 100644
--- a/modules/office/calcurse/default.nix
+++ b/modules/office/calcurse/default.nix
@@ -5,25 +5,39 @@
   pkgs,
   ...
 }:
+let
+  calcursePackage =
+    if config.development.nixvim.enable then
+      pkgs.symlinkJoin {
+        name = "calcurse-wrapped";
+        paths = [ pkgs.calcurse ];
+        nativeBuildInputs = [ pkgs.makeWrapper ];
+        postBuild = ''
+          wrapProgram $out/bin/calcurse --set PAGER "nvim"
+        '';
+        meta = pkgs.calcurse.meta // {
+          mainProgram = "calcurse";
+        };
+      }
+    else
+      pkgs.calcurse;
+in
 {
   options.office.calcurse = {
     enable = lib.mkEnableOption "Enables calcurse.";
     package = lib.mkOption {
       type = lib.types.package;
       readOnly = true;
-      default = pkgs.calcurse;
+      default = calcursePackage;
       description = "The calcurse package to use.";
     };
   };
-
   config = lib.mkIf config.office.calcurse.enable {
     home.packages = [ config.office.calcurse.package ];
-
     xdg.configFile."calcurse/conf" = {
       source = ./conf;
       force = true;
     };
-
     xdg.configFile."calcurse/keys" = {
       source = ./keys;
       force = true;