Add task reports; Add git diff setup

.gitignore

@@ -0,0 +1 @@
+plugins/

nix/common.nix

@@ -49,7 +49,8 @@
   #};
 
   # home.shellAliases = {
-    # "ll" = "ls -la";
+  #   "t" = "tmuxp";
+  #   "tl" = "tmuxp load";
   # };
 
   news.display = "silent";

nix/flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1712212014,
-        "narHash": "sha256-s+lbaf3nLRn1++/X2eXwY9mYCA/m9l8AvyG8beeOaXE=",
+        "lastModified": 1723986931,
+        "narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "7e91f2a0ba4b62b88591279d54f741a13e36245b",
+        "rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671",
         "type": "github"
       },
       "original": {
@@ -22,11 +22,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1712163089,
-        "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=",
+        "lastModified": 1724224976,
+        "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5",
+        "rev": "c374d94f1536013ca8e92341b540eba4c22f9c62",
         "type": "github"
       },
       "original": {

nix/flake.nix

@@ -11,7 +11,8 @@
 
   outputs = { nixpkgs, home-manager, ... }:
     let
-      system = "x86_64-darwin";
+      #system = "x86_64-darwin";
+      system = "x86_64-linux";
       pkgs = nixpkgs.legacyPackages.${system};
     in {
       homeConfigurations = { 
@@ -24,7 +25,7 @@
             ./user/task.nix
           ];
         };
-        "work" = home-manager.lib.homeManagerConfiguration {
+        "pan" = home-manager.lib.homeManagerConfiguration {
           inherit pkgs;
 
           modules = [ 

nix/user/git.nix

@@ -23,6 +23,12 @@
       };
       push.default = "matching";
       init.defaultBranch = "main";
+      merge.conflicstyle = "zdiff3";
     };
+
+    ignores = [
+      ".direnv/"
+      ".envrc"
+    ];
   };
 }

nix/user/profiles/work.nix

@@ -1,8 +1,8 @@
 { config, pkgs, ... }:
 
 {
-  home.username = "moustachioed";
-  home.homeDirectory = "/Users/moustachioed";
+  home.username = "pan";
+  home.homeDirectory = "/home/pan";
 
   home.stateVersion = "23.11"; # Please read the comment before changing.
 
@@ -10,4 +10,15 @@
     userName = "Martin Pander";
     userEmail = "martin.pander@knowtion.de";
   };
+
+  home.packages = with pkgs; [
+    yaml-language-server
+    marksman
+    dockerfile-language-server-nodejs
+  ];
+
+  programs.zsh.profileExtra = ''
+    source $HOME/.profile
+  '';
+
 }

nix/user/sh.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
 {
   programs.zsh = {
@@ -63,12 +63,26 @@
     enableAliases = true;
   };
 
+  programs.zoxide = {
+    enable = true;
+    enableZshIntegration = true;
+    options = [
+      "--cmd cd"
+    ];
+  };
+
   programs.bat.enable = true;
   programs.ripgrep.enable = true;
 
   home.packages = with pkgs; [
     fd
     du-dust
+    glow
     #nerdfonts
   ];
+
+  home.sessionVariables = lib.mkMerge [ {
+      BAT_THEME = "Coldark-Cold";
+    }
+  ];
 }

nix/user/task.nix

