july rice

home-manager/shared/programs/dev.nix

@@ -5,9 +5,8 @@
     gnumake
     jq
     tree
-    jujutsu
+    jjui
     emacs-nox
-    shellcheck
 
     #devops
     k9s
@@ -22,5 +21,8 @@
 
     #c
     gcc
+
+    #llm
+    aider-chat
   ];
 }

home-manager/shared/programs/shell/default.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   imports = [
     ./tmux.nix
     ./git.nix
@@ -17,7 +18,7 @@
   programs.bash = {
     enable = true;
     enableCompletion = true;
-    historyControl = ["ignorespace"];
+    historyControl = [ "ignorespace" ];
     historyIgnore = [
       ":q"
       "exit"
@@ -70,7 +71,7 @@
   };
   programs.fzf = {
     enable = true;
-    historyWidgetOptions = ["--height 60% --preview ''"];
+    historyWidgetOptions = [ "--height 60% --preview ''" ];
     fileWidgetCommand = "command find -L . -mindepth 1 -o -fstype 'sysfs' -o -fstype 'devfs' -o -fstype 'devtmpfs' -o -fstype 'proc' -prune";
   };
   programs.direnv = {
@@ -92,6 +93,7 @@
   services.gpg-agent = {
     enable = true;
     enableSshSupport = true;
+    pinentry.package = pkgs.pinentry-curses;
     extraConfig = ''
       allow-loopback-pinentry
     '';

home-manager/shared/programs/shell/fish/functions.nix

@@ -32,7 +32,7 @@
       if set -q FISH_JJ
           return 0
       end
-      if not jj root &>/dev/null
+      if not jj workspace root --ignore-working-copy &>/dev/null
           return 1
       end
 

home-manager/shared/programs/shell/git.nix

@@ -25,12 +25,12 @@
   programs.jujutsu = {
     enable = true;
     settings = {
-      core = {
-        fsmonitor = "watchman";
-        watchman = {
-          register-snapshot-trigger = false;
-        };
-      };
+      # core = {
+      #   fsmonitor = "watchman";
+      #   watchman = {
+      #     register-snapshot-trigger = true;
+      #   };
+      # };
       user = {
         email = "cjriddz@protonmail.com";
         name = "iofq";
@@ -43,9 +43,6 @@
         backend = "gpg";
         key = "cjriddz@protonmail.com";
       };
-      git = {
-        sign-on-push = true;
-      };
       ui = {
         default-command = [ "log" ];
         conflict-marker-style = "git";

home-manager/t14/home.nix

@@ -45,7 +45,7 @@
     matchBlocks = {
       "consensus" = {
         port = 2022;
-        hostname = "192.168.1.251";
+        hostname = "consensus.tailc353f.ts.net";
         identityFile = "/home/e/.ssh/id_ed25519";
       };
       "10110110.xyz" = {