feat(user/email): add Eittlandic translation to email signature

system/default.nix

@@ -34,8 +34,9 @@ in {
 
   config = {
     boot.tmp.cleanOnBoot = true;
-    time.timeZone = cfg.timezone;
     console.keyMap = cfg.keymap;
+    time.timeZone = cfg.timezone;
+    environment.pathsToLink = ["/share/bash-completion" "/share/zsh"];
     services = {
       orca.enable = false;
       envfs.enable = true;

users/modules/dev/vcs/jujutsu.nix

@@ -45,9 +45,8 @@ in {
         default-command = "st";
         pager = ":builtin";
         show-cryptographic-signatures = true;
-        conflict-marker-style = "git"; # Support for vc-jj.el
-        diff-formatter = ":git"; # Support for vc-jj.el
         diff-editor = ":builtin";
+        merge-editort = ":builtin";
         inherit (cfg) editor;
       };
       signing = mkIf cfg.signing.enable {
@@ -63,24 +62,41 @@ in {
         eject = ["squash" "--from" "@" "--into"];
         d = ["diff"];
         dm = ["desc" "-m"];
+        gc = ["git" "clone"];
+        gcc = ["git" "clone" "--colocate"];
         l = ["log"];
+        la = ["log" "-r" "::"];
         lc = ["log" "-r" "(remote_bookmarks()..@)::"];
         ll = ["log" "-T" "builtin_log_detailed"];
         open = ["log" "-r" "open()"];
         n = ["new"];
         nd = ["new" "dev()"];
         nt = ["new" "trunk()"];
+        revlog = ["evolog"];
         s = ["show"];
         tug = ["bookmark" "move" "--from" "heads(::@- & bookmarks())" "--to" "@-"];
       };
+      colors.working_copy.underline = true;
+      git = {
+        private-commits = "blacklist()";
+        colocate = true;
+        subprocess = true;
+      };
       revset-aliases = {
+        "immutable_heads()" = "present(trunk()) | tags()";
+        # Resolves by default to latest main/master remote bookmarks
+        "trunk()" = "latest((present(main) | present(master)) & remote_bookmarks())";
+        # Same as trunk() but for `dev` or `develop` bookmarks
+        "dev()" = "latest((present(dev) | present(develop)) & remote_bookmarks())";
+
         "user(x)" = "author(x) | committer(x)";
         "gh_pages()" = "ancestors(remote_bookmarks(exact:\"gh-pages\"))";
-        "trunk()" = "latest((present(main) | present(master)) & remote_bookmarks())";
-        "dev()" = "latest((present(dev) | present(develop)) & remote_bookmarks())";
+
+        #Private and WIP commits that should never be pushed
         "wip()" = "description(glob:\"wip:*\")";
         "private()" = "description(glob:\"private:*\")";
         "blacklist()" = "wip() | private()";
+
         # stack(x, n) is the set of mutable commits reachable from
         # 'x', with 'n' parents. 'n' is often useful to customize the
         # display and return set for certain operations. 'x' can be
@@ -93,6 +109,7 @@ in {
         "open()" = "stack(dev().. & mine(), 1)";
         "ready()" = "open() ~ blacklist()::";
       };
+      remotes.origin.auto-track-bookmarks = "*";
     };
   };
 }

users/modules/shell/bash.nix

@@ -16,6 +16,11 @@ in {
         lns = "ln -si";
       };
     };
+    autocompletion = mkOption {
+      type = types.bool;
+      default = config.home.shell.autocompletion;
+      example = true;
+    };
     eatIntegration = mkEnableOption "Enable Emacs Eat integration";
     bashrcExtra = mkOption {
       type = types.lines;
@@ -33,6 +38,7 @@ in {
           (strings.optionalString cfg.eatIntegration ''[ -n "$EAT_SHELL_INTEGRATION_DIR" ] && source "$EAT_SHELL_INTEGRATION_DIR/bash"'')
           cfg.bashrcExtra
         ];
+      enableCompletion = cfg.autocompletion;
       shellAliases = cfg.aliases;
       shellOptions = [
         "histappend"

users/modules/shell/default.nix

@@ -88,6 +88,10 @@ in {
       default = {};
       example = {la = "ls -a";};
     };
+    autocompletion = mkOption {
+      type = types.bool;
+      default = true;
+    };
   };
   config.home.shell = {
     enableShellIntegration = cfg.bash.enable or cfg.zsh.enable or cfg.fish.enable;

users/modules/shell/fish.nix

@@ -17,6 +17,11 @@ in {
         lns = "ln -si";
       };
     };
+    autocompletion = mkOption {
+      type = types.bool;
+      default = config.home.shell.autocompletion;
+      example = true;
+    };
     extraShellInit = mkOption {
       type = types.lines;
       default = "";
@@ -26,6 +31,7 @@ in {
   config = lib.mkIf cfg.enable {
     programs.fish = {
       enable = true;
+      generateCompletions = cfg.autocompletion;
       shellAbbrs = cfg.abbrs;
       preferAbbrs = true;
       shellInit = with lib;

users/modules/shell/zsh.nix

@@ -17,6 +17,11 @@ in {
         lns = "ln -si";
       };
     };
+    autocompletion = mkOption {
+      type = types.bool;
+      default = config.home.shell.autocompletion;
+      example = true;
+    };
     eatIntegration = mkEnableOption "Enable Emacs Eat integration";
     zshrcExtra = lib.mkOption {
       type = types.lines;
@@ -32,7 +37,7 @@ in {
         enable = true;
         strategy = ["match_prev_cmd" "completion"];
       };
-      enableCompletion = true;
+      enableCompletion = cfg.autocompletion;
       enableVteIntegration = true;
       history = {
         findNoDups = true;

users/phundrak/email.nix

@@ -8,6 +8,7 @@
 
     @@@ Sauvez un arbre, mangez un castor @@@
     @@@     Save a tree, eat a beaver     @@@
+    @@@       Bjarg tré, et bjórr         @@@
   '';
 in {
   home.file.".signature" = {