From 7c217d6678764aeb0ef1d50c4b0be9f0ea2b7ca4 Mon Sep 17 00:00:00 2001 From: Christian Baer Date: Thu, 4 Feb 2021 09:18:53 +0100 Subject: [PATCH 1/3] htop: Added htoprc with and without ZFS ARC --- .config/htop/htoprc | 20 ++++++++++++++------ .config/htop/htoprc.zfs | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 6 deletions(-) create mode 100644 .config/htop/htoprc.zfs diff --git a/.config/htop/htoprc b/.config/htop/htoprc index 1db2390..c941400 100644 --- a/.config/htop/htoprc +++ b/.config/htop/htoprc @@ -1,9 +1,10 @@ # Beware! This file is rewritten by htop when settings are changed in the interface. # The parser is also very primitive, and not human-friendly. -fields=100 0 47 38 39 2 46 47 1 +fields=0 47 38 39 2 46 47 1 sort_key=46 sort_direction=1 -hide_threads=0 +tree_sort_key=0 +tree_sort_direction=1 hide_kernel_threads=1 hide_userland_threads=0 shadow_other_users=0 @@ -12,10 +13,16 @@ show_program_path=1 highlight_base_name=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 header_margin=0 detailed_cpu_time=0 -cpu_count_from_zero=1 +cpu_count_from_one=0 show_cpu_usage=1 show_cpu_frequency=0 update_process_names=0 @@ -23,7 +30,8 @@ account_guest_in_cpu_meter=0 color_scheme=6 enable_mouse=1 delay=15 -left_meters=CPU Memory Swap ZFSARC -left_meter_modes=1 1 1 2 +left_meters=CPU Memory Swap +left_meter_modes=1 1 1 right_meters=Hostname Uptime Tasks LoadAverage -right_meter_modes=2 2 2 2 \ No newline at end of file +right_meter_modes=2 2 2 2 +hide_function_bar=0 diff --git a/.config/htop/htoprc.zfs b/.config/htop/htoprc.zfs new file mode 100644 index 0000000..c941400 --- /dev/null +++ b/.config/htop/htoprc.zfs @@ -0,0 +1,37 @@ +# Beware! This file is rewritten by htop when settings are changed in the interface. +# The parser is also very primitive, and not human-friendly. +fields=0 47 38 39 2 46 47 1 +sort_key=46 +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=1 +show_program_path=1 +highlight_base_name=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 +header_margin=0 +detailed_cpu_time=0 +cpu_count_from_one=0 +show_cpu_usage=1 +show_cpu_frequency=0 +update_process_names=0 +account_guest_in_cpu_meter=0 +color_scheme=6 +enable_mouse=1 +delay=15 +left_meters=CPU Memory Swap +left_meter_modes=1 1 1 +right_meters=Hostname Uptime Tasks LoadAverage +right_meter_modes=2 2 2 2 +hide_function_bar=0 From 364d3af0dfd2a06d653afeaeff2ced341d1b51a3 Mon Sep 17 00:00:00 2001 From: Christian Baer Date: Thu, 4 Feb 2021 09:23:50 +0100 Subject: [PATCH 2/3] Makefile: Added htop selector (with oder without ZFS) --- Makefile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index b1d0220..376deb9 100644 --- a/Makefile +++ b/Makefile @@ -16,11 +16,11 @@ all: git-fetch git-secrets-reveal deploy-macos ## Update repo, decrypt secrets a install: git-fetch deploy-base ## Update repor and run deploy-base -deploy-base: deploy-htop deploy-tmux deploy-vim deploy-zsh deploy-ssh deploy-hushlogin ## Only deploy basic conf files for shell usage +deploy-base: deploy-htop-zfs deploy-tmux deploy-vim deploy-zsh deploy-ssh deploy-hushlogin ## Only deploy basic conf files for shell usage deploy-workstation: deploy-base deploy-alacritty deploy-espanso deploy-vscodium deploy-youtubedl ## Deploy workstation specific config files (inherits deploy-shell) -deploy-macos: deploy-workstation deploy-bitbar deploy-duti deploy-skhd deploy-yabai deploy-brewfile ## Deploy macOS specific config files (inherits deploy-workstation) +deploy-macos: deploy-htop deploy-workstation deploy-bitbar deploy-duti deploy-skhd deploy-yabai deploy-brewfile ## Deploy macOS specific config files (inherits deploy-workstation) gen-vscodium-plugin-list: ## Update the list of VSCodium plugins @echo "\033[1;32m>>>\033[1;0m Updating the list of VSCodium plugins at .config/VSCodium/UserUser/extensions.list" @@ -92,7 +92,12 @@ deploy-espanso: ## Deploy espanso config deploy-htop: ## Deploy htop config @echo "\033[1;32m>>>\033[1;0m Deploy htop config to ${HOMEDIR}/.config/htop" @mkdir -p ${HOMEDIR}/.config/htop - @cp .config/htop/htoprc ${HOMEDIR}/.config/htop + @cp .config/htop/htoprc ${HOMEDIR}/.config/htop/htoprc + +deploy-htop-zfs: ## Deploy htop config with zfs + @echo "\033[1;32m>>>\033[1;0m Deploy htop config to ${HOMEDIR}/.config/htop" + @mkdir -p ${HOMEDIR}/.config/htop + @cp .config/htop/htoprc.zfs ${HOMEDIR}/.config/htop/htoprc deploy-skhd: ## Deploy skhd config @echo "\033[1;32m>>>\033[1;0m Deploy skhd config to ${HOMEDIR}/.config/skhd" From c190f0311de84c21009fb41d95ec5c07f4befbf2 Mon Sep 17 00:00:00 2001 From: Christian Baer Date: Thu, 4 Feb 2021 09:24:10 +0100 Subject: [PATCH 3/3] README: Updated help screen --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 8f63f69..cb87f8e 100644 --- a/README.md +++ b/README.md @@ -37,6 +37,7 @@ deploy-bitbar Deploy BitBar config deploy-duti Deploy duti config deploy-espanso Deploy espanso config deploy-htop Deploy htop config +deploy-htop-zfs Deploy htop config with zfs deploy-skhd Deploy skhd config deploy-tmux Deploy tmux config deploy-vim Deploy vim config