PlumJam/nixos - Change O2YUP7WC5ZYDHJKNYD46343XCJHHT7H2V46TTUFPANWBN5KFP7MAC

shell: Move to nixos/darwin classes.

Created by PlumJam on February 5, 2026

O2YUP7WC5ZYDHJKNYD46343XCJHHT7H2V46TTUFPANWBN5KFP7MAC

Dependencies

In channels

main

Change contents

Replacement in modules/shell.nix at line 1 [5.50406]
B:BD[5.50406] → [5.50407:50409]
B:BD[5.50409] → [6.1476:1505]
```
{
  flake.modules.hjem.shell =
```
[5.50406]
[7.159]
```
let
  shellBase =
```
Deletion in modules/shell.nix at line 7 [5.50406]
B:BD[7.202] → [7.202:215]
```
      theme,
```
Insertion in modules/shell.nix at line 10 [5.50406]
[5.50494]
[5.50494]
```
      inherit (config) theme;
```

Insertion in modules/shell.nix at line 13 [5.50406]

[8.173]

      inherit (lib.lists) singleton;
      homeDir = "($env.HOME)";

Replacement in modules/shell.nix at line 20 [5.50406]

B:BD[8.216] → [8.216:378]

        todo = "hx ${config.directory}/notes/todo.md";
        notes = "hx ${config.directory}/notes";
        random = "hx ${config.directory}/notes/random.md";

[8.216]

[8.378]

        todo = "hx ${homeDir}/notes/todo.md";
        notes = "hx ${homeDir}/notes";
        random = "hx ${homeDir}/notes/random.md";

Replacement in modules/shell.nix at line 44 [5.50406]

B:BD[8.842] → [8.842:1032]

        oops = "nix run nixpkgs#sqlite -- ${config.directory}/.config/nushell/history.sqlite3 'DELETE FROM history WHERE rowid IN (SELECT rowid FROM history ORDER BY rowid DESC LIMIT 5);'";

[8.842]

[8.1032]

        oops = "nix run nixpkgs#sqlite -- ${homeDir}/.config/nushell/history.sqlite3 'DELETE FROM history WHERE rowid IN (SELECT rowid FROM history ORDER BY rowid DESC LIMIT 5);'";

Insertion in modules/shell.nix at line 66 [5.50406]

[9.5016]

        # This absolute path is fine. Rebuilds always happen from the jam user.

Replacement in modules/shell.nix at line 80 [5.50406]

B:BD[5.50545] → [7.233:292]

B:BD[7.292] → [8.1675:1695]

∅:D[8.1695] → [7.292:337]

B:BD[7.292] → [7.292:337]

B:BD[7.337] → [8.1696:1737]

∅:D[8.1737] → [7.337:364]

B:BD[7.337] → [7.337:364]

B:BD[7.364] → [8.1738:1845]

∅:D[8.1845] → [7.417:418]

B:BD[7.417] → [7.417:418]

B:BD[7.418] → [8.1846:2236]

B:BD[8.2236] → [2.226:274]

      packages = [
        pkgs.bash
        pkgs.carapace
        pkgs.direnv
        pkgs.fish
        pkgs.inshellisense
        pkgs.nushell
        pkgs.zoxide
        pkgs.zsh
      ];
      xdg.config.files."direnv/lib/nix-direnv.sh".source = "${pkgs.nix-direnv}/share/nix-direnv/direnvrc";
      xdg.config.files."nushell/config.nu".text =
        # nu
        ''
          ${lib.concatStringsSep "\n" (lib.mapAttrsToList (name: val: "alias ${name} = ${val}") aliases)}
          $env.config.edit_mode = "vi"
          $env.config.buffer_editor = "${config.environment.sessionVariables.EDITOR}"
          $env.config.show_banner = false
          $env.config.footer_mode = "auto"
          $env.config.use_kitty_protocol = true

[5.50545]

