no more taskwarrior

10 files changed, 73 insertions, 47 deletions

diff --git a/.autostart b/.autostart
index 5afc9aa..81f9ff1 100755
--- a/.autostart
+++ b/.autostart
@@ -15,7 +15,7 @@ xscreensaver -no-splash &
 # if german kb
 # setxkbmap de
 
-st -e watch -t 'task -garbage -consumerism -gifts' &
+st -e watch -t 'calcurse' &
 sleep $wait_time
 st -e stig &
 sleep $wait_time
diff --git a/.config/calcurse/conf b/.config/calcurse/conf
new file mode 100644
index 0000000..604a7e5
--- /dev/null
+++ b/.config/calcurse/conf
@@ -0,0 +1,2 @@
+format.inputdate=4
+appearance.theme=blue on default
diff --git a/.config/calcurse/hooks/post-save b/.config/calcurse/hooks/post-save
new file mode 100755
index 0000000..42d5859
--- /dev/null
+++ b/.config/calcurse/hooks/post-save
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+cd "$HOME/.local/share/calcurse" >/dev/null 2>&1 || return
+if [ -d .git ] && command -v git >/dev/null; then
+	git add apts todo
+	if ! git diff-index --quiet --cached HEAD; then
+		git commit -m "Automatic commit by the post-save hook"
+	fi
+	git push || true
+fi
diff --git a/.config/calcurse/keys b/.config/calcurse/keys
new file mode 100644
index 0000000..28ff9e4
--- /dev/null
+++ b/.config/calcurse/keys
@@ -0,0 +1,55 @@
+#
+# Calcurse keys configuration file
+#
+# In this file the keybindings used by Calcurse are defined.
+# It is generated automatically by Calcurse and is maintained
+# via the key configuration menu of the interactive user
+# interface. It should not be edited directly.
+
+generic-cancel  ESC
+generic-select  SPC
+generic-credits  @
+generic-help  ?
+generic-quit  q Q
+generic-save  s S ^S
+generic-reload  R
+generic-copy  c
+generic-paste  p ^V
+generic-change-view  TAB
+generic-import  i I
+generic-export  x X
+generic-goto  g G
+generic-other-cmd  o O
+generic-config-menu  C
+generic-redraw  ^R
+generic-add-appt  ^A
+generic-add-todo  ^T
+generic-prev-day  T ^H
+generic-next-day  t ^L
+generic-prev-week  W ^K
+generic-next-week  w
+generic-prev-month  M
+generic-next-month  m
+generic-prev-year  Y
+generic-next-year  y
+generic-scroll-down  ^N
+generic-scroll-up  ^P
+generic-goto-today  ^G
+generic-command  :
+move-right  l L RGT
+move-left  h H LFT
+move-down  j J DWN
+move-up  k K UP
+start-of-week  0
+end-of-week  $
+add-item  a A
+del-item  d D
+edit-item  e E
+view-item  v V RET
+pipe-item  |
+flag-item  !
+repeat  r
+edit-note  n N
+view-note  >
+raise-priority  +
+lower-priority  -
diff --git a/.config/stig/rc b/.config/stig/rc
index 2771c83..1b532e0 100644
--- a/.config/stig/rc
+++ b/.config/stig/rc
@@ -2,5 +2,5 @@ set connect.tls true
 set connect.host pls
 set connect.port pls
 set connect.user pls
-set connect.password "pls"
+set connect.password:eval get-pass
 set tui.theme modified.theme
diff --git a/.muttrc b/.muttrc
index 568417b..4f9bc8c 100644
--- a/.muttrc
+++ b/.muttrc
@@ -1,6 +1,6 @@
 set my_name = "tom"
 set imap_user = tom@tombarrett.xyz
-set imap_pass = blahblah
+set imap_pass = "`read password`"
 set folder = imaps://blahblah
 set spoolfile =+INBOX
 
diff --git a/.task/hooks/on-exit_git b/.task/hooks/on-exit_git
deleted file mode 100755
index 833be0a..0000000
--- a/.task/hooks/on-exit_git
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-if [[ $2 == *"add"* ]] || [[ $2 == *"done"* ]] ; then
-  wget -q --spider http://tombarrett.xyz
-  if [ $? -eq 0 ] ; then
-    git -C ~/.task/ commit -a -m "$2"
-    git -C ~/.task/ push
-  fi
-fi
diff --git a/.taskrc b/.taskrc
deleted file mode 100644
index d865b29..0000000
--- a/.taskrc
+++ /dev/null
@@ -1,32 +0,0 @@
-# [Created by task 2.5.1 5/25/2020 20:09:00]
-# Taskwarrior program configuration file.
-# For more documentation, see http://taskwarrior.org or try 'man task', 'man task-color',
-# 'man task-sync' or 'man taskrc'
-
-# Here is an example of entries that use the default, override and blank values
-#   variable=foo   -- By specifying a value, this overrides the default
-#   variable=      -- By specifying no value, this means no default
-#   #variable=foo  -- By commenting out the line, or deleting it, this uses the default
-
-# Use the command 'task show' to see all defaults and overrides
-
-# Files
-data.location=~/.task
-report.next.sort=due+
-
-# Color theme (uncomment one to use)
-#include /usr/share/doc/task/rc/light-16.theme
-#include /usr/share/doc/task/rc/light-256.theme
-#include /usr/share/doc/task/rc/dark-16.theme
-#include /usr/share/doc/task/rc/dark-256.theme
-#include /usr/share/doc/task/rc/dark-red-256.theme
-#include /usr/share/doc/task/rc/dark-green-256.theme
-#include /usr/share/doc/task/rc/dark-blue-256.theme
-#include /usr/share/doc/task/rc/dark-violets-256.theme
-#include /usr/share/doc/task/rc/dark-yellow-green.theme
-#include /usr/share/doc/task/rc/dark-gray-256.theme
-#include /usr/share/doc/task/rc/dark-gray-blue-256.theme
-#include /usr/share/doc/task/rc/solarized-dark-256.theme
-#include /usr/share/doc/task/rc/solarized-light-256.theme
-#include /usr/share/doc/task/rc/no-color.theme
-
diff --git a/arch/mainline b/arch/mainline
index 454d952..c7cf97d 100644
--- a/arch/mainline
+++ b/arch/mainline
@@ -4,6 +4,7 @@ autoconf
 automake
 base
 bc
+calcurse
 cmake
 dmenu
 dosfstools
@@ -41,7 +42,6 @@ rsync
 scrot
 stone-soup
 sudo
-task
 tmux
 traceroute
 tree
diff --git a/build b/build
index c83817a..0e9189f 100755
--- a/build
+++ b/build
@@ -80,9 +80,8 @@ ln -s "$RC_DIR/.gitconfig" "$HOME"
 ln -s "$RC_DIR/.muttrc" "$HOME"
 ln -s "$RC_DIR/.mailcap" "$HOME"
 
-# taskwarrior setup
-ln -s "$RC_DIR/.taskrc" "$HOME"
-ln -s "$RC_DIR/.task" "$HOME"
+# calcurse setup
+ln -s "$RC_DIR/.config/calcurse" "$HOME/.config/"
 
 # xscreensaver setup
 ln -s "$RC_DIR/.xscreensaver" "$HOME"