lkjsalkjdsalkjdsalkj

users/pbsds/home/profiles/bashrc.d/nix-shell.sh

@@ -95,6 +95,7 @@ _ns_ohk2aaDu() {
     seen["$storepath"]=1
 
     # TODO: $dev/lib/cmake
+    # TODO: source completions from /share/bash-completion/completions/*
     if [[ -d "$storepath/bin" ]]; then
       export PATH="$storepath/bin${PATH:+":$PATH"}"
     fi

users/pbsds/home/profiles/bashrc.d/zeditor-remote.sh

@@ -1,5 +1,4 @@
 zeditor-remote() {
-  local prefix="${1:-repos}"
   local statedir="${XDG_STATE_HOME:-"$HOME/.local/state/"}/zeditor-remote-sh"
 
   local -a missing=()
@@ -17,15 +16,6 @@ zeditor-remote() {
     return 1
   fi
 
-  # make $prefix relative to $HOME
-  if [[ "$prefix" =~ ^/ ]]; then
-    prefix=${prefix//"$HOME/"/}
-  fi
-  if [[ "$prefix" =~ ^/ ]]; then
-    printf >&2 "%s\n" "ERROR: prefix not in \$HOME ($prefix)"
-    return 1
-  fi
-
   uniq-stable() (
     command cat -n | sort -b --key=2.1 -u | sort -n | cut -f2-
   )
@@ -69,6 +59,25 @@ zeditor-remote() {
     return 1
   fi
 
+  local prefix="${gum input }"
+  # make $prefix relative to $HOME
+  if [[ "$prefix" =~ ^/ ]]; then
+    prefix="${prefix//"$HOME/"/}"
+  fi
+  if [[ "$prefix" =~ ^/ ]]; then
+    printf >&2 "%s\n" "ERROR: prefix not in \$HOME ($prefix)"
+    return 1
+  fi
+  # remove trialing slash
+  while [[ "$prefix" =~ /$ ]]; do
+    prefix="${prefix/%"/"/}"
+  done
+  if [[ -z "$prefix" ]]; then
+    printf >&2 "%s\n" "ERROR: prefix chosen"
+    return 1
+  fi
+
+
   # local spin=(gum spin --show-output --show-error --)
   local spin=(gum spin --show-output --)
   local repos=$(

users/pbsds/home/profiles/desktop/zed/remote.nix

@@ -25,11 +25,17 @@
     nil # nix
     unstable.nixfmt-rfc-style # nix
     harper # harper
-    vale-ls # vale
+    vale-ls vale # vale
     typos-lsp # typos
     tinymist # typst
 
     # I prefer these in shell.nix / virtual environments
     # python3Packages.python-lsp-server # pylsp
   ];
+
+  home.file.".config/vale/.vale.init".text = ''
+    MinAlertLevel = suggestion
+    [*]
+    BasedOnStyles = Vale
+  '';
 }

users/pbsds/home/profiles/git.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, lib, ... }:
 {
   home.packages = with pkgs; [
     #git
@@ -55,10 +55,10 @@
   programs.git.extraConfig.log.date = "iso";
   /* programs.git.extraConfig.interactive.singleKey = true; */
 
-
   programs.git.iniContent.init.defaultBranch = "main";
   programs.git.ignores = [
     #".envrc"
+    ".direnv"
     ".remote.toml"
     ".remoteenv"
     ".zed"
@@ -73,25 +73,33 @@
   home.shellAliases = {
     # git gud
     gs     = "git status";
-    gl     = "git log --oneline --color | head -n 30";
-    glg    = "git log --all --decorate --oneline --graph";
+    gl     = "git --no-pager log --oneline --color -n30";
+    glg    = "git log --color --all --decorate --oneline --graph";
     gpra   = "git pull --rebase --autostash";
     gprau  = ''git pull --rebase --autostash upstream "$(git branch 2>/dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/')"'';
     gd     = "git diff";
-    gdwd   = "git diff --word-diff";
-    gdwdr  = "git diff --word-diff --word-diff-regex=.";
     gds    = "git diff --staged";
-    gdswd  = "git diff --staged --word-diff";
-    gdswdr = "git diff --staged --word-diff --word-diff-regex=.";
-    gcp    = "git cherry-pick";
+    gdwd   = "git -c core.pager=\"$PAGER\" diff --word-diff"; # delta does not support --word-diff
+    gdwdr  = "git -c core.pager=\"$PAGER\" diff --word-diff --word-diff-regex=.";
+    gdwds  = "git -c core.pager=\"$PAGER\" diff --staged --word-diff";
+    gdswd  = "git -c core.pager=\"$PAGER\" diff --staged --word-diff";
+    gdwdrs = "git -c core.pager=\"$PAGER\" diff --staged --word-diff --word-diff-regex=.";
+    gdswdr = "git -c core.pager=\"$PAGER\" diff --staged --word-diff --word-diff-regex=.";
+    #gcp    = "git cherry-pick";
     gca    = "git commit --amend";
     gcara  = "git commit --amend --reset-author";
-    gfr    = "git pull --rebase";
-    gc     = "git branch | cut -c2- | gum choose | xargs git checkout";
-    gbrm   = "git fetch origin; git branch --merged | cut -c3- | grep -vE '^(main|master)$' | gum choose --no-limit --header 'Which branches to delete:' | xargs git branch -D";
+    gc     = "git branch | cut -c2- | gum choose | xargs -n'\n' --no-run-if-empty git checkout";
+    gbrm   = "git fetch origin; git branch --merged | cut -c3- | grep -vE '^(main|master)$' | gum choose --no-limit --header 'Which branches to delete:' | xargs -n'\n' --no-run-if-empty git branch -D";
     #gb     = "git blame";
     #gpo    = "git push origin";
     #gpf    = "git push --force-with-lease --force-if-includes";
+    gcm    = ''git commit --message "$(printf '%s\n' ${lib.concatStringsSep " " [
+      ''"$(curl -sL https://whatthecommit.com/index.txt)"''
+      ''""''
+      ''"$(curl -s 'https://printerfacts.cetacean.club/fact')"''
+      ''""''
+      ''"(made with https://whatthecommit.com/index.txt and https://printerfacts.cetacean.club/fact)"''
+    ]})"; git show --name-status; '';
   };
 
 }

users/pbsds/home/profiles/nix.nix

@@ -46,6 +46,10 @@ in
     rnix  = mkArgsAlias ''nix "$@" --system riscv64-linux -j0'';
     fnom  = mkArgsAlias ''nom "$@" --system x86_64-freebsd -j0'';
     fnix  = mkArgsAlias ''nix "$@" --system x86_64-freebsd -j0'';
+    fanom  = mkArgsAlias ''nom "$@" --system aarch64-freebsd -j0'';
+    fanix  = mkArgsAlias ''nix "$@" --system aarch64-freebsd -j0'';
+    xnom  = mkArgsAlias ''nom "$@" --system x86_64-linux -j0'';
+    xnix  = mkArgsAlias ''nix "$@" --system x86_64-linux -j0'';
     anom  = mkArgsAlias ''nom "$@" --system aarch64-linux -j0'';
     anix  = mkArgsAlias ''nix "$@" --system aarch64-linux -j0'';
     dnom  = mkArgsAlias ''nom "$@" --system x86_64-darwin -j0'';
@@ -59,6 +63,10 @@ in
     rnix-build  = "nix-build --system riscv64-linux -j0";
     fnom-build  = "nom-build --system x86_64-freebsd -j0";
     fnix-build  = "nix-build --system x86_64-freebsd -j0";
+    fanom-build  = "nom-build --system aarch64-freebsd -j0";
+    fanix-build  = "nix-build --system aarch64-freebsd -j0";
+    xnom-build  = "nom-build --system x86_64-linux -j0";
+    xnix-build  = "nix-build --system x86_64-linux -j0";
     anom-build  = "nom-build --system aarch64-linux -j0";
     anix-build  = "nix-build --system aarch64-linux -j0";
     dnom-build  = "nom-build --system x86_64-darwin -j0";
@@ -66,6 +74,8 @@ in
     danom-build = "nom-build --system aarch64-darwin -j0";
     danix-build = "nix-build --system aarch64-darwin -j0";
 
+    nix-eval = "nix eval --impure --expr";
+    nix-eval-nixpkgs = mkArgsAlias ''nix eval --impure --expr "with import (builtins.getFlake "nixpkgs") {}; $1" "''${@:2}"'';
   };
 
   programs.bash.initExtra = ''