updatesHEADmaster

2 files changed, 52 insertions, 41 deletions

diff --git a/mac/.config/htop/htoprc b/mac/.config/htop/htoprc
index 8666417..efd1fd9 100644
--- a/mac/.config/htop/htoprc
+++ b/mac/.config/htop/htoprc
@@ -1,53 +1,61 @@
 # Beware! This file is rewritten by htop when settings are changed in the interface.
 # The parser is also very primitive, and not human-friendly.
-.all_branches_collapsed=0
-.sort_direction=-1
-.sort_key=PERCENT_CPU
-.tree_sort_direction=1
-.tree_sort_key=PID
-.tree_view=0
-.tree_view_always_by_pid=0
-account_guest_in_cpu_meter=0
-all_branches_collapsed=0
-color_scheme=5
-column_meter_modes_0=1 1 1 2 2 2 1
-column_meter_modes_1=
-column_meters_0=LeftCPUs Memory Swap Uptime LoadAverage Tasks RightCPUs
-column_meters_1=
+htop_version=3.3.0-dev
 config_reader_min_version=3
-cpu_count_from_one=0
-delay=15
-detailed_cpu_time=0
-enable_mouse=1
-fields=0 48 17 18 38 39 2 46 46 47 49 1
-find_comm_in_cmdline=1
-header_layout=two_50_50
-header_margin=1
-hide_function_bar=0
+fields=0 48 17 18 38 39 2 46 47 49 1
 hide_kernel_threads=1
-hide_running_in_container=0
 hide_userland_threads=0
+hide_running_in_container=0
+shadow_other_users=1
+show_thread_names=0
+show_program_path=1
 highlight_base_name=1
-highlight_changes=1
-highlight_changes_delay_secs=1
 highlight_deleted_exe=1
+shadow_distribution_path_prefix=0
 highlight_megabytes=1
 highlight_threads=1
-htop_version=3.3.0-dev
-screen:Main=PID USER PRIORITY NICE M_VIRT M_RESIDENT STATE PERCENT_CPU PERCENT_MEM TIME Command
+highlight_changes=1
+highlight_changes_delay_secs=1
+find_comm_in_cmdline=1
+strip_exe_from_cmdline=1
+show_merged_command=0
+header_margin=1
 screen_tabs=1
-shadow_distribution_path_prefix=0
-shadow_other_users=1
-show_cpu_frequency=1
+detailed_cpu_time=0
+cpu_count_from_one=0
 show_cpu_usage=1
-show_merged_command=0
-show_program_path=1
-show_thread_names=0
+show_cpu_frequency=1
+update_process_names=0
+account_guest_in_cpu_meter=0
+color_scheme=5
+enable_mouse=1
+delay=15
+hide_function_bar=0
+header_layout=two_50_50
+column_meters_0=LeftCPUs2 Memory Swap
+column_meter_modes_0=1 1 1
+column_meters_1=RightCPUs2 Tasks LoadAverage Uptime
+column_meter_modes_1=1 2 2 2
+tree_view=0
+sort_key=47
+tree_sort_key=0
 sort_direction=-1
-sort_key=46
-strip_exe_from_cmdline=1
 tree_sort_direction=1
-tree_sort_key=0
-tree_view=0
 tree_view_always_by_pid=0
-update_process_names=0
+all_branches_collapsed=0
+screen:Main=PID USER PRIORITY NICE M_VIRT M_RESIDENT STATE PERCENT_CPU PERCENT_MEM TIME Command
+.sort_key=PERCENT_MEM
+.tree_sort_key=PID
+.tree_view=0
+.tree_view_always_by_pid=0
+.sort_direction=-1
+.tree_sort_direction=1
+.all_branches_collapsed=0
+screen:Main=PID USER PRIORITY NICE M_VIRT M_RESIDENT STATE PERCENT_CPU PERCENT_MEM TIME Command
+.sort_key=PID
+.tree_sort_key=PID
+.tree_view=0
+.tree_view_always_by_pid=0
+.sort_direction=1
+.tree_sort_direction=1
+.all_branches_collapsed=0
diff --git a/mac/.config/shell/profile b/mac/.config/shell/profile
index 546aafe..8e5e3ff 100644
--- a/mac/.config/shell/profile
+++ b/mac/.config/shell/profile
@@ -10,8 +10,11 @@ export LC_CTYPE=ko_KR.UTF-8
 export BROWSER=$(command -v librewolf || command -v firefox || command -v qutebrowser)
 export EDITOR="nvim"
 export EDITOR2="vim"
-# export FILE_MANAGER="lf $(lf -version)"
-export FILE_MANAGER="yazi $(yazi --version)"
+if command -v lf >/dev/null 2>&1; then
+  export FILE_MANAGER="lf $(lf -version)"
+elif command -v yazi >/dev/null 2>&1; then
+  export FILE_MANAGER="yazi $(yazi --version)"
+fi
 export KEYTIMEOUT=10
 export SUDO_EDITOR=$EDITOR
 # export SUDO_ASKPASS="$HOME/.local/bin/dmenupass"