From 08ac710c293e3eb718af49004ede87ff24184a43 Mon Sep 17 00:00:00 2001 From: ObserverOfTime Date: Wed, 15 Jul 2020 18:51:59 +0300 Subject: [PATCH] Update dotfiles --- .bash_profile | 21 +++- .clang-format | 32 +++--- .clang-tidy | 2 - .config/X11/XCompose | 158 ++++++++++++++------------- .config/fontconfig/fonts.conf | 158 +++++++++++++-------------- .config/git/config | 24 ++-- .config/mpv/input.conf | 10 +- .config/pycodestyle | 3 +- .config/qutebrowser/config.py | 6 +- .config/vifm/vifmrc | 27 +++++ .config/youtube-dl/config | 2 +- .local/arch/init.sh | 33 ++++-- .local/arch/packages.aur.txt | 1 - .local/arch/packages.repo.txt | 7 +- .local/share/bash/aliases.sh | 15 +-- .local/share/bash/bashrc.sh | 6 - .local/share/bash/functions.sh | 15 ++- .local/share/konsole/Default.profile | 4 +- .yarnrc | 2 +- 19 files changed, 288 insertions(+), 238 deletions(-) diff --git a/.bash_profile b/.bash_profile index e889534..ba96343 100644 --- a/.bash_profile +++ b/.bash_profile @@ -14,8 +14,12 @@ test -f ~/.local/tokens/github && export GITHUB_TOKEN="$(<"$_")" test -f ~/.local/tokens/gitlab && export GITLAB_TOKEN="$(<"$_")" # }}} -# Set the default command used by fzf -export FZF_DEFAULT_COMMAND='rg --files --hidden --follow --no-ignore' +# Set the default command & options used by fzf {{{ +export FZF_DEFAULT_COMMAND='fd -LIH -tf --color=always' +export FZF_CTRL_T_COMMAND='fd -LIH -tf' +export FZF_ALT_C_COMMAND='fd -LIH -td' +export FZF_DEFAULT_OPTS='--ansi' +# }}} # Set the default pager export PAGER='nvimpager -p' @@ -78,7 +82,11 @@ export ANDROID_HOME="$HOME/.local/android" export ANDROID_SDK_HOME="$ANDROID_HOME/sdk" export ANDROID_SDK_ROOT="$ANDROID_SDK_HOME" export ANDROID_EMULATOR_HOME="$ANDROID_SDK_HOME" +# }}} + +# Set the paths used by kotlin {{{ export GRADLE_USER_HOME="$XDG_DATA_HOME/gradle" +export KONAN_DATA_DIR="$XDG_DATA_HOME/konan" # }}} # Set the paths used by sqlite {{{ @@ -143,6 +151,9 @@ for t in {konsole,xterm,gnome}-256color; do done # }}} +# Source fzf keybinds +test -f /usr/share/fzf/key-bindings.bash && . "$_" + # Specify inputrc test -f "$XDG_CONFIG_HOME/inputrc" && export INPUTRC="$_" @@ -152,4 +163,10 @@ test -f "$XDG_CONFIG_HOME/X11/xinitrc" && export XINITRC="$_" # Source bashrc test -f "$XDG_DATA_HOME/bash/bashrc.sh" && . "$_" +# Source aliases +test -f "$XDG_DATA_HOME/bash/aliases.sh" && . "$_" + +# Source functions +test -f "$XDG_DATA_HOME/bash/functions.sh" && . "$_" + # vim:fdm=marker:fdl=1: diff --git a/.clang-format b/.clang-format index 87a42ef..6d40980 100644 --- a/.clang-format +++ b/.clang-format @@ -1,12 +1,12 @@ --- -AccessModifierOffset: 0 -AlignAfterOpenBracket: Align +AlignAfterOpenBracket: "Align" AlignConsecutiveAssignments: false AlignEscapedNewlines: "DontAlign" AlignTrailingComments: false -AllowAllParametersOfDeclarationOnNextLine: true -AllowShortFunctionsOnASingleLine: true -AllowShortIfStatementsOnASingleLine: true +AllowAllArgumentsOnNextLine: true +AllowShortCaseLabelsOnASingleLine: true +AllowShortFunctionsOnASingleLine: "Inline" +AllowShortIfStatementsOnASingleLine: "WithoutElse" AllowShortLoopsOnASingleLine: true AlwaysBreakAfterReturnType: "None" AlwaysBreakBeforeMultilineStrings: false @@ -14,11 +14,12 @@ BinPackArguments: true BinPackParameters: true BreakBeforeBinaryOperators: "None" BreakBeforeBraces: "Attach" -BreakBeforeTernaryOperators: false +BreakBeforeTernaryOperators: true BreakStringLiterals: true ColumnLimit: 80 CommentPragmas: "https?://" DerivePointerAlignment: false +FixNamespaceComments: true IncludeBlocks: "Regroup" IncludeCategories: - Regex: "^<.*" @@ -36,8 +37,9 @@ ReflowComments: true SortIncludes: true SortUsingDeclarations: true SpaceAfterCStyleCast: true +SpaceAfterTemplateKeyword: true SpaceBeforeAssignmentOperators: true -SpaceBeforeParens: "Never" +SpaceBeforeParens: "ControlStatements" SpaceInEmptyParentheses: false SpacesBeforeTrailingComments: 2 SpacesInCStyleCastParentheses: false @@ -49,28 +51,22 @@ UseTab: "Never" --- Language: "Cpp" +AccessModifierOffset: -4 +AllowShortLambdasOnASingleLine: "All" AlwaysBreakTemplateDeclarations: "No" BreakConstructorInitializers: "AfterColon" BreakInheritanceList: "AfterColon" CompactNamespaces: false ConstructorInitializerAllOnOneLineOrOnePerLine: false FixNamespaceComments: true -IncludeCategories: - - Regex: "^<.*[.]h" - Priority: 1 - - Regex: "^<.*" - Priority: 2 - - Regex: "^\".*[.]h" - Priority: 3 - - Regex: "^\".*" - Priority: 4 NamespaceIndentation: "All" +SortUsingDeclarations: true SpaceAfterTemplateKeyword: false -SpaceBeforeCpp11BracedList: false +SpaceBeforeCpp11BracedList: true SpaceBeforeCtorInitializerColon: false SpaceBeforeInheritanceColon: true SpaceBeforeRangeBasedForLoopColon: true SpacesInAngles: false -Standard: "Cpp11" +Standard: "c++17" # vim:ft=yaml: diff --git a/.clang-tidy b/.clang-tidy index a7454ea..134f400 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -88,7 +88,6 @@ Checks: > cppcoreguidelines-pro-type-member-init, cppcoreguidelines-pro-type-static-cast-downcast, cppcoreguidelines-slicing, - cppcoreguidelines-special-member-functions, fuchsia-multiple-inheritance, fuchsia-trailing-return, fuchsia-virtual-inheritance, @@ -188,7 +187,6 @@ WarningsAsErrors: > readability-misplaced-array-index, readability-redundant-declaration, readability-redundant-function-ptr-dereference -HeaderFilterRegex: .* FormatStyle: file CheckOptions: - key: bugprone-argument-comment.StrictMode diff --git a/.config/X11/XCompose b/.config/X11/XCompose index 7724767..2a6342d 100644 --- a/.config/X11/XCompose +++ b/.config/X11/XCompose @@ -242,60 +242,62 @@ # }}} # Other symbols {{{ - : "°" U00B0 # DEGREE SIGN - <0> : "°" U00B0 # DEGREE SIGN - <0> : "°" U00B0 # DEGREE SIGN - : "¦" U00A6 # BROKEN BAR - : "¦" U00A6 # BROKEN BAR - : "†" U2020 # DAGGER - : "‡" U2021 # DOUBLE DAGGER - : "‖" U2016 # DOUBLE VERTICAL LINE -

