feat(jj): add alias to tug bookmark to previous commit

common.nix

@@ -5,6 +5,7 @@
 }: {
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
+  boot.loader.systemd-boot.memtest86.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
   # enable sysrq support for REISUB
@@ -13,6 +14,9 @@
   # use zen kernel
   boot.kernelPackages = pkgs.linuxPackages_zen;
 
+  # badram
+  boot.kernelParams = ["memtest=4"];
+
   # Enable networking
   networking.networkmanager.enable = true;
 

home.nix

@@ -1,6 +1,7 @@
 {
   pkgs,
   pkgs-unstable,
+  lib,
   nixvim,
   river-shifttags,
   other-transcode,
@@ -26,7 +27,8 @@ in {
       usbutils
       wget
       curl
-      ncdu
+      dua
+      du-dust
       trashy
       unzip
       parallel
@@ -35,7 +37,6 @@ in {
       ouch
       inetutils
       fd
-      bat
       # remote working
       remmina
       # communication
@@ -107,6 +108,9 @@ in {
       alsa-utils
       # remote
       rustdesk
+      # other lsps
+      nixd
+      nil
     ];
 
     file = {
@@ -118,7 +122,7 @@ in {
     };
 
     sessionVariables = {
-      EDITOR = "nvim";
+      EDITOR = "hx";
     };
 
     inherit username;
@@ -135,8 +139,6 @@ in {
     userName = "Khaïs COLIN";
     # better diffs
     diff-so-fancy.enable = true;
-    # set editor
-    extraConfig.core.editor = "nvim";
     # always show diff in commits
     extraConfig.commit.verbose = true;
   };
@@ -156,7 +158,7 @@ in {
         key = "/home/khais/.ssh/id_ed25519.pub";
       };
       ui = {
-        editor = "emacsclient -a ''";
+        editor = "hx";
         default-command = "log";
         movement.edit = true;
         # do not page if output fits on one screen
@@ -183,6 +185,9 @@ in {
           diff.git(),
         )
       '';
+      aliases = {
+        tug = ["bookmark" "move" "--from" "heads(::@- & bookmarks())" "--to" "@-"];
+      };
     };
   };
 
@@ -200,8 +205,8 @@ in {
       gd = "git diff";
       gds = "git diff --staged";
 
-      vim = "nvim";
-      vi = "nvim";
+      vim = "hx";
+      vi = "hx";
 
       # progress cp
       # https://serverfault.com/questions/43014/copying-a-large-directory-tree-locally-cp-or-rsync
@@ -219,8 +224,10 @@ in {
   programs.fish = {
     enable = true;
     shellAliases = {
-      vim = "nvim";
-      vi = "nvim";
+      vim = "hx";
+      vi = "hx";
+      cat = "bat";
+      ls = "eza";
 
       # progress cp
       # https://serverfault.com/questions/43014/copying-a-large-directory-tree-locally-cp-or-rsync
@@ -396,4 +403,61 @@ in {
     enable = true;
     extraConfig = builtins.readFile ./afew.config;
   };
+
+  programs.helix = {
+    enable = true;
+    ignores = [".jj/"];
+    settings = {
+      theme = lib.mkForce "modus_vivendi";
+      editor = {
+        cursor-shape = {
+         insert = "bar";
+          normal = "block";
+          select = "underline";
+        };
+        end-of-line-diagnostics = "hint";
+      };
+    };
+  };
+
+  programs.bat = {
+    enable = true;
+  };
+
+  programs.eza = {
+    enable = true;
+    git = true;
+    icons = true;
+  };
+
+  programs.starship = {
+    enable =  true;
+    settings = {
+      custom.jj = {
+        command = ''
+          jj log -r@ -n1 --ignore-working-copy --no-graph --color always -T '
+            separate(" ",
+              bookmarks.map(|x| truncate_end(10, x.name(), "…")).join(" "),
+              tags.map(|x| truncate_end(10, x.name(), "…")).join(" "),
+              surround("\"", "\"", truncate_end(24, description.first_line(), "…")),
+              if(conflict, "conflict"),
+              if(divergent, "divergent"),
+              if(hidden, "hidden"),          )
+          '
+        '';
+        when = "jj root --ignore-working-copy";
+        symbol = "jj";
+      };
+      custom.jjstate = {
+        command = ''
+          jj log -r@ -n1 --ignore-working-copy --no-graph --stat | tail -n1 | ${pkgs.sd}/bin/sd "(\d+) files? changed, (\d+) insertions?\(\+\), (\d+) deletions?\(-\)" ' ''${1}m ''${2}+ ''${3}-' | ${pkgs.sd}/bin/sd " 0." ""
+        '';
+        when = "jj root --ignore-working-copy";
+      };
+      git_state.disabled = true;
+      git_commit.disabled = true;
+      git_metrics.disabled = true;
+      git_branch.disabled = true;
+    };
+  };
 }

stylix.nix

@@ -7,7 +7,7 @@
     enable = true;
     image = ./wallpapers/nixos_inspector_tan.png;
     polarity = "dark";
-    base16Scheme = ./neovim_default_scheme.yaml;
+    base16Scheme = "${pkgs.base16-schemes}/share/themes/ayu-dark.yaml";
 
     cursor = {
       package = breezex-cursor;

void.nix

@@ -312,6 +312,12 @@
     settings.Upload.URL = "http://localhost:9428/insert/journald";
   };
 
+  services.gerrit = {
+    enable = true;
+    listenAddress = "[::]:8923";
+    serverId = "b1ea4fd2-4e4a-4063-aa3c-5139a90c58b0";
+  };
+
   networking.firewall.allowedTCPPorts = [
     80
     443
@@ -380,6 +386,11 @@
         enableACME = true;
         addSSL = true;
       };
+      "gerrit.005540.xyz" = {
+        locations."/".proxyPass = "http://localhost:8923";
+        enableACME = true;
+        addSSL = true;
+      };
     };
   };
 }