Merge branch 'htop-os' into main

This commit is contained in:
Christian Baer 2021-02-04 09:24:30 +01:00
commit c77b13cf90
4 changed files with 60 additions and 9 deletions

View File

@ -1,9 +1,10 @@
# Beware! This file is rewritten by htop when settings are changed in the interface. # Beware! This file is rewritten by htop when settings are changed in the interface.
# The parser is also very primitive, and not human-friendly. # 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_key=46
sort_direction=1 sort_direction=1
hide_threads=0 tree_sort_key=0
tree_sort_direction=1
hide_kernel_threads=1 hide_kernel_threads=1
hide_userland_threads=0 hide_userland_threads=0
shadow_other_users=0 shadow_other_users=0
@ -12,10 +13,16 @@ show_program_path=1
highlight_base_name=1 highlight_base_name=1
highlight_megabytes=1 highlight_megabytes=1
highlight_threads=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=0
tree_view_always_by_pid=0
header_margin=0 header_margin=0
detailed_cpu_time=0 detailed_cpu_time=0
cpu_count_from_zero=1 cpu_count_from_one=0
show_cpu_usage=1 show_cpu_usage=1
show_cpu_frequency=0 show_cpu_frequency=0
update_process_names=0 update_process_names=0
@ -23,7 +30,8 @@ account_guest_in_cpu_meter=0
color_scheme=6 color_scheme=6
enable_mouse=1 enable_mouse=1
delay=15 delay=15
left_meters=CPU Memory Swap ZFSARC left_meters=CPU Memory Swap
left_meter_modes=1 1 1 2 left_meter_modes=1 1 1
right_meters=Hostname Uptime Tasks LoadAverage right_meters=Hostname Uptime Tasks LoadAverage
right_meter_modes=2 2 2 2 right_meter_modes=2 2 2 2
hide_function_bar=0

37
.config/htop/htoprc.zfs Normal file
View File

@ -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

View File

@ -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 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-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 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" @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 deploy-htop: ## Deploy htop config
@echo "\033[1;32m>>>\033[1;0m Deploy htop config to ${HOMEDIR}/.config/htop" @echo "\033[1;32m>>>\033[1;0m Deploy htop config to ${HOMEDIR}/.config/htop"
@mkdir -p ${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 deploy-skhd: ## Deploy skhd config
@echo "\033[1;32m>>>\033[1;0m Deploy skhd config to ${HOMEDIR}/.config/skhd" @echo "\033[1;32m>>>\033[1;0m Deploy skhd config to ${HOMEDIR}/.config/skhd"

View File

@ -37,6 +37,7 @@ deploy-bitbar Deploy BitBar config
deploy-duti Deploy duti config deploy-duti Deploy duti config
deploy-espanso Deploy espanso config deploy-espanso Deploy espanso config
deploy-htop Deploy htop config deploy-htop Deploy htop config
deploy-htop-zfs Deploy htop config with zfs
deploy-skhd Deploy skhd config deploy-skhd Deploy skhd config
deploy-tmux Deploy tmux config deploy-tmux Deploy tmux config
deploy-vim Deploy vim config deploy-vim Deploy vim config