: "¶" U00B6 # PILCROW SIGN -

: "¶" U00B6 # PILCROW SIGN - : "¡" U00A1 # INVERTED EXCLAMATION MARK - : "¿" U00BF # INVERTED QUESTION MARK - : "‽" U203D # INTERROBANG - : "⸘" U2E18 # INVERTED INTERROBANG - <2> : "⁇" U2047 # DOUBLE QUESTION MARK - : "⁈" U2048 # QUESTION EXCLAMATION MARK - : "⁉" U2049 # EXCLAMATION QUESTION MARK - <2> : "‼" U203C # DOUBLE EXCLAMATION MARK - : "∷" U2237 # PROPORTION - : "、" U3001 # IDEOGRAPHIC COMMA - : "。" U3002 # IDEOGRAPHIC FULL STOP - : "：" UFF1A # FULLWIDTH COLON - : "？" UFF1F # FULLWIDTH QUESTION MARK - : "！" UFF01 # FULLWIDTH EXCLAMATION MARK - : "§" U00A7 # SECTION SIGN - : "§" U00A7 # SECTION SIGN - : "§" U00A7 # SECTION SIGN - : "§" U00A7 # SECTION SIGN - : "§" U00A7 # SECTION SIGN - : "§" U00A7 # SECTION SIGN - : "№" U2116 # NUMERO SIGN - : "№" U2116 # NUMERO SIGN - : "☚" U261A # BLACK LEFT POINTING INDEX - : "☛" U261B # BLACK RIGHT POINTING INDEX - : "☜" U261C # WHITE LEFT POINTING INDEX - : "☝" U261D # WHITE UP POINTING INDEX - : "☞" U261E # WHITE RIGHT POINTING INDEX - : "☟" U261F # WHITE DOWN POINTING INDEX - : "★" U2605 # BLACK STAR - <0> : "☆" U2606 # WHITE STAR - : "❄" U2744 # SNOWFLAKE -

