Merge branch 'nix' into nix-work

nix/user/git.nix

@@ -20,10 +20,39 @@
     difftastic.enable = true;
 
     extraConfig = {
-      core = {
-        editor = "nvim";
+      column.ui = "auto";
+      branch.sort = "-committerdate";
+      tag.sort = "version:refname";
+      diff = {
+        algorithm = "histogram";
+        colorMoved = "plain";
+        mnemonicPrefix = "true";
+        renames = "true";
       };
-      push.default = "matching";
+      pull.rebase = "true";
+      push = {
+        default = "simple";
+        autoSetupRemote = "true";
+        followTags = "true";
+      };
+      fetch = {
+        prune = "true";
+        pruneTags = "true";
+        all = "true";
+      };
+      help.autocorrect = "prompt";
+      commit.verbose = "true";
+      rerere = {
+        enabled = "true";
+        autoupdate = "true";
+      };
+      rebase = {
+        autoSquas = "true";
+        autoStash = "true";
+        updateRefs = "true";
+      };
+      merge.conflictstyle = "zdiff3";
+      core.editor = "nvim";
       init.defaultBranch = "main";
       merge.conflicstyle = "zdiff3";
       fetch.prune = true;

nix/user/nvim.nix

@@ -8,12 +8,14 @@
     vimAlias = true;
 
     plugins = with pkgs.vimPlugins; [
+      aerial-nvim
+      zen-mode-nvim
       vim-commentary
       vim-repeat
       vim-surround
       targets-vim
       delimitMate
-      vim-startify
+      # vim-startify
       vim-windowswap
       vim-nix
       plenary-nvim
@@ -29,12 +31,17 @@
       cmp-path
       cmp-cmdline
       cmp-nvim-lsp
+      cmp-nvim-lsp-signature-help
       cmp_yanky
       cmp-git
       nvim-lspconfig
       lspkind-nvim
       copilot-lua
       copilot-cmp
+      image-nvim
+      img-clip-nvim
+      markdown-preview-nvim
+      vim-markdown
       (nvim-treesitter.withPlugins (p: [ p.awk p.bash p.c p.c_sharp p.cpp p.css p.diff p.dockerfile p.doxygen p.git_config p.gitcommit p.go p.gomod p.gosum p.gotmpl p.helm p.haskell p.html p.http p.java p.javascript p.json p.latex p.lua p.markdown p.markdown_inline p.matlab p.nix p.printf p.python p.regex p.rust p.sql p.strace p.supercollider p.svelte p.swift p.terraform p.tmux p.toml p.typescript p.vim p.xml p.yaml p.zig ]))
     ];
 
@@ -51,6 +58,7 @@
 
   home.packages = with pkgs; [
     nodejs-slim
+    marksman
   ];
 }
 

nix/user/profiles/martin.nix

@@ -0,0 +1,13 @@
+{ config, pkgs, ... }:
+
+{
+  home.username = "martin";
+  home.homeDirectory = "/Users/martin";
+
+  home.stateVersion = "24.05"; # Please read the comment before changing.
+
+  programs.git = {
+    userName = "Martin";
+    userEmail = "git@pander-on.de";
+  };
+}

nix/user/sh.nix

@@ -79,7 +79,7 @@
     du-dust
     glow
     ripgrep-all
-    #nerdfonts
+    llm
   ];
 
   home.sessionVariables = lib.mkMerge [ {

nix/user/task.nix

@@ -39,6 +39,15 @@
       report.low.labels="ID,Active,Age,Deps,P,E,Project,Tag,Recur,S,Due,Until,Description,Urg";
       report.low.sort="energy+,urgency-";
 
+      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";
     };

nix/user/task_home.nix

@@ -0,0 +1,37 @@
+{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.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
+  ];
+
+  home.shellAliases = lib.mkMerge [ {
+      t = "task";
+      tt = "taskwarrior-tui";
+    }
+  ];
+}