From 271e12477cee087bf752c2a7634a6c84ed530f76 Mon Sep 17 00:00:00 2001 From: Andrei Jiroh Halili Date: Tue, 13 Aug 2024 09:29:16 +0800 Subject: [PATCH] chore(global): sync termux branch with main branch Signed-off-by: Andrei Jiroh Halili --- .bash_login | 5 +- .bashrc | 9 +-- .config/htop/htoprc | 46 ++++++++---- .gitconfig | 6 +- .nanorc | 7 +- .nvm | 2 +- .profile | 5 +- .termux/termux.properties | 147 ++++++++++++++++++++++++++++++++++++++ 8 files changed, 202 insertions(+), 25 deletions(-) create mode 100644 .termux/termux.properties diff --git a/.bash_login b/.bash_login index 9d029c1..050129e 100644 --- a/.bash_login +++ b/.bash_login @@ -20,5 +20,6 @@ if [ -f "$HOME/.config/localconfig.env" ]; then . "$HOME/.config/localconfig.env" fi -# # shellcheck source=./.bashrc -source ./.bashrc +if [[ $FF_BYOBU_ON_LOGIN == "true" ]]; then + _byobu_sourced=1 . /data/data/com.termux/files/usr/bin/byobu-launch 2>/dev/null || true +fi diff --git a/.bashrc b/.bashrc index ce721b7..59a07d9 100644 --- a/.bashrc +++ b/.bashrc @@ -9,11 +9,12 @@ ## Stage 0: Init keychain + GPG_TTY for pinentry hellscapes in TUI. ## ## This stage also initalizes oh-my-posh or custom ## PSI here. ## -if [[ $TERMUX ]]; then - export SSH_AGENT_=todo -elif command -v keychain >> /dev/null; then +export KEYCHAIN_PATH=$(command -v keychain) + +if [[ $TERMUX_APP__PACKAGE_NAME ]]; then + eval $(keychain --agents ssh --eval) +else # shellcheck disable=SC2155 - export KEYCHAIN_PATH=$(command -v keychain) eval $(keychain --agents gpg,ssh --eval) fi # shellcheck disable=SC2155 diff --git a/.config/htop/htoprc b/.config/htop/htoprc index a6889eb..cadcb80 100644 --- a/.config/htop/htoprc +++ b/.config/htop/htoprc @@ -1,16 +1,17 @@ # 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.3.0 +config_reader_min_version=3 fields=0 48 17 18 38 39 40 2 46 47 49 1 -sort_key=46 -sort_direction=-1 -tree_sort_key=47 -tree_sort_direction=-1 hide_kernel_threads=1 hide_userland_threads=0 +hide_running_in_container=0 shadow_other_users=1 show_thread_names=1 show_program_path=1 highlight_base_name=1 +highlight_deleted_exe=1 +shadow_distribution_path_prefix=0 highlight_megabytes=1 highlight_threads=1 highlight_changes=0 @@ -18,22 +19,43 @@ highlight_changes_delay_secs=5 find_comm_in_cmdline=1 strip_exe_from_cmdline=1 show_merged_command=1 -tree_view=0 -tree_view_always_by_pid=0 header_margin=1 +screen_tabs=0 detailed_cpu_time=1 cpu_count_from_one=1 show_cpu_usage=1 show_cpu_frequency=1 -show_cpu_temperature=1 -degree_fahrenheit=0 update_process_names=1 account_guest_in_cpu_meter=1 color_scheme=0 enable_mouse=1 delay=5 -left_meters=AllCPUs Memory Swap DiskIO NetworkIO -left_meter_modes=1 1 1 1 1 -right_meters=Hostname Tasks LoadAverage Uptime DateTime -right_meter_modes=2 2 2 2 2 hide_function_bar=0 +header_layout=two_50_50 +column_meters_0=AllCPUs Memory Swap DiskIO NetworkIO +column_meter_modes_0=1 1 1 1 1 +column_meters_1=Hostname Tasks LoadAverage Uptime DateTime +column_meter_modes_1=2 2 2 2 2 +tree_view=1 +sort_key=46 +tree_sort_key=47 +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 M_SHARE STATE PERCENT_CPU PERCENT_MEM TIME Command +.sort_key=PERCENT_CPU +.tree_sort_key=PERCENT_MEM +.tree_view_always_by_pid=0 +.tree_view=1 +.sort_direction=-1 +.tree_sort_direction=-1 +.all_branches_collapsed=0 +screen:I/O=PID USER IO_PRIORITY IO_RATE IO_READ_RATE IO_WRITE_RATE Command +.sort_key=IO_RATE +.tree_sort_key=PID +.tree_view_always_by_pid=0 +.tree_view=0 +.sort_direction=-1 +.tree_sort_direction=1 +.all_branches_collapsed=0 diff --git a/.gitconfig b/.gitconfig index 7a6facf..b284019 100644 --- a/.gitconfig +++ b/.gitconfig @@ -82,8 +82,8 @@ # path = ~/.config/git/ajhalili2006-experiments.include.gitconfig #[includeIf "gitdir/i:~/projects/labs.andreijiroh.dev"] # path = ~/.config/git/ajhalili2006-experiments.include.gitconfig -[includeIf "gitdir/i:~/git-projects/recaptime.dev/"] - path = ~/.config/git/recaptime-dev.include.gitconfig +#[includeIf "gitdir/i:~/git-projects/recaptime.dev/"] +# path = ~/.config/git/recaptime-dev.include.gitconfig [includeIf "gitdir/i:~/projects/recaptime.dev/"] path = ~/.config/git/recaptime-dev.include.gitconfig [includeIf "gitdir/i:/workspaces/recaptime.dev/"] @@ -107,3 +107,5 @@ command = echo \"$(git config user.name) <$(git config user.email)>\" [push] autoSetupRemote = true +[safe] + directory = /storage/emulated/0/Documents/git/recaptime-dev/proxyparty diff --git a/.nanorc b/.nanorc index 3c280a4..732babf 100644 --- a/.nanorc +++ b/.nanorc @@ -4,7 +4,7 @@ # SPDX-License-Identifier: MIT AND MPL-2.0 (excluding third party code) # Display line numbers to the left (and any anchors in the margin). -set linenumbers +#set linenumbers # Enable vim-style lock-files. This is just to let a vim user know you # are editing a file [s]he is trying to edit and vice versa. There are @@ -44,7 +44,10 @@ set trimblanks # import included syntax highlighting for nano # TODO: Load them via ~/.local/share/nano for portability -include "/usr/share/nano/*.nanorc" +#include "/usr/share/nano/*.nanorc" +# actually commented out since it is included by default on +# the bootstrap process +#include "/usr/share/nano/*.nanorc" # Make regularly-used features have more usual shortcuts bind M-Z suspend main diff --git a/.nvm b/.nvm index 4beab63..762f9ef 160000 --- a/.nvm +++ b/.nvm @@ -1 +1 @@ -Subproject commit 4beab63631764fc381a0e56273faf8d43b8f9509 +Subproject commit 762f9ef9d17623b45095e8ca1a996c8928f3f424 diff --git a/.profile b/.profile index 09c6c6e..19dc128 100644 --- a/.profile +++ b/.profile @@ -19,7 +19,7 @@ if [ -d "$HOME/.local/bin" ] ; then PATH="$HOME/.local/bin:$PATH" fi -export PATH="/usr/local/bin:$HOME/.local/bin:$HOME/bin${PATH:+:}$PATH:$HOME/.local/share/JetBrains/Toolbox/scripts" # ~vern specifics and more +#export PATH="/usr/local/bin:$HOME/.local/bin:$HOME/bin${PATH:+:}$PATH:$HOME/.local/share/JetBrains/Toolbox/scripts" # ~vern specifics and more mesg n 2> /dev/null || true # then import the rest @@ -59,5 +59,6 @@ then fi ########################################################################################## -if [[ $FF_BYOBU_ON_LOGIN != "" ]]; then +if [[ $FF_BYOBU_ON_LOGIN == "true" ]]; then + _byobu_sourced=1 . /data/data/com.termux/files/usr/bin/byobu-launch 2>/dev/null || true fi diff --git a/.termux/termux.properties b/.termux/termux.properties new file mode 100644 index 0000000..7bba4a4 --- /dev/null +++ b/.termux/termux.properties @@ -0,0 +1,147 @@ +### After making changes and saving you need to run `termux-reload-settings` +### to update the terminal. All information here can also be found on the +### wiki: https://wiki.termux.com/wiki/Terminal_Settings + +############### +# General +############### + +### Allow external applications to execute arbitrary commands within Termux. +### This potentially could be a security issue, so option is disabled by +### default. Uncomment to enable. +# allow-external-apps = true + +### Default working directory that will be used when launching the app. +# default-working-directory = /data/data/com.termux/files/home + +### Uncomment to disable toasts shown on terminal session change. +disable-terminal-session-change-toast = true + +### Uncomment to not show soft keyboard on application start. +hide-soft-keyboard-on-startup = true + +### Uncomment to let keyboard toggle button to enable or disable software +### keyboard instead of showing/hiding it. +# soft-keyboard-toggle-behaviour = enable/disable + +### Adjust terminal scrollback buffer. Max is 50000. May have negative +### impact on performance. +terminal-transcript-rows = 5000 + +### Uncomment to use volume keys for adjusting volume and not for the +### extra keys functionality. +# volume-keys = volume + +############### +# Fullscreen mode +############### + +### Uncomment to let Termux start in full screen mode. +fullscreen = true + +### Uncomment to attempt workaround layout issues when running in +### full screen mode. +#use-fullscreen-workaround = true + +############### +# Cursor +############### + +### Cursor blink rate. Values 0, 100 - 2000. +# terminal-cursor-blink-rate = 0 + +### Cursor style: block, bar, underline. +# terminal-cursor-style = block + +############### +# Extra keys +############### + +### Settings for choosing which set of symbols to use for illustrating keys. +### Choose between default, arrows-only, arrows-all, all and none +extra-keys-style = arrows-all + +### Force capitalize all text in extra keys row button labels. +# extra-keys-text-all-caps = true + +### Default extra-key configuration +# extra-keys = [[ESC, TAB, CTRL, ALT, {key: '-', popup: '|'}, DOWN, UP]] + +### Two rows with more keys +extra-keys = [ \ + ['ESC', {key: '-', popout: '|'},'/','HOME','UP','END','PGUP','DEL'], \ + ['TAB','CTRL','ALT','LEFT','DOWN','RIGHT','PGDN','BKSP'] \ +] + +### Configuration with additional popup keys (swipe up from an extra key) +# extra-keys = [[ \ +# {key: ESC, popup: {macro: "CTRL f d", display: "tmux exit"}}, \ +# {key: CTRL, popup: {macro: "CTRL f BKSP", display: "tmux ←"}}, \ +# {key: ALT, popup: {macro: "CTRL f TAB", display: "tmux →"}}, \ +# {key: TAB, popup: {macro: "ALT a", display: A-a}}, \ +# {key: LEFT, popup: HOME}, \ +# {key: DOWN, popup: PGDN}, \ +# {key: UP, popup: PGUP}, \ +# {key: RIGHT, popup: END}, \ +# {macro: "ALT j", display: A-j, popup: {macro: "ALT g", display: A-g}}, \ +# {key: KEYBOARD, popup: {macro: "CTRL d", display: exit}} \ +# ]] + +############### +# Colors/themes +############### + +### Force black colors for drawer and dialogs +# use-black-ui = true + +############### +# HW keyboard shortcuts +############### + +### Disable hardware keyboard shortcuts. +# disable-hardware-keyboard-shortcuts = true + +### Open a new terminal with ctrl + t (volume down + t) +# shortcut.create-session = ctrl + t + +### Go one session down with (for example) ctrl + 2 +# shortcut.next-session = ctrl + 2 + +### Go one session up with (for example) ctrl + 1 +# shortcut.previous-session = ctrl + 1 + +### Rename a session with (for example) ctrl + n +# shortcut.rename-session = ctrl + n + +############### +# Bell key +############### + +### Vibrate device (default). +# bell-character = vibrate + +### Beep with a sound. +# bell-character = beep + +### Ignore bell character. +# bell-character = ignore + +############### +# Back key +############### + +### Send the Escape key. +# back-key=escape + +### Hide keyboard or leave app (default). +# back-key=back + +############### +# Keyboard issue workarounds +############### + +### Letters might not appear until enter is pressed on Samsung devices +# enforce-char-based-input = true + +### ctrl+space (for marking text in emacs) does not work on some devices +# ctrl-space-workaround = true