Sync config for all systems

nix/user/dev.nix

@@ -6,4 +6,8 @@
     enableZshIntegration = true;
     nix-direnv.enable = true;
   };
+
+  home.packages = with pkgs; [
+    visidata
+  ];
 }

nix/user/git.nix

@@ -61,4 +61,19 @@
       ".envrc"
     ];
   };
+
+  programs.lazygit = {
+    enable = true;
+    settings = {
+      theme.lightTheme = "true";
+      git = {
+        log = {
+          format = "%C(yellow)%h%Creset %C(bold blue)<%an>%Creset %s %Cgreen(%cr)%Creset";
+          graph = "true";
+        };
+      };
+    };
+  };
+
+  programs.jujutsu.enable = true;
 }

nix/user/nvim.nix

@@ -59,6 +59,7 @@
       img-clip-nvim
       markdown-preview-nvim
       vim-markdown
+      plantuml-syntax
       bullets-vim
       obsidian-nvim
       nvim-dap

nix/user/sh.nix

@@ -51,10 +51,11 @@
       HISTIGNORE='&:[ ]*:exit:ls:bg:fg:history:clear'
       unsetopt beep
 
-      # Rustup initialization
-      export RUSTUP_HOME="$HOME/.rustup"
-      export CARGO_HOME="$HOME/.cargo"
-      [ -f "$CARGO_HOME/env" ] && . "$CARGO_HOME/env"
+      if [[ "$(uname -s)" == "Darwin" ]]; then
+        export RUSTUP_HOME="$HOME/.rustup"
+        export CARGO_HOME="$HOME/.cargo"
+        [ -f "$CARGO_HOME/env" ] && . "$CARGO_HOME/env"
+      fi;
     '';
   };
 
@@ -79,6 +80,7 @@
   programs.bat.enable = true;
   programs.ripgrep.enable = true;
   programs.btop.enable = true;
+  programs.ranger.enable = true;
 
   home.packages = with pkgs; [
     fd
@@ -87,7 +89,7 @@
     ripgrep-all
     viddy
     duf
-    (python313.withPackages(ps: [ ps.llm ps.llm-anthropic ps.llm-gemini ]))
+    (python3.withPackages(ps: [ ps.llm ps.llm-gemini ]))
     #nerdfonts
   ];
 
@@ -95,4 +97,16 @@
       BAT_THEME = "Coldark-Cold";
     }
   ];
+
+  home.shellAliases = lib.mkMerge [
+    {
+      lst = "lsd --tree";
+    }
+
+    # This is the correct way to use lib.mkIf within lib.mkMerge
+    # (lib.mkIf pkgs.stdenv.targetPlatform.isWindows {
+    (lib.mkIf (lib.strings.hasSuffix "windows" pkgs.system) {
+      open = "explorer.exe .";
+    })
+  ];
 }

nix/user/task.nix

@@ -8,13 +8,37 @@
     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;
 
-      context.today.read = "-deferred and (prio:H or +next)";
-      context.today.write = "prio:H or +next";
+      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-";
+
       context.deferred.read = "+deferred";
       context.deferred.write = "+deferred";
       context.customer.read = "+cust";

nix/user/tmux.nix

@@ -25,6 +25,11 @@
       bind % split-window -h -c "#{pane_current_path}"
       bind c new-window -a -c "#{pane_current_path}"
 
+      bind C-s display-popup -E "zsh ~/bin/tmuxp_selector.sh"
+      bind C-g display-popup -E -d "#{pane_current_path}" -xC -yC -w 95% -h 95% "lazygit"
+      bind C-t display-popup -E -xC -yC -w 95% -h 95% "tasksquire"
+      bind C-n display-popup -E -xC -yC -w 95% -h 95% "vim /mnt/c/Users/marti/Documents/notes/Work/quick_notes.md"
+
       #######################################
       # status line
       #######################################