[7.532]

      hjem.extraModules = singleton {
        packages = [
          pkgs.bash
          pkgs.carapace
          pkgs.direnv
          pkgs.fish
          pkgs.inshellisense
          pkgs.nushell
          pkgs.zoxide
          pkgs.zsh
        ];

Replacement in modules/shell.nix at line 92 [5.50406]

B:BD[7.533] → [8.2237:2281]

B:BD[8.2281] → [2.275:320]

          $env.config.recursion_limit = 100
          $env.config.error_style = "nested"

[7.533]

[5.50595]

        xdg.config.files."direnv/lib/nix-direnv.sh".source = "${pkgs.nix-direnv}/share/nix-direnv/direnvrc";

Replacement in modules/shell.nix at line 94 [5.50406]

B:BD[5.50596] → [8.2326:2641]

          $env.config.completions.algorithm = "substring"
          $env.config.completions.sort = "smart"
          $env.config.completions.case_sensitive = false
          $env.config.completions.quick = true
          $env.config.completions.partial = true
          $env.config.completions.use_ls_colors = true

[5.50596]

[5.50687]

        xdg.config.files."nushell/config.nu".text =
          # nu
          ''
            ${lib.concatStringsSep "\n" (lib.mapAttrsToList (name: val: "alias ${name} = ${val}") aliases)}
            $env.config.edit_mode = "vi"
            $env.config.buffer_editor = "${config.environment.variables.EDITOR}"
            $env.config.show_banner = false
            $env.config.footer_mode = "auto"
            $env.config.use_kitty_protocol = true

Replacement in modules/shell.nix at line 104 [5.50406]

B:BD[5.50688] → [8.2642:2736]

          $env.config.ls.use_ls_colors = true
          $env.config.ls.clickable_links = true

[5.50688]

[5.50854]

            $env.config.recursion_limit = 100
            $env.config.error_style = "nested"

Replacement in modules/shell.nix at line 107 [5.50406]

B:BD[5.50855] → [8.2737:2783]

          $env.config.rm.always_trash = false

[5.50855]

[5.51007]

            $env.config.completions.algorithm = "substring"
            $env.config.completions.sort = "smart"
            $env.config.completions.case_sensitive = false
            $env.config.completions.quick = true
            $env.config.completions.partial = true
            $env.config.completions.use_ls_colors = true

Replacement in modules/shell.nix at line 114 [5.50406]

B:BD[5.51008] → [8.2784:2925]

          $env.config.table.mode = "compact"
          $env.config.table.index_mode = "always"
          $env.config.table.show_empty = true

[5.51008]

[5.51078]

            $env.config.ls.use_ls_colors = true
            $env.config.ls.clickable_links = true

Replacement in modules/shell.nix at line 117 [5.50406]

B:BD[5.51079] → [8.2926:3107]

          $env.config.table.trim.methodology = "wrapping"
          $env.config.table.trim.wrapping_try_keep_words = true
          $env.config.table.trim.truncating_suffix = "..."

[5.51079]

[5.51142]

            $env.config.rm.always_trash = false

Replacement in modules/shell.nix at line 119 [5.50406]

B:BD[5.51143] → [8.3108:3262]

          $env.config.history.file_format = "sqlite"
          $env.config.history.max_size = 10000000
          $env.config.history.sync_on_enter = true

[5.51143]

[5.51192]

            $env.config.table.mode = "compact"
            $env.config.table.index_mode = "always"
            $env.config.table.show_empty = true

Replacement in modules/shell.nix at line 123 [5.50406]

B:BD[5.51193] → [8.3263:3423]

          $env.config.cursor_shape.emacs = "block"
          $env.config.cursor_shape.vi_insert = "line"
          $env.config.cursor_shape.vi_normal = "block"

[5.51193]

[5.51396]

            $env.config.table.trim.methodology = "wrapping"
            $env.config.table.trim.wrapping_try_keep_words = true
            $env.config.table.trim.truncating_suffix = "..."

Replacement in modules/shell.nix at line 127 [5.50406]

B:BD[5.51397] → [8.3424:3515]

          $env.config.float_precision = 2
          $env.config.use_ansi_coloring = "auto"

[5.51397]

[5.51610]

            $env.config.history.file_format = "sqlite"
            $env.config.history.max_size = 10000000
            $env.config.history.sync_on_enter = true

Replacement in modules/shell.nix at line 131 [5.50406]

B:BD[5.51611] → [8.3516:3777]

          $env.config.explore.help_banner = true
          $env.config.explore.exit_esc = true
          $env.config.explore.command_bar_text = "#C4C9C6"
          $env.config.explore.highlight.bg = "yellow"
          $env.config.explore.highlight.fg = "black"

[5.51611]

[5.51699]

            $env.config.cursor_shape.emacs = "block"
            $env.config.cursor_shape.vi_insert = "line"
            $env.config.cursor_shape.vi_normal = "block"

Replacement in modules/shell.nix at line 135 [5.50406]

B:BD[5.51700] → [8.3778:4219]

          $env.config.explore.table.split_line = "#404040"
          $env.config.explore.table.cursor = true
          $env.config.explore.table.line_index = true
          $env.config.explore.table.line_shift = true
          $env.config.explore.table.line_head_top = true
          $env.config.explore.table.line_head_bottom = true
          $env.config.explore.table.show_head = true
          $env.config.explore.table.show_index = true

[5.51700]

[5.52015]

            $env.config.float_precision = 2
            $env.config.use_ansi_coloring = "auto"

Replacement in modules/shell.nix at line 138 [5.50406]

B:BD[5.52016] → [8.4220:4347]

          $env.config.explore.config.cursor_color.bg = "yellow"
          $env.config.explore.config.cursor_color.fg = "black"

[5.52016]

[5.52110]

            $env.config.explore.help_banner = true
            $env.config.explore.exit_esc = true
            $env.config.explore.command_bar_text = "#C4C9C6"
            $env.config.explore.highlight.bg = "yellow"
            $env.config.explore.highlight.fg = "black"

Replacement in modules/shell.nix at line 144 [5.50406]

B:BD[5.52111] → [8.4348:4925]

          $env.config.keybindings = [
            {
              name: quit_shell
              modifier: control
              keycode: char_d
              mode: emacs
              event: null
            }
            {
              name: quit_shell
              modifier: control
              keycode: char_d
              mode: vi_insert
              event: null
            }
            {
              name: quit_shell
              modifier: control
              keycode: char_d
              mode: vi_normal
              event: null
            }
          ]

[5.52111]

[5.52157]

            $env.config.explore.table.split_line = "#404040"
            $env.config.explore.table.cursor = true
            $env.config.explore.table.line_index = true
            $env.config.explore.table.line_shift = true
            $env.config.explore.table.line_head_top = true
            $env.config.explore.table.line_head_bottom = true
            $env.config.explore.table.show_head = true
            $env.config.explore.table.show_index = true

Replacement in modules/shell.nix at line 153 [5.50406]

B:BD[5.52158] → [8.4926:5097]

          $env.config.hooks.env_change.PWD = [
            { |before, after| zellij-update-tabname }
            {||
              if (which direnv | is-empty) { return }

[5.52158]

[5.52299]

            $env.config.explore.config.cursor_color.bg = "yellow"
            $env.config.explore.config.cursor_color.fg = "black"

Replacement in modules/shell.nix at line 156 [5.50406]

B:BD[5.52300] → [8.5098:5193]

              direnv export json | from json | default {} | load-env
            }
          ]

[5.52300]

[5.52481]

            $env.config.keybindings = [
              {
                name: quit_shell
                modifier: control
                keycode: char_d
                mode: emacs
                event: null
              }
              {
                name: quit_shell
                modifier: control
                keycode: char_d
                mode: vi_insert
                event: null
              }
              {
                name: quit_shell
                modifier: control
                keycode: char_d
                mode: vi_normal
                event: null
              }
            ]

Replacement in modules/shell.nix at line 180 [5.50406]

B:BD[5.52482] → [8.5194:5376]

          $env.config.hooks.display_output = {
            if (term size).columns >= 100  { tee { table --expand | print } } | try { if $in != null { $env.last = $in } }
          }

[5.52482]

[5.52636]

            $env.config.hooks.env_change.PWD = [
              { |before, after| zellij-update-tabname }
              {||
                if (which direnv | is-empty) { return }

Deletion in modules/shell.nix at line 185 [5.50406]

B:BD[5.52637] → [8.5377:5483]

          $env.config.hooks.pre_prompt = [
            {
              if not (which direnv | is-empty) {

Deletion in modules/shell.nix at line 186 [5.50406]

B:BD[8.5554] → [8.5554:5621]

                $env.PATH = ($env.PATH | split row (char env_sep))

Insertion in modules/shell.nix at line 187 [5.50406]

[8.5637]

            ]
            $env.config.hooks.display_output = {
              if (term size).columns >= 100  { tee { table --expand | print } } | try { if $in != null { $env.last = $in } }

Deletion in modules/shell.nix at line 192 [5.50406]
B:BD[8.5651] → [8.5651:5663]
```
          ]
```

Replacement in modules/shell.nix at line 193 [5.50406]

B:BD[5.52798] → [8.5664:5750]

          ${readFile ./nushell.menus.nu}
          ${readFile ./nushell.functions.nu}

[5.52798]

[5.52889]

            $env.config.hooks.pre_prompt = [
              {
                if not (which direnv | is-empty) {
                  direnv export json | from json | default {} | load-env
                  $env.PATH = ($env.PATH | split row (char env_sep))
                }
              }
            ]

Replacement in modules/shell.nix at line 202 [5.50406]

B:BD[5.52890] → [8.5751:5789]

          ${zoxideNushellIntegration}

[5.52890]

[5.53151]

            ${readFile ./nushell.menus.nu}
            ${readFile ./nushell.functions.nu}

Replacement in modules/shell.nix at line 205 [5.50406]

B:BD[5.53152] → [8.5790:5892]

          source $"($nu.cache-dir)/carapace.nu"
          source $"($nu.cache-dir)/jj.nu"
        '';

[5.53152]

[5.53593]

            ${zoxideNushellIntegration}

Replacement in modules/shell.nix at line 207 [5.50406]

B:BD[5.53594] → [8.5893:6096]

      xdg.config.files."nushell/env.nu".text =
        with theme.withHash;
        #nu
        ''
          			use std/config ${theme.nushell}
          			$env.config.color_config = (${theme.nushell})

[5.53594]

[5.53721]

            source $"($nu.cache-dir)/carapace.nu"
            source $"($nu.cache-dir)/jj.nu"
          '';

Replacement in modules/shell.nix at line 211 [5.50406]

B:BD[5.53722] → [8.6097:6299]

          			$env.CARAPACE_BRIDGES = "zsh,fish,bash,inshellisense,clap,jj,nu"
          			mkdir $"($nu.cache-dir)"
          			carapace _carapace nushell | save --force $"($nu.cache-dir)/carapace.nu"

[5.53722]

[5.54299]

        xdg.config.files."nushell/env.nu".text =
          with theme.withHash;
          #nu
          ''
            			use std/config ${theme.nushell}
            			$env.config.color_config = (${theme.nushell})

Replacement in modules/shell.nix at line 218 [5.50406]

B:BD[5.54300] → [8.6300:6380]

          			jj util completion nushell | save --force $"($nu.cache-dir)/jj.nu"

[5.54300]

[5.54413]

            			$env.CARAPACE_BRIDGES = "zsh,fish,bash,inshellisense,clap,jj,nu"
            			mkdir $"($nu.cache-dir)"
            			carapace _carapace nushell | save --force $"($nu.cache-dir)/carapace.nu"

Replacement in modules/shell.nix at line 222 [5.50406]

B:BD[5.54414] → [8.6381:6631]

          			# let carapace_completer = {|spans: list<string>|
            	# 		# If the current command is an alias, get it's expansion.
             #      let expanded_alias = (scope aliases | where name == $spans.0 | get -i 0 | get -i expansion)

[5.54414]

[5.54596]

            			jj util completion nushell | save --force $"($nu.cache-dir)/jj.nu"

Replacement in modules/shell.nix at line 224 [5.50406]

B:BD[5.54597] → [8.6632:6945]

             #      # Overwrite.
             #      let spans = (if $expanded_alias != null  {
             #          # put the first word of the expanded alias first in the span
             #          $spans | skip 1 | prepend ($expanded_alias | split row " " | take 1)
             #      } else { $spans })

[5.54597]

[5.54883]

            			# let carapace_completer = {|spans: list<string>|
              	# 		# If the current command is an alias, get it's expansion.
               #      let expanded_alias = (scope aliases | where name == $spans.0 | get -i 0 | get -i expansion)
               #      # Overwrite.
               #      let spans = (if $expanded_alias != null  {
               #          # put the first word of the expanded alias first in the span
               #          $spans | skip 1 | prepend ($expanded_alias | split row " " | take 1)
               #      } else { $spans })

Replacement in modules/shell.nix at line 234 [5.50406]

B:BD[5.54884] → [8.6946:7167]

             #      carapace $spans.0 nushell ...$spans
             #      | from json
             #      | if ($in | default [] | any {|| $in.display | str starts-with "ERR"}) { null } else { $in }
             #    }

[5.54884]

[10.87]

               #      carapace $spans.0 nushell ...$spans
               #      | from json
               #      | if ($in | default [] | any {|| $in.display | str starts-with "ERR"}) { null } else { $in }
               #    }

Replacement in modules/shell.nix at line 239 [5.50406]

B:BD[10.88] → [8.7168:7248]

          			$env.LS_COLORS = (${pkgs.vivid}/bin/vivid generate ${theme.vivid})

[10.88]

[5.54982]

            			$env.LS_COLORS = (${pkgs.vivid}/bin/vivid generate ${theme.vivid})

Replacement in modules/shell.nix at line 241 [5.50406]

B:BD[5.54983] → [8.7249:7647]

          			let theme_json = $"($env.HOME)/nixos/modules/theme.json"
          			if ($theme_json | path exists) {
          				let theme = (open $theme_json)
          				$env.THEME_MODE = $theme.mode
          				$env.THEME_SCHEME = $theme.scheme
          			} else {
          				$env.THEME_MODE = "${theme.variant}"
          				$env.THEME_SCHEME = "${theme.colorScheme}"
          			}

[5.54983]

[5.55158]

            			let theme_json = $"($env.HOME)/nixos/modules/theme.json"
            			if ($theme_json | path exists) {
            				let theme = (open $theme_json)
            				$env.THEME_MODE = $theme.mode
            				$env.THEME_SCHEME = $theme.scheme
            			} else {
            				$env.THEME_MODE = "${theme.variant}"
            				$env.THEME_SCHEME = "${theme.colorScheme}"
            			}

Replacement in modules/shell.nix at line 251 [5.50406]

B:BD[5.55159] → [8.7648:7686]

          			# Custom Nushell prompt.

[5.55159]

[10.267]

            			# Custom Nushell prompt.

Replacement in modules/shell.nix at line 253 [5.50406]

B:BD[10.268] → [8.7687:7796]

          			def prompt [--transient]: nothing -> string {
          				let exit_code = $env.LAST_EXIT_CODE

[10.268]

[5.55306]

            			def prompt [--transient]: nothing -> string {
            				let exit_code = $env.LAST_EXIT_CODE

Replacement in modules/shell.nix at line 256 [5.50406]

B:BD[5.55307] → [8.7797:8124]

          				let status = if not ($exit_code == 0) or $transient {
          					$"(ansi '${base0D}')┫(ansi rst)(if $exit_code == 0 { ansi '${base0D}' } else { ansi '${base08}' })($exit_code)(ansi rst)(ansi '${base0D}')┣(ansi rst)"
          				} else {
          					$"(ansi '${base0D}')━(ansi rst)"
          				}

[5.55307]

[5.55672]

            				let status = if not ($exit_code == 0) or $transient {
            					$"(ansi '${base0D}')┫(ansi rst)(if $exit_code == 0 { ansi '${base0D}' } else { ansi '${base08}' })($exit_code)(ansi rst)(ansi '${base0D}')┣(ansi rst)"
            				} else {
            					$"(ansi '${base0D}')━(ansi rst)"
            				}

Replacement in modules/shell.nix at line 262 [5.50406]

B:BD[5.55673] → [8.8125:8279]

          				let host = if ($env.SSH_CONNECTION? | is-not-empty) {
          					$" (ansi '${base0B}')(hostname)(ansi rst)"
          				} else { "" }

[5.55673]

[5.55705]

            				let host = if ($env.SSH_CONNECTION? | is-not-empty) {
            					$" (ansi '${base0B}')(hostname)(ansi rst)"
            				} else { "" }

Replacement in modules/shell.nix at line 266 [5.50406]

B:BD[5.55706] → [8.8280:8396]

          				let jj_root = try {
          		      jj workspace root err> /dev/null
          		    } catch { "" }

[5.55706]

[5.55803]

            				let jj_root = try {
            		      jj workspace root err> /dev/null
            		    } catch { "" }

Replacement in modules/shell.nix at line 270 [5.50406]

B:BD[5.55804] → [8.8397:8441]

          		    let pwd = pwd | path expand

[5.55804]

[5.56101]

            		    let pwd = pwd | path expand

Replacement in modules/shell.nix at line 272 [5.50406]

B:BD[5.56102] → [8.8442:9002]

          		    let dir = if ($jj_root | is-not-empty) {
          		      let subpath = $pwd | path relative-to $jj_root
          		      let subpath = if ($subpath | is-not-empty) {
          		        $"(ansi '${base0E}') ⟶ (ansi rst)(ansi '${base0B}')($subpath)(ansi rst)"
          		      }
          			      $"($jj_root | path basename)($subpath)"
          			    } else {
          			      let pwd = if ($pwd | str starts-with $env.HOME) {
          			        "~" | path join ($pwd | path relative-to $env.HOME)
          	      } else { $pwd }

[5.56102]

[5.56238]

            		    let dir = if ($jj_root | is-not-empty) {
            		      let subpath = $pwd | path relative-to $jj_root
            		      let subpath = if ($subpath | is-not-empty) {
            		        $"(ansi '${base0E}') ⟶ (ansi rst)(ansi '${base0B}')($subpath)(ansi rst)"
            		      }
            			      $"($jj_root | path basename)($subpath)"
            			    } else {
            			      let pwd = if ($pwd | str starts-with $env.HOME) {
            			        "~" | path join ($pwd | path relative-to $env.HOME)
            	      } else { $pwd }

Replacement in modules/shell.nix at line 283 [5.50406]

B:BD[5.56239] → [8.9003:9042]

          	      $pwd
          	    }

[5.56239]

[5.56337]

            	      $pwd
            	    }

Replacement in modules/shell.nix at line 286 [5.50406]

B:BD[5.56338] → [8.9043:9111]

          				let directory = $"(ansi '${base0A}')($dir)(ansi rst)"

[5.56338]

[5.56376]

            				let directory = $"(ansi '${base0A}')($dir)(ansi rst)"

Replacement in modules/shell.nix at line 288 [5.50406]

B:BD[5.56377] → [8.9112:10316]

          				let jj_info = if (which jj | is-not-empty) {
          					try {
          						let jj_output = (jj --quiet --color always --ignore-working-copy log --no-graph --revisions @ --template '
          							separate(
          								" ",
          								bookmarks.join(", "),
          								if(empty, label("empty", "(empty)")),
          								coalesce(
          									surround("\"", "\"",
          										if(
          											description.first_line().substr(0, 26).starts_with(description.first_line()),
          											description.first_line().substr(0, 26),
          											description.first_line().substr(0, 25) ++ "…"
          								  	)
          								  ),
          									label(if(empty, "empty"), "")
          								),
          								change_id.shortest(),
          								commit_id.shortest(),
          								if(conflict, label("conflict", "(conflict)")),
          								if(divergent, label("divergent prefix", "(divergent)")),
          								if(hidden, label("hidden prefix", "(hidden)")),
          								if(immutable, label("immutable", "(immutable)")),
          							)
          						' err> /dev/null | str trim)

[5.56377]

[11.481]

            				let jj_info = if (which jj | is-not-empty) {
            					try {
            						let jj_output = (jj --quiet --color always --ignore-working-copy log --no-graph --revisions @ --template '
            							separate(
            								" ",
            								bookmarks.join(", "),
            								if(empty, label("empty", "(empty)")),
            								coalesce(
            									surround("\"", "\"",
            										if(
            											description.first_line().substr(0, 26).starts_with(description.first_line()),
            											description.first_line().substr(0, 26),
            											description.first_line().substr(0, 25) ++ "…"
            								  	)
            								  ),
            									label(if(empty, "empty"), "")
            								),
            								change_id.shortest(),
            								commit_id.shortest(),
            								if(conflict, label("conflict", "(conflict)")),
            								if(divergent, label("divergent prefix", "(divergent)")),
            								if(hidden, label("hidden prefix", "(hidden)")),
            								if(immutable, label("immutable", "(immutable)")),
            							)
            						' err> /dev/null | str trim)

Replacement in modules/shell.nix at line 314 [5.50406]

B:BD[11.482] → [8.10317:10839]

          						# Only show parent bookmark if current change has no bookmarks.
          						let jj_has_bookmark = (jj --quiet --color always log --no-graph --revisions @ --template 'bookmarks.len() > 0' err> /dev/null | str trim) == "true"
          						let jj_parent = if not $jj_has_bookmark {
          							(jj --quiet --color always --ignore-working-copy log --no-graph --revisions 'heads(::@ & bookmarks())' --template 'bookmarks ++ "\n"' err> /dev/null | lines | str join ",")
          						} else { "" }

[11.482]

[11.1005]

            						# Only show parent bookmark if current change has no bookmarks.
            						let jj_has_bookmark = (jj --quiet --color always log --no-graph --revisions @ --template 'bookmarks.len() > 0' err> /dev/null | str trim) == "true"
            						let jj_parent = if not $jj_has_bookmark {
            							(jj --quiet --color always --ignore-working-copy log --no-graph --revisions 'heads(::@ & bookmarks())' --template 'bookmarks ++ "\n"' err> /dev/null | lines | str join ",")
            						} else { "" }

Replacement in modules/shell.nix at line 320 [5.50406]

B:BD[11.1006] → [8.10840:10984]

          						let jj_parent_display = if ($jj_parent | is-not-empty) {
          							$"tug ← ($jj_parent)"
          						} else { "" }

[11.1006]

[11.1156]

            						let jj_parent_display = if ($jj_parent | is-not-empty) {
            							$"tug ← ($jj_parent)"
            						} else { "" }

Replacement in modules/shell.nix at line 324 [5.50406]

B:BD[11.1157] → [8.10985:11454]

          						let combined = if ($jj_parent_display | is-not-empty) and ($jj_output | is-not-empty) {
          							$" ($jj_parent_display) ($jj_output)"
          						} else if ($jj_parent_display | is-not-empty) {
          							$" ($jj_parent_display)"
          						} else if ($jj_output | is-not-empty) {
          							$" ($jj_output)"
          						} else { "" }
          						$combined
          					} catch { "" }
          				} else { "" }

[11.1157]

[5.58165]

            						let combined = if ($jj_parent_display | is-not-empty) and ($jj_output | is-not-empty) {
            							$" ($jj_parent_display) ($jj_output)"
            						} else if ($jj_parent_display | is-not-empty) {
            							$" ($jj_parent_display)"
            						} else if ($jj_output | is-not-empty) {
            							$" ($jj_output)"
            						} else { "" }
            						$combined
            					} catch { "" }
            				} else { "" }

Replacement in modules/shell.nix at line 335 [5.50406]

B:BD[5.58166] → [8.11455:11829]

          				let ms = ($env.CMD_DURATION_MS | into int)
          				let duration = if $transient or $ms > 1000 {
          					let secs = $ms / 1000 | math floor
          					if $transient and $ms < 1000 {
          						$" (ansi '${base0A}')($ms)ms"
          					} else {
          						$" (ansi '${base0A}')($secs)s"
          					}
          				} else { "" }

[5.58166]

[5.58486]

            				let ms = ($env.CMD_DURATION_MS | into int)
            				let duration = if $transient or $ms > 1000 {
            					let secs = $ms / 1000 | math floor
            					if $transient and $ms < 1000 {
            						$" (ansi '${base0A}')($ms)ms"
            					} else {
            						$" (ansi '${base0A}')($secs)s"
            					}
            				} else { "" }

Replacement in modules/shell.nix at line 345 [5.50406]

B:BD[5.58487] → [8.11830:11905]

          				let bar = $"(ansi '${base0D}')(ansi attr_bold)━(ansi rst)"

[5.58487]

[5.58556]

            				let bar = $"(ansi '${base0D}')(ansi attr_bold)━(ansi rst)"

Replacement in modules/shell.nix at line 347 [5.50406]

B:BD[5.58557] → [8.11906:12576]

          				let prompt_line = [
          					(char nl)
          					$bar
          					$status
          					$bar
          					$host
          					" "
          					$directory
          					" "
          					(if ($jj_info | is-not-empty) {
          						[
          							$"(ansi '${base0D}')━┫(ansi rst)"
          							$jj_info
          							$" (ansi '${base0D}')┣━(ansi rst)"
          						] | str join
          					} else {
          						[
          							$bar
          							$bar
          							$bar
          						] | str join
          					})
          					$duration
          					(char nl)
          				] | str join

[5.58557]

[5.59077]

            				let prompt_line = [
            					(char nl)
            					$bar
            					$status
            					$bar
            					$host
            					" "
            					$directory
            					" "
            					(if ($jj_info | is-not-empty) {
            						[
            							$"(ansi '${base0D}')━┫(ansi rst)"
            							$jj_info
            							$" (ansi '${base0D}')┣━(ansi rst)"
            						] | str join
            					} else {
            						[
            							$bar
            							$bar
            							$bar
            						] | str join
            					})
            					$duration
            					(char nl)
            				] | str join

Replacement in modules/shell.nix at line 373 [5.50406]

B:BD[5.59078] → [8.12577:12619]

          				$prompt_line
          			}

[5.59078]

[5.59108]

            				$prompt_line
            			}

Replacement in modules/shell.nix at line 376 [5.50406]

B:BD[5.59109] → [8.12620:12870]

          			$env.PROMPT_COMMAND                 = { || prompt }
          			$env.PROMPT_COMMAND_RIGHT           = ""
          			$env.TRANSIENT_PROMPT_COMMAND       = { || prompt --transient }
          			$env.TRANSIENT_PROMPT_COMMAND_RIGHT = ""

[5.59109]

[5.59335]

            			$env.PROMPT_COMMAND                 = { || prompt }
            			$env.PROMPT_COMMAND_RIGHT           = ""
            			$env.TRANSIENT_PROMPT_COMMAND       = { || prompt --transient }
            			$env.TRANSIENT_PROMPT_COMMAND_RIGHT = ""

Replacement in modules/shell.nix at line 381 [5.50406]

B:BD[5.59336] → [8.12871:13497]

          			$env.PROMPT_INDICATOR                     = " "
          			$env.PROMPT_INDICATOR_VI_NORMAL           = $env.PROMPT_INDICATOR
          			$env.PROMPT_INDICATOR_VI_INSERT           = $env.PROMPT_INDICATOR
          			$env.PROMPT_MULTILINE_INDICATOR           = $env.PROMPT_INDICATOR
          			$env.TRANSIENT_PROMPT_INDICATOR           = $env.PROMPT_INDICATOR
          			$env.TRANSIENT_PROMPT_INDICATOR_VI_NORMAL = $env.PROMPT_INDICATOR
          			$env.TRANSIENT_PROMPT_INDICATOR_VI_INSERT = $env.PROMPT_INDICATOR
          			$env.TRANSIENT_PROMPT_MULTILINE_INDICATOR = $env.PROMPT_INDICATOR
        '';

[5.59336]

[5.59923]

            			$env.PROMPT_INDICATOR                     = " "
            			$env.PROMPT_INDICATOR_VI_NORMAL           = $env.PROMPT_INDICATOR
            			$env.PROMPT_INDICATOR_VI_INSERT           = $env.PROMPT_INDICATOR
            			$env.PROMPT_MULTILINE_INDICATOR           = $env.PROMPT_INDICATOR
            			$env.TRANSIENT_PROMPT_INDICATOR           = $env.PROMPT_INDICATOR
            			$env.TRANSIENT_PROMPT_INDICATOR_VI_NORMAL = $env.PROMPT_INDICATOR
            			$env.TRANSIENT_PROMPT_INDICATOR_VI_INSERT = $env.PROMPT_INDICATOR
            			$env.TRANSIENT_PROMPT_MULTILINE_INDICATOR = $env.PROMPT_INDICATOR
          '';
      };

Insertion in modules/shell.nix at line 392 [5.50406]

[5.59930]


in
{
  flake.modules.nixos.shell = shellBase;
  flake.modules.darwin.shell = shellBase;

Replacement in modules/shell-tools.nix at line 2 [7.9470]

B:BD[7.9475] → [7.9475:9513]

  batConfig =
    { lib, pkgs, ... }:

[7.9475]

[7.9513]

  shellToolsBase =
    {
      pkgs,
      lib,
      ...
    }:

Insertion in modules/shell-tools.nix at line 9 [7.9470]
[7.9521]
[7.9521]
```
      inherit (lib.lists) singleton;
```
Deletion in modules/shell-tools.nix at line 14 [7.9470]
B:BD[7.9615] → [3.147:148]

Replacement in modules/shell-tools.nix at line 17 [7.9470]

B:BD[7.9628] → [7.9628:9691]

      packages = [
        pkgs.bat
        pkgs.less
      ];

[7.9628]

[7.9691]

      hjem.extraModules = singleton {
        packages = [
          pkgs.bat
          pkgs.btop
          pkgs.eza
          pkgs.fastfetch
          pkgs.fd
          pkgs.fzf
          pkgs.jq
          pkgs.less
          pkgs.nix-index
          pkgs.ripgrep
          pkgs.vivid
        ];

Replacement in modules/shell-tools.nix at line 32 [7.9470]

B:BD[7.9692] → [7.9692:9731]

B:BD[7.9731] → [3.181:314]

∅:D[3.314] → [12.86:158]

B:BD[7.9802] → [12.86:158]

B:BD[7.9965] → [7.9965:9981]

      environment.sessionVariables = {
        BAT_THEME_LIGHT = "gruvbox-light";
        BAT_THEME_DARK = "gruvbox-dark";
        MANPAGER = pager;
        PAGER = pager;
        BAT_PAGER = "${less} --quit-if-one-screen --RAW-CONTROL-CHARS";
      };
    };

[7.9692]

[7.9981]

        environment.sessionVariables = {
          BAT_THEME_LIGHT = "gruvbox-light";
          BAT_THEME_DARK = "gruvbox-dark";
          MANPAGER = pager;
          PAGER = pager;
          BAT_PAGER = "${less} --quit-if-one-screen --RAW-CONTROL-CHARS";
          RIPGREP_CONFIG_PATH = "%h/.config/ripgrep/ripgreprc";
        };

Replacement in modules/shell-tools.nix at line 41 [7.9470]

B:BD[7.9982] → [7.9982:10183]

  ripgrepConfig =
    { pkgs, ... }:
    {
      packages = [
        pkgs.ripgrep
      ];
      environment.sessionVariables = {
        RIPGREP_CONFIG_PATH = "/home/jam/.config/ripgrep/ripgreprc";

[7.9982]

[7.10183]

        xdg.config.files."ripgrep/ripgreprc".text = ''
          --line-number
          --smart-case
        '';

Deletion in modules/shell-tools.nix at line 46 [7.9470]

B:BD[7.10192] → [7.10192:10193]

B:BD[7.10193] → [13.631:684]

∅:D[14.268] → [7.10246:10346]

∅:D[13.684] → [7.10246:10346]

B:BD[7.10246] → [7.10246:10346]

B:BD[7.10533] → [7.10533:10578]


      xdg.config.files."ripgrep/ripgreprc".text = ''
        --line-number
        --smart-case
      '';
    };
  ezaConfig =
    { pkgs, ... }:
    {
      packages = [
        pkgs.eza
      ];

Deletion in modules/shell-tools.nix at line 48 [7.9470]

B:BD[7.10586] → [7.10586:10794]

  otherConfig =
    { pkgs, ... }:
    {
      packages = [
        pkgs.btop
        pkgs.fastfetch
        pkgs.fd
        pkgs.fzf
        pkgs.jq
        pkgs.nix-index
        pkgs.vivid
      ];
    };

Replacement in modules/shell-tools.nix at line 50 [7.9470]

B:BD[7.10799] → [6.1507:1542]

∅:D[6.1542] → [7.10841:10873]

B:BD[7.10841] → [7.10841:10873]

B:BD[7.10873] → [15.86:122]

∅:D[15.122] → [7.10873:11066]

B:BD[7.10873] → [7.10873:11066]

B:BD[7.11066] → [15.123:278]

∅:D[15.278] → [7.11151:11271]

B:BD[7.11151] → [7.11151:11271]

B:BD[7.11379] → [7.11379:11380]

B:BD[7.11380] → [13.685:736]

∅:D[14.298] → [7.11431:11438]

∅:D[13.736] → [7.11431:11438]

B:BD[7.11431] → [7.11431:11438]

  flake.modules.hjem.shell-tools =
    { pkgs, lib, ... }:
    let
      inherit (lib.lists) flatten;
      bat = batConfig { inherit pkgs lib; };
      ripgrep = ripgrepConfig { inherit pkgs; };
      eza = ezaConfig { inherit pkgs; };
      other = otherConfig { inherit pkgs; };
    in
    {
      packages =
        [
          bat.packages
          ripgrep.packages
          eza.packages
          other.packages
        ]
        |> flatten;
      environment.sessionVariables =
        bat.environment.sessionVariables // ripgrep.environment.sessionVariables;
      xdg.config.files = ripgrep.xdg.config.files;
    };

[7.10799]

[7.11438]

  flake.modules.nixos.shell-tools = shellToolsBase;
  flake.modules.darwin.shell-tools = shellToolsBase;

Insertion in modules/hosts.nix at line 44 [17.110]
[4.1540]
[16.1793]
```
      shell
      shell-tools
```