: "☭" U262D # HAMMER AND SICKLE - : "☭" U262D # HAMMER AND SICKLE - : "☭" U262D # HAMMER AND SICKLE - : "✓" U2713 # CHECK MARK - : "✔" U2714 # HEAVY CHECK MARK - : "✗" U2717 # BALLOT X - : "✘" U2718 # HEAVY BALLOT X - : "♀" U2640 # FEMALE SIGN - : "♂" U2642 # MALE SIGN - : "⚥" U26A5 # MALE AND FEMALE SIGN - : "⚠" U26A0 # WARNING SIGN - : "☮" U262E # PEACE SYMBOL - : "☯" U262F # YIN YANG + : "°" U00B0 # DEGREE SIGN + <0> : "°" U00B0 # DEGREE SIGN + <0> : "°" U00B0 # DEGREE SIGN + : "¦" U00A6 # BROKEN BAR + : "¦" U00A6 # BROKEN BAR + : "†" U2020 # DAGGER + : "‡" U2021 # DOUBLE DAGGER + : "‖" U2016 # DOUBLE VERTICAL LINE +

: "¶" U00B6 # PILCROW SIGN +

: "¶" U00B6 # PILCROW SIGN + : "¡" U00A1 # INVERTED EXCLAMATION MARK + : "¿" U00BF # INVERTED QUESTION MARK + : "‽" U203D # INTERROBANG + : "⸘" U2E18 # INVERTED INTERROBANG + <2> : "⁇" U2047 # DOUBLE QUESTION MARK + : "⁈" U2048 # QUESTION EXCLAMATION MARK + : "⁉" U2049 # EXCLAMATION QUESTION MARK + <2> : "‼" U203C # DOUBLE EXCLAMATION MARK + : "∷" U2237 # PROPORTION + : "、" U3001 # IDEOGRAPHIC COMMA + : "。" U3002 # IDEOGRAPHIC FULL STOP + : "：" UFF1A # FULLWIDTH COLON + : "？" UFF1F # FULLWIDTH QUESTION MARK + : "！" UFF01 # FULLWIDTH EXCLAMATION MARK + : "§" U00A7 # SECTION SIGN + : "§" U00A7 # SECTION SIGN + : "§" U00A7 # SECTION SIGN + : "§" U00A7 # SECTION SIGN + : "§" U00A7 # SECTION SIGN + : "§" U00A7 # SECTION SIGN + : "№" U2116 # NUMERO SIGN + : "№" U2116 # NUMERO SIGN + : "▯" U25AF # WHITE VERTICAL RECTANGLE + : "☚" U261A # BLACK LEFT POINTING INDEX + : "☛" U261B # BLACK RIGHT POINTING INDEX + : "☜" U261C # WHITE LEFT POINTING INDEX + : "☝" U261D # WHITE UP POINTING INDEX + : "☞" U261E # WHITE RIGHT POINTING INDEX + : "☟" U261F # WHITE DOWN POINTING INDEX + : "★" U2605 # BLACK STAR + <0> : "☆" U2606 # WHITE STAR + : "❄" U2744 # SNOWFLAKE +

