Merge

config/htop/htoprc

@@ -1,21 +1,32 @@
 # Beware! This file is rewritten by htop when settings are changed in the interface.
 # The parser is also very primitive, and not human-friendly.
+htop_version=3.1.1
+config_reader_min_version=2
 fields=0 48 17 18 38 39 40 2 46 47 49 1
-sort_key=46
-sort_direction=1
-hide_threads=0
+sort_key=47
+sort_direction=-1
+tree_sort_key=0
+tree_sort_direction=1
 hide_kernel_threads=1
 hide_userland_threads=0
 shadow_other_users=0
 show_thread_names=0
 show_program_path=1
 highlight_base_name=0
+highlight_deleted_exe=1
 highlight_megabytes=1
 highlight_threads=1
+highlight_changes=0
+highlight_changes_delay_secs=5
+find_comm_in_cmdline=1
+strip_exe_from_cmdline=1
+show_merged_command=0
 tree_view=0
+tree_view_always_by_pid=0
+all_branches_collapsed=0
 header_margin=1
 detailed_cpu_time=0
-cpu_count_from_zero=0
+cpu_count_from_one=1
 show_cpu_usage=1
 show_cpu_frequency=0
 update_process_names=0
@@ -23,7 +34,9 @@ account_guest_in_cpu_meter=0
 color_scheme=0
 enable_mouse=1
 delay=15
-left_meters=Hostname Tasks Blank Blank LeftCPUs4 Memory
-left_meter_modes=2 2 2 2 1 1
-right_meters=Clock Uptime LoadAverage Blank RightCPUs4 Swap
-right_meter_modes=2 2 2 2 1 1
+hide_function_bar=0
+header_layout=two_50_50
+column_meters_0=Hostname Tasks Blank Blank LeftCPUs4 Memory
+column_meter_modes_0=2 2 2 2 1 1
+column_meters_1=Clock Uptime LoadAverage Blank RightCPUs4 Swap
+column_meter_modes_1=2 2 2 2 1 1