config/jj/config.toml

@@ -26,7 +26,7 @@ conflict-marker-style = 'git'
 
 [aliases]
 d = ['diff']
-l = ['log', '-r', 'ancestors((trunk()..@)::, 2) | ancestors(builtin_immutable_heads().., 2) | bookmarks()', '-T', 'log_medium']
+l = ['log', '-r', 'ancestors((trunk()..@):: | heads(mutable()), 2) | roots(immutable()..)- | bookmarks()', '-T', 'log_medium']
 ll = ['log', '-r', 'ancestors(present(@) | present(trunk()) | bookmarks() | tracked_remote_bookmarks() | visible_heads(), 2)']
 ls = ['log', '-r', '..(@ | present(trunk()))', '-T', 'builtin_log_compact_full_description']
 tug = ['bookmark', 'move', '--from', 'closest_bookmark(@)', '--to', 'closest_pushable(@)']

config/oh-my-posh.toml

@@ -1,6 +1,6 @@
 '$schema' = 'https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json'
 
-version = 3
+version = 4
 async = true
 console_title_template = '{{ .Shell }} in {{ .Folder }}'
 final_space = true
@@ -26,7 +26,7 @@ final_space = true
     background = '#170b3b'
     style = 'powerline'
     powerline_symbol = ''
-    [blocks.segments.properties]
+    [blocks.segments.options]
       style = 'mixed'
       mixed_threshold = 16
       folder_icon = ''
@@ -39,7 +39,7 @@ final_space = true
     background = '#2c1048'
     style = 'powerline'
     powerline_symbol = ''
-    [blocks.segments.properties]
+    [blocks.segments.options]
       branch_icon = ''
       branch_template = '{{ trunc 25 .Branch }}'
       disable_with_jj = true
@@ -55,7 +55,7 @@ final_space = true
     background = '#2c1048'
     style = 'powerline'
     powerline_symbol = ''
-    [blocks.segments.properties]
+    [blocks.segments.options]
       fetch_status = true
       change_id_min_len = 4
 
@@ -74,7 +74,7 @@ final_space = true
     background = '#4c1f5e'
     style = 'powerline'
     powerline_symbol = ''
-    [blocks.segments.properties]
+    [blocks.segments.options]
       time_format = '15:04'
 
   [[blocks.segments]]
@@ -100,7 +100,7 @@ final_space = true
     background = '#69307a'
     style = 'diamond'
     trailing_diamond = ''
-    [blocks.segments.properties]
+    [blocks.segments.options]
       always_enabled = true
 
   [[blocks.segments]]
@@ -140,6 +140,6 @@ final_space = true
   style = 'diamond'
   leading_diamond = ''
   trailing_diamond = ''
-  [tooltips.properties]
+  [tooltips.options]
     display_mode = 'always'
     fetch_package_manager = true