: "☭" U262D # HAMMER AND SICKLE + : "☭" U262D # HAMMER AND SICKLE + : "☭" U262D # HAMMER AND SICKLE + : "✓" U2713 # CHECK MARK + : "✔" U2714 # HEAVY CHECK MARK + : "✗" U2717 # BALLOT X + : "✘" U2718 # HEAVY BALLOT X + : "♀" U2640 # FEMALE SIGN + : "♂" U2642 # MALE SIGN + : "⚥" U26A5 # MALE AND FEMALE SIGN + : "⚠" U26A0 # WARNING SIGN + : "☮" U262E # PEACE SYMBOL + : "☯" U262F # YIN YANG + : "�" UFFFD # REPLACEMENT CHARACTER # }}} # Greek letters {{{ @@ -532,8 +534,8 @@ # }}} # Other letters {{{ - : "Á" U00C1 # LATIN CAPITAL LETTER A WITH ACUTE - : "Á" U00C1 # LATIN CAPITAL LETTER A WITH ACUTE + : "Á" U00C1 # LATIN CAPITAL LETTER A WITH ACUTE + : "Á" U00C1 # LATIN CAPITAL LETTER A WITH ACUTE : "Â" U00C2 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX : "Â" U00C2 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX : "À" U00C0 # LATIN CAPITAL LETTER A WITH GRAVE @@ -546,8 +548,8 @@ : "Ç" U00C7 # LATIN CAPITAL LETTER C WITH CEDILLA : "Đ" U0110 # LATIN CAPITAL LETTER D WITH STROKE : "Đ" U0110 # LATIN CAPITAL LETTER D WITH STROKE - : "É" U00C9 # LATIN CAPITAL LETTER E WITH ACUTE - : "É" U00C9 # LATIN CAPITAL LETTER E WITH ACUTE + : "É" U00C9 # LATIN CAPITAL LETTER E WITH ACUTE + : "É" U00C9 # LATIN CAPITAL LETTER E WITH ACUTE : "Ê" U00CA # LATIN CAPITAL LETTER E WITH CIRCUMFLEX : "Ê" U00CA # LATIN CAPITAL LETTER E WITH CIRCUMFLEX : "È" U00C8 # LATIN CAPITAL LETTER E WITH GRAVE @@ -558,8 +560,8 @@ : "Ë" U00CB # LATIN CAPITAL LETTER E WITH DIAERESIS : "Ħ" U0126 # LATIN CAPITAL LETTER H WITH STROKE : "Ħ" U0126 # LATIN CAPITAL LETTER H WITH STROKE - : "Í" U00CD # LATIN CAPITAL LETTER I WITH ACUTE - : "Í" U00CD # LATIN CAPITAL LETTER I WITH ACUTE + : "Í" U00CD # LATIN CAPITAL LETTER I WITH ACUTE + : "Í" U00CD # LATIN CAPITAL LETTER I WITH ACUTE : "Î" U00CE # LATIN CAPITAL LETTER I WITH CIRCUMFLEX : "Î" U00CE # LATIN CAPITAL LETTER I WITH CIRCUMFLEX : "Ì" U00CC # LATIN CAPITAL LETTER I WITH GRAVE @@ -574,8 +576,8 @@ : "Ł" U0141 # LATIN CAPITAL LETTER L WITH STROKE : "Ñ" U00D1 # LATIN CAPITAL LETTER N WITH TILDE : "Ñ" U00D1 # LATIN CAPITAL LETTER N WITH TILDE - : "Ó" U00D3 # LATIN CAPITAL LETTER O WITH ACUTE - : "Ó" U00D3 # LATIN CAPITAL LETTER O WITH ACUTE + : "Ó" U00D3 # LATIN CAPITAL LETTER O WITH ACUTE + : "Ó" U00D3 # LATIN CAPITAL LETTER O WITH ACUTE : "Ô" U00D4 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX : "Ô" U00D4 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX : "Ò" U00D2 # LATIN CAPITAL LETTER O WITH GRAVE @@ -588,8 +590,8 @@ : "Õ" U00D5 # LATIN CAPITAL LETTER O WITH TILDE : "Ö" U00D6 # LATIN CAPITAL LETTER O WITH DIAERESIS : "Ö" U00D6 # LATIN CAPITAL LETTER O WITH DIAERESIS - : "Ú" U00DA # LATIN CAPITAL LETTER U WITH ACUTE - : "Ú" U00DA # LATIN CAPITAL LETTER U WITH ACUTE + : "Ú" U00DA # LATIN CAPITAL LETTER U WITH ACUTE + : "Ú" U00DA # LATIN CAPITAL LETTER U WITH ACUTE : "Û" U00DB # LATIN CAPITAL LETTER U WITH CIRCUMFLEX : "Û" U00DB # LATIN CAPITAL LETTER U WITH CIRCUMFLEX : "Ù" U00D9 # LATIN CAPITAL LETTER U WITH GRAVE @@ -598,16 +600,16 @@ : "Ū" U016A # LATIN CAPITAL LETTER U WITH MACRON : "Ü" U00DC # LATIN CAPITAL LETTER U WITH DIAERESIS : "Ü" U00DC # LATIN CAPITAL LETTER U WITH DIAERESIS - : "Ý" U00DD # LATIN CAPITAL LETTER Y WITH ACUTE - : "Ý" U00DD # LATIN CAPITAL LETTER Y WITH ACUTE + : "Ý" U00DD # LATIN CAPITAL LETTER Y WITH ACUTE + : "Ý" U00DD # LATIN CAPITAL LETTER Y WITH ACUTE : "Ŷ" U0176 # LATIN CAPITAL LETTER Y WITH CIRCUMFLEX : "Ŷ" U0176 # LATIN CAPITAL LETTER Y WITH CIRCUMFLEX : "Ỳ" U1EF2 # LATIN CAPITAL LETTER Y WITH GRAVE : "Ỳ" U1EF2 # LATIN CAPITAL LETTER Y WITH GRAVE : "Ÿ" U0178 # LATIN CAPITAL LETTER Y WITH DIAERESIS : "Ÿ" U0178 # LATIN CAPITAL LETTER Y WITH DIAERESIS - : "á" U00E1 # LATIN SMALL LETTER A WITH ACUTE - : "á" U00E1 # LATIN SMALL LETTER A WITH ACUTE + : "á" U00E1 # LATIN SMALL LETTER A WITH ACUTE + : "á" U00E1 # LATIN SMALL LETTER A WITH ACUTE : "â" U00E2 # LATIN SMALL LETTER A WITH CIRCUMFLEX : "â" U00E2 # LATIN SMALL LETTER A WITH CIRCUMFLEX : "à" U00E0 # LATIN SMALL LETTER A WITH GRAVE @@ -622,8 +624,8 @@ : "ç" U00E7 # LATIN SMALL LETTER C WITH CEDILLA : "đ" U0111 # LATIN SMALL LETTER D WITH STROKE : "đ" U0111 # LATIN SMALL LETTER D WITH STROKE - : "é" U00E9 # LATIN SMALL LETTER E WITH ACUTE - : "é" U00E9 # LATIN SMALL LETTER E WITH ACUTE + : "é" U00E9 # LATIN SMALL LETTER E WITH ACUTE + : "é" U00E9 # LATIN SMALL LETTER E WITH ACUTE : "ê" U00EA # LATIN SMALL LETTER E WITH CIRCUMFLEX : "ê" U00EA # LATIN SMALL LETTER E WITH CIRCUMFLEX : "è" U00E8 # LATIN SMALL LETTER E WITH GRAVE @@ -634,8 +636,8 @@ : "ë" U00EB # LATIN SMALL LETTER E WITH DIAERESIS : "ħ" U0127 # LATIN SMALL LETTER H WITH STROKE : "ħ" U0127 # LATIN SMALL LETTER H WITH STROKE - : "í" U00ED # LATIN SMALL LETTER I WITH ACUTE - : "í" U00ED # LATIN SMALL LETTER I WITH ACUTE + : "í" U00ED # LATIN SMALL LETTER I WITH ACUTE + : "í" U00ED # LATIN SMALL LETTER I WITH ACUTE : "î" U00EE # LATIN SMALL LETTER I WITH CIRCUMFLEX : "î" U00EE # LATIN SMALL LETTER I WITH CIRCUMFLEX : "ì" U00EC # LATIN SMALL LETTER I WITH GRAVE @@ -650,8 +652,8 @@ : "ł" U0142 # LATIN SMALL LETTER L WITH STROKE : "ñ" U00F1 # LATIN SMALL LETTER N WITH TILDE : "ñ" U00F1 # LATIN SMALL LETTER N WITH TILDE - : "ó" U00F3 # LATIN SMALL LETTER O WITH ACUTE - : "ó" U00F3 # LATIN SMALL LETTER O WITH ACUTE + : "ó" U00F3 # LATIN SMALL LETTER O WITH ACUTE + : "ó" U00F3 # LATIN SMALL LETTER O WITH ACUTE : "ô" U00F4 # LATIN SMALL LETTER O WITH CIRCUMFLEX : "ô" U00F4 # LATIN SMALL LETTER O WITH CIRCUMFLEX : "ò" U00F2 # LATIN SMALL LETTER O WITH GRAVE @@ -664,8 +666,8 @@ : "õ" U00F5 # LATIN SMALL LETTER O WITH TILDE : "ö" U00F6 # LATIN SMALL LETTER O WITH DIAERESIS : "ö" U00F6 # LATIN SMALL LETTER O WITH DIAERESIS - : "ú" U00FA # LATIN SMALL LETTER U WITH ACUTE - : "ú" U00FA # LATIN SMALL LETTER U WITH ACUTE + : "ú" U00FA # LATIN SMALL LETTER U WITH ACUTE + : "ú" U00FA # LATIN SMALL LETTER U WITH ACUTE : "û" U00FB # LATIN SMALL LETTER U WITH CIRCUMFLEX : "û" U00FB # LATIN SMALL LETTER U WITH CIRCUMFLEX : "ù" U00F9 # LATIN SMALL LETTER U WITH GRAVE @@ -674,8 +676,8 @@ : "ū" U016B # LATIN SMALL LETTER U WITH MACRON : "ü" U00FC # LATIN SMALL LETTER U WITH DIAERESIS : "ü" U00FC # LATIN SMALL LETTER U WITH DIAERESIS - : "ý" U00FD # LATIN SMALL LETTER Y WITH ACUTE - : "ý" U00FD # LATIN SMALL LETTER Y WITH ACUTE + : "ý" U00FD # LATIN SMALL LETTER Y WITH ACUTE + : "ý" U00FD # LATIN SMALL LETTER Y WITH ACUTE : "ŷ" U0177 # LATIN SMALL LETTER Y WITH CIRCUMFLEX : "ŷ" U0177 # LATIN SMALL LETTER Y WITH CIRCUMFLEX : "ỳ" U1EF3 # LATIN SMALL LETTER Y WITH GRAVE diff --git a/.config/fontconfig/fonts.conf b/.config/fontconfig/fonts.conf index aaef83a..8277e1f 100644 --- a/.config/fontconfig/fonts.conf +++ b/.config/fontconfig/fonts.conf @@ -1,82 +1,80 @@ - - + + - - - true - - - true - - - true - - - hintslight - - - lcddefault - - - rgb - - - - - monospace - - Hack - Fira Code - Fantasque Sans Mono - DejaVu Sans Mono - - - - - sans - - Noto Sans - DejaVu Sans - Noto Sans CJK JP - - - - - serif - - Noto Serif - DejaVu Serif - Noto Serif CJK JP - - - - - Cambria - - Caladea - - - - - Caladea - - Cambria - - - - - Times New Roman - - Liberation Serif - - - - - Arial - - Liberation Sans - - - -