@@ -1,16 +1,59 @@
-{config, pkgs, ...}:
+{config, pkgs, lib, ...}:
 
 {
   programs.taskwarrior = {
     enable = true;
+    colorTheme = "light-256";
+    package = pkgs.taskwarrior3;
+    config = {
+      weekstart = "monday";
+
+      context.today.read = "(prio:H or +next)";
+      context.today.write = "prio:H +next";
+
+      uda.energy.type="string";
+      uda.energy.label="Energy";
+      uda.energy.values="h,m,l";
+      uda.energy.default="m";
+
+      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;
+
+      report.next.columns="id,start.age,entry.age,depends,priority,energy,project,tags,recur,scheduled.countdown,due.relative,until.remaining,description,urgency";
+      report.next.labels="ID,Active,Age,Deps,P,E,Project,Tag,Recur,S,Due,Until,Description,Urg";
+      report.next.filter="status:pending -WAITING -deferred";
+
+      report.deferred.columns="id,start.age,entry.age,depends,priority,energy,project,tags,recur,scheduled.countdown,due.relative,until.remaining,description,urgency";
+      report.deferred.context="1";
+      report.deferred.description="Deferred and waiting tasks";
+      report.deferred.labels="ID,Active,Age,Deps,P,E,Project,Tag,Recur,S,Due,Until,Description,Urg";
+      report.deferred.filter="status:pending +deferred";
+      report.deferred.sort="urgency-";
+
+      report.low.columns="id,start.age,entry.age,depends,priority,energy,project,tags,recur,scheduled.countdown,due.relative,until.remaining,description,urgency";
+      report.low.context="1";
+      report.low.description="Low energy tasks";
+      report.low.filter="status:pending -WAITING -deferred";
+      report.low.labels="ID,Active,Age,Deps,P,E,Project,Tag,Recur,S,Due,Until,Description,Urg";
+      report.low.sort="energy+,urgency-";
+
+      uda.taskwarrior-tui.task-report.show-info = false;
+      uda.taskwarrior-tui.selection.reverse = "yes";
+    };
   };
 
   home.packages = with pkgs; [
     taskwarrior-tui
+    timewarrior
   ];
 
-  home.shellAliases = {
+  home.shellAliases = lib.mkMerge [ {
       t = "task";
       tt = "taskwarrior-tui";
-  };
+      tw = "timew";
+      tws = "timew summary :ids";
+    }
+  ];
 }

nix/user/tmux.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
 {
   programs.tmux = {
@@ -9,7 +9,6 @@
     escapeTime = 0;
     terminal = "screen-256color";
     tmuxp.enable = true;
-    # newSession = true;
     extraConfig = ''
       set -g display-time 1500
 
@@ -58,4 +57,10 @@
       set -g pane-border-style "bg=#eeeeee,fg=#999999"
     '';
   };
+
+  home.shellAliases = lib.mkMerge [ {
+      "o" = "tmuxp";
+      "ol" = "tmuxp load";
+    }
+  ];
 }

nvim/base.lua

@@ -39,8 +39,6 @@ vim.opt.scrolloff = 8
 vim.opt.background = 'light'
 vim.opt.wrap = true
 vim.opt.showbreak = '..'
--- vim.opt.clipboard = vim.opt.clipboard + 'unnamedplus'
--- vim.opt.clipboard = 'unnamedplus'
 vim.opt.errorbells = false
 vim.opt.visualbell = false
 vim.opt.title = true
@@ -49,10 +47,19 @@ vim.opt.syntax = 'on'
 vim.opt.encoding = 'utf-8'
 vim.opt.completeopt = 'menu,menuone,noselect'
 
+
 ----------------------------
--------- COMMANDS --------
+-------- CLIPBOARD ---------
 ----------------------------
---
+if vim.fn.has("wsl") == 1 then
+  vim.opt.clipboard = vim.opt.clipboard + 'unnamedplus'
+end
+
+
+----------------------------
+-------- COMMANDS ----------
+----------------------------
+
 vim.cmd('filetype plugin indent on')
 
 -- vim.cmd('colorscheme lucius')
@@ -60,7 +67,7 @@ vim.cmd('filetype plugin indent on')
 
 
 ----------------------------
--------- AUTOGROUPs --------
+-------- AUTOGROUPS --------
 ----------------------------
 
 vim.api.nvim_create_augroup('VimIntern', { clear = true })

nvim/plugins.lua

@@ -41,7 +41,6 @@ cmp.setup({
     { name = 'buffer', keyword_length = 2 },
   }),
 
-  formatting = {
   formatting = {
     format = lspkind.cmp_format({
       -- mode = "symbol_text",