From dad57ac125432a4f699fd258dd5bf2a00e997b55 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Wed, 23 Dec 2020 04:14:53 +0100
Subject: modules/aszlig: Remove Taskwarrior module

I no longer use Taskwarrior and since my config.patch fails to apply in
the most recent release, I think it's time to finally remove it from my
workstation profile.

Signed-off-by: aszlig <aszlig@nix.build>
---
 .../user/aszlig/profiles/workstation/default.nix   |  1 -
 .../user/aszlig/programs/taskwarrior/config.patch  | 48 ----------------------
 .../user/aszlig/programs/taskwarrior/default.nix   | 36 ----------------
 3 files changed, 85 deletions(-)
 delete mode 100644 modules/user/aszlig/programs/taskwarrior/config.patch
 delete mode 100644 modules/user/aszlig/programs/taskwarrior/default.nix

(limited to 'modules/user')

diff --git a/modules/user/aszlig/profiles/workstation/default.nix b/modules/user/aszlig/profiles/workstation/default.nix
index 5ad6a2ef..1935173c 100644
--- a/modules/user/aszlig/profiles/workstation/default.nix
+++ b/modules/user/aszlig/profiles/workstation/default.nix
@@ -71,7 +71,6 @@ in {
     vuizvui.user.aszlig.services.vlock.user = "aszlig";
 
     vuizvui.user.aszlig.programs.mpv.enable = true;
-    vuizvui.user.aszlig.programs.taskwarrior.enable = true;
 
     vuizvui.user.aszlig.programs.git.enable = true;
     vuizvui.user.aszlig.programs.git.config = {
diff --git a/modules/user/aszlig/programs/taskwarrior/config.patch b/modules/user/aszlig/programs/taskwarrior/config.patch
deleted file mode 100644
index 4ee4c4ce..00000000
--- a/modules/user/aszlig/programs/taskwarrior/config.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5558f6b..c8956f8 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -91,6 +91,9 @@ SET (TASK_DOCDIR  share/doc/task CACHE STRING "Installation directory for doc fi
- SET (TASK_RCDIR "${TASK_DOCDIR}/rc" CACHE STRING "Installation directory for configuration files")
- SET (TASK_BINDIR  bin            CACHE STRING "Installation directory for the binary")
- 
-+SET (SYSTEM_TASKRC "${CMAKE_INSTALL_PREFIX}/etc/taskrc"
-+     CACHE STRING "System-wide taskrc")
-+
- message ("-- Looking for SHA1 references")
- if (EXISTS ${CMAKE_SOURCE_DIR}/.git/index)
-   set (HAVE_COMMIT true)
-diff --git a/cmake.h.in b/cmake.h.in
-index 0041e6e..f8c1a0e 100644
---- a/cmake.h.in
-+++ b/cmake.h.in
-@@ -16,6 +16,7 @@
- 
- /* Installation details */
- #define TASK_RCDIR "${CMAKE_INSTALL_PREFIX}/${TASK_RCDIR}"
-+#define SYSTEM_TASKRC "${SYSTEM_TASKRC}"
- 
- /* Localization */
- #define PACKAGE_LANGUAGE ${PACKAGE_LANGUAGE}
-diff --git a/src/Context.cpp b/src/Context.cpp
-index 8aae74e..ffa5557 100644
---- a/src/Context.cpp
-+++ b/src/Context.cpp
-@@ -121,7 +121,8 @@ int Context::initialize (int argc, const char** argv)
-     }
- 
-     config.clear ();
--    config.load (rc_file);
-+    config.load (SYSTEM_TASKRC);
-+    config.load (rc_file, 2);
-     CLI2::applyOverrides (argc, argv);
- 
-     ////////////////////////////////////////////////////////////////////////////
-@@ -146,7 +147,6 @@ int Context::initialize (int argc, const char** argv)
-     }
- 
-     tdb2.set_location (data_dir);
--    createDefaultConfig ();
- 
-     ////////////////////////////////////////////////////////////////////////////
-     //
diff --git a/modules/user/aszlig/programs/taskwarrior/default.nix b/modules/user/aszlig/programs/taskwarrior/default.nix
deleted file mode 100644
index 99d428de..00000000
--- a/modules/user/aszlig/programs/taskwarrior/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-let
-  cfg = config.vuizvui.user.aszlig.programs.taskwarrior;
-
-  taskrc = pkgs.writeText "taskrc.in" ''
-    data.location=~/.task
-    include @out@/share/doc/task/rc/dark-yellow-green.theme
-
-    color=on
-    dateformat=Y-m-d
-    dateformat.annotation=Y-m-d
-    dateformat.edit=Y-m-d H:N:S
-    dateformat.holiday=YMD
-    dateformat.info=Y-m-d H:N:S
-    dateformat.report=Y-m-d
-    weekstart=Monday
-  '';
-
-  taskwarrior = pkgs.taskwarrior.overrideDerivation (t: {
-    patches = (t.patches or []) ++ [ ./config.patch ];
-    postInstall = (t.postInstall or "") + ''
-      mkdir -p "$out/etc"
-      substituteAll "${taskrc}" "$out/etc/taskrc"
-    '';
-  });
-
-in {
-  options.vuizvui.user.aszlig.programs.taskwarrior = {
-    enable = lib.mkEnableOption "aszlig's TaskWarrior";
-  };
-
-  config = lib.mkIf cfg.enable {
-    environment.systemPackages = lib.singleton taskwarrior;
-  };
-}
-- 
cgit 1.4.1