diff --git a/.bash_profile b/.bash_profile index 81b306d..fdfd213 100644 --- a/.bash_profile +++ b/.bash_profile @@ -50,7 +50,7 @@ export GOPATH="$HOME/.local/go" # Set the paths used by R {{{ export R_LIBS_USER="$HOME/.local/R" export R_PROFILE="$XDG_CONFIG_HOME/Rprofile" -export R_HISTFILE="$XDG_STATE_HOME/.R_history" +export R_HISTFILE="$XDG_STATE_HOME/R/history" # }}} # Set the paths used by perl5 {{{ @@ -65,16 +65,13 @@ export RUSTUP_HOME="$XDG_DATA_HOME/rustup" # }}} # Set the paths used by node {{{ -export NODE_REPL_HISTORY="$XDG_STATE_HOME/.node_repl_history" +export NODE_REPL_HISTORY="$XDG_STATE_HOME/node/history" export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME/npm/npmrc" # }}} # Set the paths used by android {{{ export ANDROID_HOME="$HOME/.local/android" -export ANDROID_SDK_HOME="$ANDROID_HOME" -export ANDROID_SDK_ROOT="$ANDROID_HOME" -export ANDROID_AVD_HOME="$ANDROID_HOME/avd" -export ANDROID_EMULATOR_HOME="$ANDROID_HOME" +export ANDROID_USER_HOME="$ANDROID_HOME" # }}} # Set the paths used by kotlin {{{ diff --git a/.config/X11 b/.config/X11 index 2f6e059..e5da73f 160000 --- a/.config/X11 +++ b/.config/X11 @@ -1 +1 @@ -Subproject commit 2f6e05924ce14b47299d4012c481f02f7a1d5e85 +Subproject commit e5da73fea8e9e7e82d3520834893cf30698b3bf4 diff --git a/.config/fontconfig/fonts.conf b/.config/fontconfig/fonts.conf index 97ef53e..1e9c2a8 100644 --- a/.config/fontconfig/fonts.conf +++ b/.config/fontconfig/fonts.conf @@ -106,6 +106,7 @@ system-ui Noto Sans + Noto Sans CJK JP Noto Color Emoji Libertinus Math diff --git a/.config/git/config b/.config/git/config index a2d6d10..c780958 100644 --- a/.config/git/config +++ b/.config/git/config @@ -29,6 +29,9 @@ gpgSign = true status = true +[push] + autoSetupRemote = true + [status] submoduleSummary = 1 diff --git a/.config/htop/htoprc b/.config/htop/htoprc index 499d40b..271b893 100644 --- a/.config/htop/htoprc +++ b/.config/htop/htoprc @@ -1,16 +1,15 @@ # 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.1 +config_reader_min_version=3 fields=0 48 17 18 38 39 40 2 46 47 49 1 -sort_key=48 -sort_direction=1 -tree_sort_key=0 -tree_sort_direction=1 -hide_kernel_threads=1 +hide_kernel_threads=0 hide_userland_threads=0 shadow_other_users=0 show_thread_names=0 show_program_path=1 highlight_base_name=1 +highlight_deleted_exe=1 highlight_megabytes=0 highlight_threads=1 highlight_changes=0 @@ -18,9 +17,8 @@ highlight_changes_delay_secs=5 find_comm_in_cmdline=1 strip_exe_from_cmdline=1 show_merged_command=1 -tree_view=1 -tree_view_always_by_pid=0 header_margin=1 +screen_tabs=0 detailed_cpu_time=0 cpu_count_from_one=1 show_cpu_usage=1 @@ -32,10 +30,34 @@ account_guest_in_cpu_meter=0 color_scheme=5 enable_mouse=1 delay=15 -left_meters=AllCPUs Memory Swap -left_meter_modes=2 2 2 -right_meters=CPU LoadAverage Tasks Uptime Clock -right_meter_modes=2 2 2 2 2 hide_function_bar=0 +header_layout=two_50_50 +column_meters_0=AllCPUs Memory Swap +column_meter_modes_0=2 2 2 +column_meters_1=CPU LoadAverage Tasks Uptime Clock +column_meter_modes_1=2 2 2 2 2 +tree_view=1 +sort_key=48 +tree_sort_key=0 +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=USER +.tree_sort_key=PID +.tree_view=1 +.tree_view_always_by_pid=0 +.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 PERCENT_SWAP_DELAY PERCENT_IO_DELAY Command +.sort_key=IO_RATE +.tree_sort_key=PID +.tree_view=0 +.tree_view_always_by_pid=0 +.sort_direction=-1 +.tree_sort_direction=1 +.all_branches_collapsed=0 # vim:ft=cfg: diff --git a/.config/mpv/input.conf b/.config/mpv/input.conf index 8b906be..71ffddf 100644 --- a/.config/mpv/input.conf +++ b/.config/mpv/input.conf @@ -64,6 +64,11 @@ E add brightness +1 e add brightness -1 # }}} +# contrast {{{ +Y add contrast +1 +y add contrast -1 +# }}} + # chapter {{{ . add chapter +1 , add chapter -1 diff --git a/.config/nvim b/.config/nvim index f24743d..1362ec7 160000 --- a/.config/nvim +++ b/.config/nvim @@ -1 +1 @@ -Subproject commit f24743d138ce7dedd09f728a48466830b09d5331 +Subproject commit 1362ec74a7ef781be045703cc9111a6944eb5633 diff --git a/.config/pip/pip.conf b/.config/pip/pip.conf index 541b6ed..44afb7b 100644 --- a/.config/pip/pip.conf +++ b/.config/pip/pip.conf @@ -7,7 +7,7 @@ disable-pip-version-check = true # Include pre-release and development versions. pre = true # Specify type of progress to be displayed. -progress-bar = pretty +progress-bar = on [freeze] # Exclude editable package from output. @@ -22,12 +22,12 @@ compile = true # Include pre-release and development versions. pre = true # Specify type of progress to be displayed. -progress-bar = pretty +progress-bar = on [wheel] # Include pre-release and development versions. pre = true # Specify type of progress to be displayed. -progress-bar = pretty +progress-bar = on # vim:ft=dosini: diff --git a/.config/pythonrc.py b/.config/pythonrc.py index 69d4857..052aa86 100644 --- a/.config/pythonrc.py +++ b/.config/pythonrc.py @@ -3,8 +3,8 @@ import os import readline histfile = os.path.join(os.getenv( - 'XDG_CACHE_HOME', os.path.expanduser('~/.cache') -), '.python_history') + 'XDG_STATE_HOME', os.path.expanduser('~/.cache') +), 'python', 'history') try: readline.read_history_file(histfile) diff --git a/.config/qutebrowser/config.py b/.config/qutebrowser/config.py index 49141f5..843653d 100644 --- a/.config/qutebrowser/config.py +++ b/.config/qutebrowser/config.py @@ -32,9 +32,9 @@ c.content.headers.accept_language = 'en-GB,en,el;q=0.9' c.content.headers.user_agent = ' '.join(( 'Mozilla/5.0', '(X11; Linux x86_64)', - 'QtWebEngine/5.15.9', + 'QtWebEngine/5.15.10', 'Chromium/87.0.4280.144', - 'qutebrowser/2.5.1' + 'qutebrowser/2.5.2' )) # Allow JavaScript to read from or write to the clipboard. diff --git a/.config/yt-dlp/config b/.config/yt-dlp/config index a8466cb..349be44 100644 --- a/.config/yt-dlp/config +++ b/.config/yt-dlp/config @@ -23,7 +23,7 @@ --output "%(title)s.%(ext)s" # Specify a custom user agent. ---user-agent "Mozilla/5.0 (Linux x86_64) yt-dlp/2022.05.18" +--user-agent "Mozilla/5.0 (Linux x86_64) yt-dlp/2022.08.19" # SponsorBlock categories to create chapters for. --sponsorblock-mark "all" diff --git a/.local/share/bash/bashrc.sh b/.local/share/bash/bashrc.sh index 6c1380f..4c134b3 100644 --- a/.local/share/bash/bashrc.sh +++ b/.local/share/bash/bashrc.sh @@ -14,7 +14,7 @@ HISTIGNORE='[ ]*:ls:ll:exit:logout:history:clear:bg:fg' HISTCONTROL='erasedups' # Move the history file away from $HOME -HISTFILE="$XDG_STATE_HOME/.bash_history" +HISTFILE="$XDG_STATE_HOME/bash/history" # Print time of command in history HISTTIMEFORMAT='{%Y-%m-%d %T} '