fonts + + + true + + + true + + + true + + + hintslight + + + lcddefault + + + rgb + + + + monospace + + Hack + Fira Code + Fantasque Sans Mono + DejaVu Sans Mono + + + + sans + + Noto Sans + DejaVu Sans + Noto Sans CJK JP + + + + serif + + Noto Serif + DejaVu Serif + Noto Serif CJK JP + + + + Cambria + + Caladea + + + + Caladea + + Cambria + + + + Times New Roman + + Liberation Serif + + + + Arial + + Liberation Sans + + + + Merriweather MG + + Merriweather + + + fonts diff --git a/.config/git/config b/.config/git/config index b7b140c..60f61bb 100644 --- a/.config/git/config +++ b/.config/git/config @@ -18,6 +18,9 @@ gpgSign = true status = true +[pull] + ff = only + [status] submoduleSummary = 1 @@ -33,6 +36,8 @@ [tar "tar.xz"] command = xz -c -z - +[pull] + ff = only [tar "tar.zst"] command = zstd -c -z -q - @@ -103,20 +108,25 @@ shallow = clone --single-branch --depth=1 repush = !git commit --amend -a --no-edit && git push --force fork-sync = "! \ - git fetch --verbose upstream && git checkout --progress master && \ - git reset --hard upstream/master && git push --verbose --force" + git fetch --verbose ${1:-upstream} && git checkout --progress master && \ + git reset --hard ${1:-upstream}/master && git push --verbose --force" force-pull = "!git fetch -a && git reset --hard ${2:-origin}/${1:-master}" -[url "git@github.com:"] +[url "ssh://git@github.com/"] insteadOf = https://github.com/ insteadOf = http://github.com/ insteadOf = @gh: -[url "git@gitlab.com:"] +[url "ssh://git@gitlab.com/"] insteadOf = https://gitlab.com/ insteadOf = http://gitlab.com/ insteadOf = @gl: +[url "ssh://git@git.disroot.org/"] + insteadOf = https://git.disroot.org/ + insteadOf = http://git.disroot.org/ + insteadOf = @disroot: + [url "ssh://aur@aur.archlinux.org/"] insteadOf = https://aur.achlinux.org/ insteadOf = http://aur.archlinux.org/ @@ -126,10 +136,4 @@ insteadOf = http://bitbucket.org/ insteadOf = @bb: -[filter "lfs"] - clean = git-lfs clean -- %f - smudge = git-lfs smudge -- %f - process = git-lfs filter-process - required = true - # vim:noet:sw=4:ts=4: diff --git a/.config/mpv/input.conf b/.config/mpv/input.conf index 2e4f671..60f7846 100644 --- a/.config/mpv/input.conf +++ b/.config/mpv/input.conf @@ -20,7 +20,7 @@ MBTN_LEFT_DBL cycle fullscreen l cycle-values loop-file "inf" "no" L cycle-values loop-playlist "inf" "no" -V cycle-values video-params/aspect "16:9" "4:3" "-1" +V cycle-values video-aspect-override "16:9" "4:3" "-1" H cycle-values hwdec "no" "auto-copy-safe" # }}} @@ -133,7 +133,8 @@ Ctrl+s screenshot window ? show-text ${playlist} I show-text ${track-list} -` show-text ${mpv-version} +` show-text ${path} +~ show-text ${media-title} # }}} @@ -166,8 +167,7 @@ b playlist-prev n playlist-next f playlist-shuffle Ctrl+l ab-loop -Ctrl+q quit -Ctrl+c quit 4 +Ctrl+q quit-watch-later Shift+RIGHT frame-step Shift+LEFT frame-back-step @@ -179,4 +179,4 @@ MBTN_LEFT ignore # }}} -# vim:ft=dosini:fdm=marker:fdl=1: +# vim:fdm=marker:fdl=1: diff --git a/.config/pycodestyle b/.config/pycodestyle index d6d9123..7e69890 100644 --- a/.config/pycodestyle +++ b/.config/pycodestyle @@ -1,6 +1,7 @@ [pycodestyle] +# W503: line break before binary operator # W504: line break after binary operator -ignore = W504 +ignore = W503,W504 max_line_length = 80 # vim:ft=cfg: diff --git a/.config/qutebrowser/config.py b/.config/qutebrowser/config.py index 8170197..c42022d 100644 --- a/.config/qutebrowser/config.py +++ b/.config/qutebrowser/config.py @@ -10,9 +10,9 @@ c.content.headers.accept_language = 'en_GB,en' c.content.headers.user_agent = ' '.join(( 'Mozilla/5.0', '(X11; Linux x86_64)', - 'QtWebEngine/5.14.2', - 'Chromium/77.0.3865.129', - 'qutebrowser/1.10.2' + 'QtWebEngine/5.15.0', + 'Chromium/80.0.3987.163', + 'qutebrowser/1.13.0' )) # Allow JavaScript to read from or write to the clipboard. diff --git a/.config/vifm/vifmrc b/.config/vifm/vifmrc index 8798281..9f9a676 100644 --- a/.config/vifm/vifmrc +++ b/.config/vifm/vifmrc @@ -211,6 +211,32 @@ fileviewer *.anx, " }}} " Images {{{ +fileviewer *.apng, + \*.bmp, + \*.gif, + \*.ico, + \*.icon, + \*.j2k, + \*.jp2, + \*.jpeg, + \*.jpf, + \*.jpg, + \*.jpm, + \*.jpx, + \*.mng, + \*.pbm, + \*.pcx, + \*.pgm, + \*.png, + \*.ppm, + \*.psd, + \*.tga, + \*.tif, + \*.tiff, + \*.webp, + \*.xbm, + \*.xpm + \ identify -verbose %c filextype *.apng, \*.bmp, \*.gif, @@ -229,6 +255,7 @@ filextype *.apng, \*.pgm, \*.png, \*.ppm, + \*.psd, \*.tga, \*.tif, \*.tiff, diff --git a/.config/youtube-dl/config b/.config/youtube-dl/config index f67762c..9bda548 100644 --- a/.config/youtube-dl/config +++ b/.config/youtube-dl/config @@ -17,6 +17,6 @@ --output "%(title)s.%(ext)s" # Specify a custom user agent. ---user-agent "Mozilla/5.0 (Linux x86_64) youtube-dl/2020.03.24" +--user-agent "Mozilla/5.0 (Linux x86_64) youtube-dl/2020.06.16" # vim:ft=conf: diff --git a/.local/arch/init.sh b/.local/arch/init.sh index 075bb63..9cac49c 100755 --- a/.local/arch/init.sh +++ b/.local/arch/init.sh @@ -55,7 +55,7 @@ Type = Package Target = pacman-mirrorlist [Action] -Description = Updating pacman-mirrorlist with reflector +Description = Updating pacman-mirrorlist with reflector... When = PostTransaction Depends = reflector Exec = /usr/bin/reflector ${REF_OPTS[*]} @@ -163,17 +163,15 @@ sudo cp -r /tmp/grub2-theme-lain "$THEME" sudo cp /etc/default/grub{,.bak} sudo tee /etc/default/grub >/dev/null </dev/null </dev/null </dev/null <<'EOF' KEYMAP=us -FONT=ter-v18n +FONT=ter-v22n FONT_MAP=8859-2 EOF sudo sed -i /etc/mkinitcpio.conf \ diff --git a/.local/arch/packages.aur.txt b/.local/arch/packages.aur.txt index 3ab7af3..15e79ed 100644 --- a/.local/arch/packages.aur.txt +++ b/.local/arch/packages.aur.txt @@ -7,7 +7,6 @@ exe-thumbnailer google-java-format gulp-cli htmlhint -hyperfine-bin kde-thumbnailer-apk korla-icon-theme lab-bin diff --git a/.local/arch/packages.repo.txt b/.local/arch/packages.repo.txt index 6556506..c7cae99 100644 --- a/.local/arch/packages.repo.txt +++ b/.local/arch/packages.repo.txt @@ -60,8 +60,10 @@ hub hunspell-el hunspell-en_GB hunspell-en_US +hyperfine iftop imagemagick +inkscape intellij-idea-ultimate-edition jdk-openjdk jdk8-openjdk @@ -90,8 +92,8 @@ lib32-ffmpeg lib32-mesa-aco-git lib32-vulkan-icd-loader linux-firmware -linux-zen -linux-zen-headers +linux-tkg-muqss-zen +linux-tkg-muqss-zen-headers lldb llvm lsof @@ -111,7 +113,6 @@ newsboat node-gyp nodejs noto-fonts-cjk -ntfs-3g okteta okular openjdk-doc diff --git a/.local/share/bash/aliases.sh b/.local/share/bash/aliases.sh index 726a096..dc5c7e9 100644 --- a/.local/share/bash/aliases.sh +++ b/.local/share/bash/aliases.sh @@ -1,6 +1,8 @@ # Aliases {{{ # Go to parent directory alias ..='cd ..' +# Go to previous directory +alias -- -='cd -' # Copy from file to clipboard alias fcopy='xclip -sel c -i' # ffprobe without banner @@ -8,21 +10,17 @@ alias ffprobe='ffprobe -hide_banner' # ffmpeg without banner alias ffmpeg='ffmpeg -hide_banner' # Paste to file from clipboard -alias fpaste='xclip -sel -c -o > ' +alias fpaste='xclip -sel c -o > ' # fzf with preview -alias fzfp='fzf --preview "rougify --theme base16.monokai.dark {}"' +alias fzfp='fzf --preview rougify\ -tbase16.dark\ {}' # git diff for regular files alias gdiff='git diff --no-index' # maximum 7z compression alias ultra7z='7z a -t7z -m0=lzma2:d=1024m -mx=9 -md=32m -ms=on -mfb=64 -aoa' -# vimcat with gruvbox colorscheme -alias vcat='vimcat -c "colors gruvbox"' # Activate virtualenv alias venv='. .venv/bin/activate' -# Use neovim instead of vim -alias vim='nvim' # neovim terminal shell -alias vish='nvim +term' +alias vish='SHELL=/bin/bash\ -l nvim +term' # maximum zip compression alias zip-max='7z a -tzip -mm=Deflate -mx=9 -mfb=128 -mpass=10 -aoa' # }}} @@ -59,7 +57,4 @@ alert() { # Use like so: sleep 10; alert } # }}} -# Functions kept separately -test -f "$XDG_DATA_HOME/bash/functions.sh" && . "$_" - # vim:fdm=marker:fdl=1: diff --git a/.local/share/bash/bashrc.sh b/.local/share/bash/bashrc.sh index dedfc35..030c88b 100644 --- a/.local/share/bash/bashrc.sh +++ b/.local/share/bash/bashrc.sh @@ -30,12 +30,6 @@ FIGNORE='~:.o:.swp:.pyc' # shellcheck disable=SC2034 COMP_CONFIGURE_HINTS=1 -# Alias definitions -test -f "$XDG_DATA_HOME/bash/aliases.sh" && . "$_" - -# Uni configuration -test -f ~/.unirc.sh && . "$_" - : # ensure 0 exit code # vim:wrap:lbr:bri:briopt=shift\:4: diff --git a/.local/share/bash/functions.sh b/.local/share/bash/functions.sh index cb41d1f..1009f0d 100644 --- a/.local/share/bash/functions.sh +++ b/.local/share/bash/functions.sh @@ -15,7 +15,7 @@ count() { # Counts the number of characters in a string printf '%d\n' "${#1}" } -trim() { # Trim leading and trailing whitespace +trim() { # Trims leading and trailing whitespace __usage $# 1 '' && return 1 : "${1#"${1%%[![:space:]]*}"}" : "${_%"${_##*[![:space:]]}"}" @@ -108,24 +108,24 @@ cht() { # Searches cht.sh cheatsheet : "${*:2}"; curl -sS4 "cht.sh/$1/${_// /+})?Q" } -weather() { # Show weather info from wttr.in +weather() { # Shows weather info from wttr.in __usage $# 1 ' [country]' && return 1 curl -sS4 "wttr.in/~${1}+${2:-Greece}" | head -n -2 } sri() { # Prints the SRI hash of a resource - __usage $# 1 ' [algorithm]' && return 1 + __usage $# 1 ' [bits]' && return 1 printf 'sha%d-%s\n' "${2:-384}" \ "$(curl -Ss "$1" | shasum -ba "${2:-384}" - | xxd -r -p | base64)" } myip() { # What's my ip - dig +short myip.opendns.com @resolver1.opendns.com + drill myip.opendns.com @resolver1.opendns.com | awk '/^myip/{print $NF}' } urlencode() { # Encodes string for url __usage $# 1 '' && return 1 - declare LANG=C len="${#1}" char i + declare LANG=C len=${#1} char i for ((i = 0; i < len; ++i)); do char="${1:i:1}" case $char in @@ -157,4 +157,9 @@ pwned() { # Checks if a password has been compromised done } +iso2usb() { # Writes an iso to a usb device + __usage $# 2 ' [bs]' && return 1 + sudo dd if="$1" of="$2" status=progress bs="${3:-4M}" oflag=sync +} + # vim:fdm=syntax:fdl=0: diff --git a/.local/share/konsole/Default.profile b/.local/share/konsole/Default.profile index 20b7648..6c37046 100644 --- a/.local/share/konsole/Default.profile +++ b/.local/share/konsole/Default.profile @@ -21,7 +21,7 @@ Parent=FALLBACK/ ShowTerminalSizeHint=true TerminalCenter=true TerminalColumns=100 -TerminalMargin=2 +TerminalMargin=5 TerminalRows=35 [Scrolling] @@ -30,5 +30,3 @@ ScrollBarPosition=2 [Terminal Features] BlinkingCursorEnabled=true - -# vim:ft=cfg: diff --git a/.yarnrc b/.yarnrc index 6dc6afb..723d952 100644 --- a/.yarnrc +++ b/.yarnrc @@ -10,6 +10,6 @@ init-author-url "https://observeroftime.github.io" init-license MIT init-version "0.1.0" prefix "~/.local" -user-agent "yarn/1.22.4 node/v13.13.0 linux x64" +user-agent "yarn/1.22.4 node/v14.3.0 linux x64" username ObserverOfTime version-git-sign true