From 85c6ae78fb5f7e9bc3a1e822314c460d8d73e62b Mon Sep 17 00:00:00 2001
From: Martin Pander <martin.pander@knowtion.de>
Date: Fri, 17 May 2024 14:18:57 +0200
Subject: [PATCH] Update shell and tasks

---
 nix/flake.lock    | 12 ++++++------
 nix/user/sh.nix   |  8 +++++++-
 nix/user/task.nix | 36 +++++++++++++++++++++++++++++++-----
 nix/user/tmux.nix | 11 ++++++-----
 4 files changed, 50 insertions(+), 17 deletions(-)

diff --git a/nix/flake.lock b/nix/flake.lock
index a024de3..5b2a582 100644
--- a/nix/flake.lock
+++ b/nix/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1712212014,
-        "narHash": "sha256-s+lbaf3nLRn1++/X2eXwY9mYCA/m9l8AvyG8beeOaXE=",
+        "lastModified": 1715486357,
+        "narHash": "sha256-4pRuzsHZOW5W4CsXI9uhKtiJeQSUoe1d2M9mWU98HC4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "7e91f2a0ba4b62b88591279d54f741a13e36245b",
+        "rev": "44677a1c96810a8e8c4ffaeaad10c842402647c1",
         "type": "github"
       },
       "original": {
@@ -22,11 +22,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1712163089,
-        "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=",
+        "lastModified": 1715534503,
+        "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5",
+        "rev": "2057814051972fa1453ddfb0d98badbea9b83c06",
         "type": "github"
       },
       "original": {
diff --git a/nix/user/sh.nix b/nix/user/sh.nix
index 79d4abd..96f99f3 100644
--- a/nix/user/sh.nix
+++ b/nix/user/sh.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
 {
   programs.zsh = {
@@ -77,6 +77,12 @@
   home.packages = with pkgs; [
     fd
     du-dust
+    glow
     #nerdfonts
   ];
+
+  home.sessionVariables = lib.mkMerge [ {
+      BAT_THEME = "Coldark-Cold";
+    }
+  ];
 }
diff --git a/nix/user/task.nix b/nix/user/task.nix
index 8b8b463..3df5d50 100644
--- a/nix/user/task.nix
+++ b/nix/user/task.nix
@@ -1,16 +1,42 @@
-{config, pkgs, ...}:
+{config, pkgs, lib, ...}:
 
 {
   programs.taskwarrior = {
     enable = true;
+    colorTheme = "light-256";
+    package = pkgs.taskwarrior3;
+    config = {
+      weekstart = "monday";
+
+      uda.priority.values = "H,M,,L";
+      urgency.uda.priority.L.coefficient = -0.5;
+      urgency.user.tag.deferred.coefficient = -15.0;
+      urgency.user.tag.cust.coefficient = 5.0;
+
+      context.today.read = "-deferred and (prio:H or +next)";
+      context.today.write = "prio:H or +next";
+      context.deferred.read = "+deferred";
+      context.deferred.write = "+deferred";
+      context.customer.read = "+cust";
+      context.customer.write = "+cust";
+      context.low_energy.read = "+low";
+      context.low_energy.write = "+low";
+
+      uda.taskwarrior-tui.task-report.show-info = false;
+      uda.taskwarrior-tui.selection.reverse = "yes";
+    };
   };
 
   home.packages = with pkgs; [
     taskwarrior-tui
+    timewarrior
   ];
 
-  home.shellAliases = {
-    t = "task";
-    tt = "taskwarrior-tui";
-  };
+  home.shellAliases = lib.mkMerge [ {
+      t = "task";
+      tt = "taskwarrior-tui";
+      tw = "timew";
+      tws = "timew summary :ids";
+    }
+  ];
 }
diff --git a/nix/user/tmux.nix b/nix/user/tmux.nix
index 3799805..4d416fd 100644
--- a/nix/user/tmux.nix
+++ b/nix/user/tmux.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
 {
   programs.tmux = {
@@ -58,8 +58,9 @@
     '';
   };
 
-  home.shellAliases = {
-    "o" = "tmuxp";
-    "ol" = "tmuxp load";
-  };
+  home.shellAliases = lib.mkMerge [ {
+      "o" = "tmuxp";
+      "ol" = "tmuxp load";
+    }
+  ];
 }