From a2a3dde5e71aefccd1f84d4746216ce6489a1113 Mon Sep 17 00:00:00 2001 From: Konstantin Bukley Date: Thu, 5 Oct 2023 16:51:17 +0300 Subject: [PATCH] dotfiles: update --- README.md | 12 ++++++++++ bash/.bash_profile | 2 ++ bash/.bashrc | 2 ++ git/.gitconfig | 1 + htop/.config/htop/htoprc | 49 ++++++++++++++++++++++++++++++++-------- tmux/.tmux.conf | 9 +++++--- 6 files changed, 62 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 9c35308..7d42a3b 100644 --- a/README.md +++ b/README.md @@ -1 +1,13 @@ # DOTFILES + +xcode-select --install +/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" +sudo softwareupdate --install-rosetta + +asdf plugin add ruby + +install tpm for tmux +sudo vim /etc/shells +/opt/homebrew/bin/bash + +$(brew --prefix)/opt/fzf/install - to have Ctlr + R diff --git a/bash/.bash_profile b/bash/.bash_profile index ec9ae94..8d2ca68 100644 --- a/bash/.bash_profile +++ b/bash/.bash_profile @@ -1 +1,3 @@ if [ -f ~/.bashrc ]; then . ~/.bashrc; fi + +[ -f /opt/homebrew/opt/asdf/libexec/asdf.sh ] && . /opt/homebrew/opt/asdf/libexec/asdf.sh diff --git a/bash/.bashrc b/bash/.bashrc index e7d3108..c39fd23 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -156,6 +156,8 @@ export PATH="/opt/homebrew/opt/arm-gcc-bin@8/bin:$PATH" export PATH="/usr/local/sbin:$PATH" export PATH="/usr/local/opt/avr-gcc@8/bin:$PATH" export PATH="/usr/local/opt/arm-gcc-bin@8/bin:$PATH" +export LDFLAGS="-L/opt/homebrew/opt/openssl@3/lib" +export CPPFLAGS="-I/opt/homebrew/opt/openssl@3/include" eval "$(zoxide init bash)" diff --git a/git/.gitconfig b/git/.gitconfig index 11f51d8..28a1b1d 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -143,6 +143,7 @@ [push] # https://git-scm.com/docs/git-config#git-config-pushdefault default = current + autoSetupRemote = true [branch] autosetuprebase = always diff --git a/htop/.config/htop/htoprc b/htop/.config/htop/htoprc index 2e7ee4b..a805c30 100644 --- a/htop/.config/htop/htoprc +++ b/htop/.config/htop/htoprc @@ -1,24 +1,53 @@ -fields=0 48 17 18 38 39 40 2 46 47 49 1 -sort_key=46 -sort_direction=1 -hide_threads=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. +htop_version=3.2.2 +config_reader_min_version=3 +fields=0 48 17 18 38 39 2 46 47 49 1 hide_kernel_threads=1 hide_userland_threads=1 +hide_running_in_container=0 shadow_other_users=0 show_thread_names=1 show_program_path=1 highlight_base_name=0 +highlight_deleted_exe=1 +shadow_distribution_path_prefix=0 highlight_megabytes=1 highlight_threads=1 -tree_view=1 +highlight_changes=0 +highlight_changes_delay_secs=5 +find_comm_in_cmdline=1 +strip_exe_from_cmdline=1 +show_merged_command=0 header_margin=1 +screen_tabs=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=1 account_guest_in_cpu_meter=1 color_scheme=0 +enable_mouse=1 delay=15 -left_meters=AllCPUs2 CPU Blank Memory Swap -left_meter_modes=1 1 2 1 1 -right_meters=Hostname Blank Tasks LoadAverage Blank Uptime -right_meter_modes=2 2 2 2 2 2 +hide_function_bar=0 +header_layout=two_50_50 +column_meters_0=AllCPUs2 CPU Blank Memory Swap +column_meter_modes_0=1 1 2 1 1 +column_meters_1=Hostname Blank Tasks LoadAverage Blank Uptime +column_meter_modes_1=2 2 2 2 2 2 +tree_view=1 +sort_key=46 +tree_sort_key=46 +sort_direction=1 +tree_sort_direction=-1 +tree_view_always_by_pid=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_CPU +.tree_sort_key=PERCENT_CPU +.tree_view=1 +.tree_view_always_by_pid=0 +.sort_direction=1 +.tree_sort_direction=-1 +.all_branches_collapsed=0 diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index 3f198f9..6361fec 100644 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -25,7 +25,7 @@ set -g renumber-windows on set -g focus-events off # https://gist.github.com/andersevenrud/015e61af2fd264371032763d4ed965b6 -set -g default-terminal "tmux-256color" +set -g default-terminal "screen-256color" set -ag terminal-overrides ",xterm-256color:RGB" # => Theme @@ -38,8 +38,9 @@ set -g message-style fg=colour166,bg=colour235 set -g window-status-format " ━━━━━━ " set -g window-status-current-format " ━━━━━━ " -set -g status-left '' -set -g status-right '' +set -g status-left "" +# set -g status-left "#{?#{pane_ssh_connected},#{hostname_short},}" +set -g status-right "#(/bin/bash $HOME/.tmux/kube-tmux/kube.tmux 250 red cyan)" set -g status-justify centre # Planck @@ -108,6 +109,8 @@ set -g @plugin 'tmux-plugins/tmux-pain-control' set -g @plugin 'christoomey/vim-tmux-navigator' +set -g @plugin 'soyuka/tmux-current-pane-hostname' + # If run as "tmux attach", create a session if one does not already exist new-session -A -s default