From ad66e057016fb519e81b737da9f47fa2fb71fec7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?= Date: Sun, 17 Jan 2021 23:49:28 +0100 Subject: [PATCH] Bye Taskwarrior --- config/lemonbar/bar.py | 1 - config/lemonbar/providers.py | 34 ---------------------------- config/lemonbar/requirements.txt | 1 - config/scripts/softwareList | 3 +-- config/scripts/totask | 21 ----------------- config/shell/shenv | 3 --- config/systemd/user/tasksync.service | 8 ------- config/systemd/user/tasksync.timer | 10 -------- 8 files changed, 1 insertion(+), 80 deletions(-) delete mode 100755 config/scripts/totask delete mode 100644 config/systemd/user/tasksync.service delete mode 100644 config/systemd/user/tasksync.timer diff --git a/config/lemonbar/bar.py b/config/lemonbar/bar.py index d913faa..4b55aa7 100755 --- a/config/lemonbar/bar.py +++ b/config/lemonbar/bar.py @@ -47,7 +47,6 @@ if __name__ == "__main__": PERSONAL_THEME = 0 Bar.addSectionAll(KeystoreProvider(theme=PERSONAL_THEME), BarGroupType.RIGHT) # Bar.addSectionAll(NotmuchUnreadProvider(dir='~/.mail/', theme=PERSONAL_THEME), BarGroupType.RIGHT) - Bar.addSectionAll(TaskWarriorProvider(theme=PERSONAL_THEME), BarGroupType.RIGHT) # Bar.addSectionAll(TodoProvider(dir='~/.vdirsyncer/currentCalendars/', theme=PERSONAL_THEME), BarGroupType.RIGHT) TIME_THEME = 6 diff --git a/config/lemonbar/providers.py b/config/lemonbar/providers.py index 5fc596d..708b513 100755 --- a/config/lemonbar/providers.py +++ b/config/lemonbar/providers.py @@ -14,7 +14,6 @@ import json import notmuch import mpd import random -import taskw import math coloredlogs.install(level='DEBUG', fmt='%(levelname)s %(message)s') @@ -526,39 +525,6 @@ class NotmuchUnreadProvider(ColorCountsSection, InotifyUpdater): self.addPath(os.path.join(self.dir, '.notmuch', 'xapian')) -class TaskWarriorProvider(StatefulSection, InotifyUpdater): - ICON = '' - NUMBER_STATES = 2 - DEFAULT_STATE = 1 - - - def __init__(self, theme=None): - InotifyUpdater.__init__(self) - StatefulSection.__init__(self, theme=theme) - self.taskw = taskw.TaskWarrior() - self.addPath(os.path.expanduser(self.taskw.config['data']['location'])) - - def fetcher(self): - maxi = -math.inf - total = 0 - for task in self.taskw.load_tasks('pending')['pending']: - urgency = task['urgency'] - if urgency > maxi: - maxi = urgency - if urgency > 0: - total += urgency - t = Text() - t.append(f"{maxi:.1f}") - - if self.showTotal: - t.append(f" | {total:.1f}") - - return t - - def onChangeState(self, state): - self.showTotal = state >= 1 - - class TodoProvider(ColorCountsSection, InotifyUpdater): # TODO OPT/UX Maybe we could get more data from the todoman python module # TODO OPT Specific callback for specific directory diff --git a/config/lemonbar/requirements.txt b/config/lemonbar/requirements.txt index bbb195b..0ed8bd4 100644 --- a/config/lemonbar/requirements.txt +++ b/config/lemonbar/requirements.txt @@ -9,6 +9,5 @@ pulsectl==18.8.0 pyinotify==0.9.6 python-mpd2==1.0.0 python-uinput==0.11.2 -taskw==1.2.0 yoke==0.1.1 zeroconf==0.21.3 diff --git a/config/scripts/softwareList b/config/scripts/softwareList index d2a021e..994b33a 100755 --- a/config/scripts/softwareList +++ b/config/scripts/softwareList @@ -175,8 +175,7 @@ then i vdirsyncer # Synchronize DAV i khard # Contacts editor i khal # Calendar editor - i task # Todo-list - i timew # Time-tracker + i todoman # Todo-list fi diff --git a/config/scripts/totask b/config/scripts/totask deleted file mode 100755 index 841595d..0000000 --- a/config/scripts/totask +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env python3 - -import taskw -import sys - -tw = taskw.TaskWarrior() - -total = 0 -number = 0 -statuses = set() -for task in tw._get_task_objects(*sys.argv[1:], 'export'): - statuses.add(task['status']) - if task['status'] not in {'pending', 'waiting'}: - continue - urgency = task['urgency'] - if urgency <= 0: - continue - total += urgency - number += 1 - -print(f"Σ{total:.3f} #{number}") diff --git a/config/shell/shenv b/config/shell/shenv index dc4fc88..184ee5d 100644 --- a/config/shell/shenv +++ b/config/shell/shenv @@ -42,10 +42,7 @@ direnv PARALLEL_HOME "$HOME/.cache/parallel" export PYTHONSTARTUP="$HOME/.config/pythonstartup.py" export SCREENRC="$HOME/.config/screenrc" export SQLITE_HISTFILE="$HOME/.cache/sqlite_history" -export TASKRC="$HOME/.config/taskrc" -direnv TASKDATA "$HOME/.config/task" direnv TERMINFO "$HOME/.config/terminfo" -direnv TIMEWARRIORDB "$HOME/.config/timewarrior" export RXVT_SOCKET="$HOME/.cache/urxvtd-$HOST" export MYVIMRC="$HOME/.config/vim/vimrc" export VIMINIT="source $MYVIMRC" diff --git a/config/systemd/user/tasksync.service b/config/systemd/user/tasksync.service deleted file mode 100644 index 8b0dd1a..0000000 --- a/config/systemd/user/tasksync.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Taskwarrior synchronisation - -[Service] -Type=oneshot -ExecStart=/usr/bin/task sync -Environment=TASKRC=%h/.config/taskrc -Environment=TASKDATA=%h/.config/task diff --git a/config/systemd/user/tasksync.timer b/config/systemd/user/tasksync.timer deleted file mode 100644 index 5c17899..0000000 --- a/config/systemd/user/tasksync.timer +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Taskwarrior synchronisation timer - -[Timer] -OnBootSec=2m -OnUnitActiveSec=5m -Unit=tasksync.service - -[Install] -WantedBy=timers.target