Merge branch 'master' of frogit:geoffrey/dotfiles

config/htop/htoprc

@@ -1,26 +0,0 @@
-# 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 48 17 18 38 39 40 2 46 47 49 1 
-sort_key=47
-sort_direction=1
-hide_threads=0
-hide_kernel_threads=1
-hide_userland_threads=1
-shadow_other_users=0
-show_thread_names=0
-show_program_path=0
-highlight_base_name=1
-highlight_megabytes=0
-highlight_threads=1
-tree_view=0
-header_margin=0
-detailed_cpu_time=0
-cpu_count_from_zero=0
-update_process_names=0
-account_guest_in_cpu_meter=0
-color_scheme=0
-delay=15
-left_meters=AllCPUs Memory Swap 
-left_meter_modes=1 1 1 
-right_meters=Tasks LoadAverage Uptime 
-right_meter_modes=2 2 2