Browse Source

Update dotfiles

master
Observer of Time 9 months ago
parent
commit
08ac710c29
Signed by: chronobserver GPG Key ID: 8A2DEA1DBAEBCA9E
19 changed files with 288 additions and 238 deletions
  1. +19
    -2
      .bash_profile
  2. +14
    -18
      .clang-format
  3. +0
    -2
      .clang-tidy
  4. +80
    -78
      .config/X11/XCompose
  5. +78
    -80
      .config/fontconfig/fonts.conf
  6. +14
    -10
      .config/git/config
  7. +5
    -5
      .config/mpv/input.conf
  8. +2
    -1
      .config/pycodestyle
  9. +3
    -3
      .config/qutebrowser/config.py
  10. +27
    -0
      .config/vifm/vifmrc
  11. +1
    -1
      .config/youtube-dl/config
  12. +24
    -9
      .local/arch/init.sh
  13. +0
    -1
      .local/arch/packages.aur.txt
  14. +4
    -3
      .local/arch/packages.repo.txt
  15. +5
    -10
      .local/share/bash/aliases.sh
  16. +0
    -6
      .local/share/bash/bashrc.sh
  17. +10
    -5
      .local/share/bash/functions.sh
  18. +1
    -3
      .local/share/konsole/Default.profile
  19. +1
    -1
      .yarnrc

+ 19
- 2
.bash_profile View File

@ -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:

+ 14
- 18
.clang-format View File

@ -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:

+ 0
- 2
.clang-tidy View File

@ -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


+ 80
- 78
.config/X11/XCompose View File

@ -242,60 +242,62 @@
# }}}
# Other symbols {{{
<Multi_key> <o> <o> : "°" U00B0 # DEGREE SIGN
<Multi_key> <asterisk> <0> : "°" U00B0 # DEGREE SIGN
<Multi_key> <0> <asterisk> : "°" U00B0 # DEGREE SIGN
<Multi_key> <exclam> <bar> : "¦" U00A6 # BROKEN BAR
<Multi_key> <bar> <exclam> : "¦" U00A6 # BROKEN BAR
<Multi_key> <bar> <minus> : "†" U2020 # DAGGER
<Multi_key> <bar> <equal> : "‡" U2021 # DOUBLE DAGGER
<Multi_key> <bar> <bar> : "‖" U2016 # DOUBLE VERTICAL LINE
<Multi_key> <p> <exclam> : "¶" U00B6 # PILCROW SIGN
<Multi_key> <P> <exclam> : "¶" U00B6 # PILCROW SIGN
<Multi_key> <exclam> <exclam> : "¡" U00A1 # INVERTED EXCLAMATION MARK
<Multi_key> <question> <question> : "¿" U00BF # INVERTED QUESTION MARK
<Multi_key> <exclam> <question> : "‽" U203D # INTERROBANG
<Multi_key> <question> <exclam> : "⸘" U2E18 # INVERTED INTERROBANG
<Multi_key> <2> <question> : "⁇" U2047 # DOUBLE QUESTION MARK
<Multi_key> <question> <bar> <exclam> : "⁈" U2048 # QUESTION EXCLAMATION MARK
<Multi_key> <exclam> <bar> <question> : "⁉" U2049 # EXCLAMATION QUESTION MARK
<Multi_key> <2> <exclam> : "‼" U203C # DOUBLE EXCLAMATION MARK
<Multi_key> <colon> <colon> : "∷" U2237 # PROPORTION
<Multi_key> <j> <comma> : "、" U3001 # IDEOGRAPHIC COMMA
<Multi_key> <j> <period> : "。" U3002 # IDEOGRAPHIC FULL STOP
<Multi_key> <j> <colon> : ":" UFF1A # FULLWIDTH COLON
<Multi_key> <j> <question> : "?" UFF1F # FULLWIDTH QUESTION MARK
<Multi_key> <j> <exclam> : "!" UFF01 # FULLWIDTH EXCLAMATION MARK
<Multi_key> <s> <o> : "§" U00A7 # SECTION SIGN
<Multi_key> <o> <s> : "§" U00A7 # SECTION SIGN
<Multi_key> <S> <O> : "§" U00A7 # SECTION SIGN
<Multi_key> <O> <S> : "§" U00A7 # SECTION SIGN
<Multi_key> <s> <exclam> : "§" U00A7 # SECTION SIGN
<Multi_key> <S> <exclam> : "§" U00A7 # SECTION SIGN
<Multi_key> <N> <o> : "№" U2116 # NUMERO SIGN
<Multi_key> <N> <O> : "№" U2116 # NUMERO SIGN
<Multi_key> <F> <less> : "☚" U261A # BLACK LEFT POINTING INDEX
<Multi_key> <F> <greater> : "☛" U261B # BLACK RIGHT POINTING INDEX
<Multi_key> <f> <less> : "☜" U261C # WHITE LEFT POINTING INDEX
<Multi_key> <f> <asciicircum> : "☝" U261D # WHITE UP POINTING INDEX
<Multi_key> <f> <greater> : "☞" U261E # WHITE RIGHT POINTING INDEX
<Multi_key> <f> <v> : "☟" U261F # WHITE DOWN POINTING INDEX
<Multi_key> <asterisk> <asterisk> : "★" U2605 # BLACK STAR
<Multi_key> <asterisk> <0> : "☆" U2606 # WHITE STAR
<Multi_key> <asterisk> <x> : "❄" U2744 # SNOWFLAKE
<Multi_key> <C> <C> <C> <P> : "☭" U262D # HAMMER AND SICKLE
<Multi_key> <h> <s> : "☭" U262D # HAMMER AND SICKLE
<Multi_key> <H> <S> : "☭" U262D # HAMMER AND SICKLE
<Multi_key> <at> <slash> : "✓" U2713 # CHECK MARK
<Multi_key> <at> <at> <slash> : "✔" U2714 # HEAVY CHECK MARK
<Multi_key> <at> <X> : "✗" U2717 # BALLOT X
<Multi_key> <at> <at> <X> : "✘" U2718 # HEAVY BALLOT X
<Multi_key> <o> <f> : "♀" U2640 # FEMALE SIGN
<Multi_key> <o> <m> : "♂" U2642 # MALE SIGN
<Multi_key> <o> <t> : "⚥" U26A5 # MALE AND FEMALE SIGN
<Multi_key> <exclam> <asciicircum> : "⚠" U26A0 # WARNING SIGN
<Multi_key> <bar> <asciicircum> : "☮" U262E # PEACE SYMBOL
<Multi_key> <y> <y> : "☯" U262F # YIN YANG
<Multi_key> <o> <o> : "°" U00B0 # DEGREE SIGN
<Multi_key> <asterisk> <0> : "°" U00B0 # DEGREE SIGN
<Multi_key> <0> <asterisk> : "°" U00B0 # DEGREE SIGN
<Multi_key> <exclam> <bar> : "¦" U00A6 # BROKEN BAR
<Multi_key> <bar> <exclam> : "¦" U00A6 # BROKEN BAR
<Multi_key> <bar> <minus> : "†" U2020 # DAGGER
<Multi_key> <bar> <equal> : "‡" U2021 # DOUBLE DAGGER
<Multi_key> <bar> <bar> : "‖" U2016 # DOUBLE VERTICAL LINE
<Multi_key> <p> <exclam> : "¶" U00B6 # PILCROW SIGN
<Multi_key> <P> <exclam> : "¶" U00B6 # PILCROW SIGN
<Multi_key> <exclam> <exclam> : "¡" U00A1 # INVERTED EXCLAMATION MARK
<Multi_key> <question> <question> : "¿" U00BF # INVERTED QUESTION MARK
<Multi_key> <exclam> <question> : "‽" U203D # INTERROBANG
<Multi_key> <question> <exclam> : "⸘" U2E18 # INVERTED INTERROBANG
<Multi_key> <2> <question> : "⁇" U2047 # DOUBLE QUESTION MARK
<Multi_key> <question> <bar> <exclam> : "⁈" U2048 # QUESTION EXCLAMATION MARK
<Multi_key> <exclam> <bar> <question> : "⁉" U2049 # EXCLAMATION QUESTION MARK
<Multi_key> <2> <exclam> : "‼" U203C # DOUBLE EXCLAMATION MARK
<Multi_key> <colon> <colon> : "∷" U2237 # PROPORTION
<Multi_key> <j> <comma> : "、" U3001 # IDEOGRAPHIC COMMA
<Multi_key> <j> <period> : "。" U3002 # IDEOGRAPHIC FULL STOP
<Multi_key> <j> <colon> : ":" UFF1A # FULLWIDTH COLON
<Multi_key> <j> <question> : "?" UFF1F # FULLWIDTH QUESTION MARK
<Multi_key> <j> <exclam> : "!" UFF01 # FULLWIDTH EXCLAMATION MARK
<Multi_key> <s> <o> : "§" U00A7 # SECTION SIGN
<Multi_key> <o> <s> : "§" U00A7 # SECTION SIGN
<Multi_key> <S> <O> : "§" U00A7 # SECTION SIGN
<Multi_key> <O> <S> : "§" U00A7 # SECTION SIGN
<Multi_key> <s> <exclam> : "§" U00A7 # SECTION SIGN
<Multi_key> <S> <exclam> : "§" U00A7 # SECTION SIGN
<Multi_key> <N> <o> : "№" U2116 # NUMERO SIGN
<Multi_key> <N> <O> : "№" U2116 # NUMERO SIGN
<Multi_key> <bracketleft> <bracketright> : "▯" U25AF # WHITE VERTICAL RECTANGLE
<Multi_key> <F> <less> : "☚" U261A # BLACK LEFT POINTING INDEX
<Multi_key> <F> <greater> : "☛" U261B # BLACK RIGHT POINTING INDEX
<Multi_key> <f> <less> : "☜" U261C # WHITE LEFT POINTING INDEX
<Multi_key> <f> <asciicircum> : "☝" U261D # WHITE UP POINTING INDEX
<Multi_key> <f> <greater> : "☞" U261E # WHITE RIGHT POINTING INDEX
<Multi_key> <f> <v> : "☟" U261F # WHITE DOWN POINTING INDEX
<Multi_key> <asterisk> <asterisk> : "★" U2605 # BLACK STAR
<Multi_key> <asterisk> <0> : "☆" U2606 # WHITE STAR
<Multi_key> <asterisk> <x> : "❄" U2744 # SNOWFLAKE
<Multi_key> <C> <C> <C> <P> : "☭" U262D # HAMMER AND SICKLE
<Multi_key> <h> <s> : "☭" U262D # HAMMER AND SICKLE
<Multi_key> <H> <S> : "☭" U262D # HAMMER AND SICKLE
<Multi_key> <at> <slash> : "✓" U2713 # CHECK MARK
<Multi_key> <at> <at> <slash> : "✔" U2714 # HEAVY CHECK MARK
<Multi_key> <at> <X> : "✗" U2717 # BALLOT X
<Multi_key> <at> <at> <X> : "✘" U2718 # HEAVY BALLOT X
<Multi_key> <o> <f> : "♀" U2640 # FEMALE SIGN
<Multi_key> <o> <m> : "♂" U2642 # MALE SIGN
<Multi_key> <o> <t> : "⚥" U26A5 # MALE AND FEMALE SIGN
<Multi_key> <exclam> <asciicircum> : "⚠" U26A0 # WARNING SIGN
<Multi_key> <bar> <asciicircum> : "☮" U262E # PEACE SYMBOL
<Multi_key> <y> <y> : "☯" U262F # YIN YANG
<Multi_key> <question> <asciicircum> : "�" UFFFD # REPLACEMENT CHARACTER
# }}}
# Greek letters {{{
@ -532,8 +534,8 @@
# }}}
# Other letters {{{
<Multi_key> <acute> <A> : "Á" U00C1 # LATIN CAPITAL LETTER A WITH ACUTE
<Multi_key> <A> <acute> : "Á" U00C1 # LATIN CAPITAL LETTER A WITH ACUTE
<Multi_key> <apostrophe> <A> : "Á" U00C1 # LATIN CAPITAL LETTER A WITH ACUTE
<Multi_key> <A> <apostrophe> : "Á" U00C1 # LATIN CAPITAL LETTER A WITH ACUTE
<Multi_key> <asciicircum> <A> : "Â" U00C2 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX
<Multi_key> <A> <asciicircum> : "Â" U00C2 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX
<Multi_key> <grave> <A> : "À" U00C0 # LATIN CAPITAL LETTER A WITH GRAVE
@ -546,8 +548,8 @@
<Multi_key> <C> <comma> : "Ç" U00C7 # LATIN CAPITAL LETTER C WITH CEDILLA
<Multi_key> <minus> <D> : "Đ" U0110 # LATIN CAPITAL LETTER D WITH STROKE
<Multi_key> <D> <minus> : "Đ" U0110 # LATIN CAPITAL LETTER D WITH STROKE
<Multi_key> <acute> <E> : "É" U00C9 # LATIN CAPITAL LETTER E WITH ACUTE
<Multi_key> <E> <acute> : "É" U00C9 # LATIN CAPITAL LETTER E WITH ACUTE
<Multi_key> <apostrophe> <E> : "É" U00C9 # LATIN CAPITAL LETTER E WITH ACUTE
<Multi_key> <E> <apostrophe> : "É" U00C9 # LATIN CAPITAL LETTER E WITH ACUTE
<Multi_key> <asciicircum> <E> : "Ê" U00CA # LATIN CAPITAL LETTER E WITH CIRCUMFLEX
<Multi_key> <E> <asciicircum> : "Ê" U00CA # LATIN CAPITAL LETTER E WITH CIRCUMFLEX
<Multi_key> <grave> <E> : "È" U00C8 # LATIN CAPITAL LETTER E WITH GRAVE
@ -558,8 +560,8 @@
<Multi_key> <E> <quotedbl> : "Ë" U00CB # LATIN CAPITAL LETTER E WITH DIAERESIS
<Multi_key> <minus> <H> : "Ħ" U0126 # LATIN CAPITAL LETTER H WITH STROKE
<Multi_key> <H> <minus> : "Ħ" U0126 # LATIN CAPITAL LETTER H WITH STROKE
<Multi_key> <acute> <I> : "Í" U00CD # LATIN CAPITAL LETTER I WITH ACUTE
<Multi_key> <I> <acute> : "Í" U00CD # LATIN CAPITAL LETTER I WITH ACUTE
<Multi_key> <apostrophe> <I> : "Í" U00CD # LATIN CAPITAL LETTER I WITH ACUTE
<Multi_key> <I> <apostrophe> : "Í" U00CD # LATIN CAPITAL LETTER I WITH ACUTE
<Multi_key> <asciicircum> <I> : "Î" U00CE # LATIN CAPITAL LETTER I WITH CIRCUMFLEX
<Multi_key> <I> <asciicircum> : "Î" U00CE # LATIN CAPITAL LETTER I WITH CIRCUMFLEX
<Multi_key> <grave> <I> : "Ì" U00CC # LATIN CAPITAL LETTER I WITH GRAVE
@ -574,8 +576,8 @@
<Multi_key> <L> <slash> : "Ł" U0141 # LATIN CAPITAL LETTER L WITH STROKE
<Multi_key> <asciitilde> <N> : "Ñ" U00D1 # LATIN CAPITAL LETTER N WITH TILDE
<Multi_key> <N> <asciitilde> : "Ñ" U00D1 # LATIN CAPITAL LETTER N WITH TILDE
<Multi_key> <acute> <O> : "Ó" U00D3 # LATIN CAPITAL LETTER O WITH ACUTE
<Multi_key> <O> <acute> : "Ó" U00D3 # LATIN CAPITAL LETTER O WITH ACUTE
<Multi_key> <apostrophe> <O> : "Ó" U00D3 # LATIN CAPITAL LETTER O WITH ACUTE
<Multi_key> <O> <apostrophe> : "Ó" U00D3 # LATIN CAPITAL LETTER O WITH ACUTE
<Multi_key> <asciicircum> <O> : "Ô" U00D4 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX
<Multi_key> <O> <asciicircum> : "Ô" U00D4 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX
<Multi_key> <grave> <O> : "Ò" U00D2 # LATIN CAPITAL LETTER O WITH GRAVE
@ -588,8 +590,8 @@
<Multi_key> <O> <asciitilde> : "Õ" U00D5 # LATIN CAPITAL LETTER O WITH TILDE
<Multi_key> <quotedbl> <O> : "Ö" U00D6 # LATIN CAPITAL LETTER O WITH DIAERESIS
<Multi_key> <O> <quotedbl> : "Ö" U00D6 # LATIN CAPITAL LETTER O WITH DIAERESIS
<Multi_key> <acute> <U> : "Ú" U00DA # LATIN CAPITAL LETTER U WITH ACUTE
<Multi_key> <U> <acute> : "Ú" U00DA # LATIN CAPITAL LETTER U WITH ACUTE
<Multi_key> <apostrophe> <U> : "Ú" U00DA # LATIN CAPITAL LETTER U WITH ACUTE
<Multi_key> <U> <apostrophe> : "Ú" U00DA # LATIN CAPITAL LETTER U WITH ACUTE
<Multi_key> <asciicircum> <U> : "Û" U00DB # LATIN CAPITAL LETTER U WITH CIRCUMFLEX
<Multi_key> <U> <asciicircum> : "Û" U00DB # LATIN CAPITAL LETTER U WITH CIRCUMFLEX
<Multi_key> <grave> <U> : "Ù" U00D9 # LATIN CAPITAL LETTER U WITH GRAVE
@ -598,16 +600,16 @@
<Multi_key> <U> <underscore> : "Ū" U016A # LATIN CAPITAL LETTER U WITH MACRON
<Multi_key> <quotedbl> <U> : "Ü" U00DC # LATIN CAPITAL LETTER U WITH DIAERESIS
<Multi_key> <U> <quotedbl> : "Ü" U00DC # LATIN CAPITAL LETTER U WITH DIAERESIS
<Multi_key> <acute> <Y> : "Ý" U00DD # LATIN CAPITAL LETTER Y WITH ACUTE
<Multi_key> <Y> <acute> : "Ý" U00DD # LATIN CAPITAL LETTER Y WITH ACUTE
<Multi_key> <apostrophe> <Y> : "Ý" U00DD # LATIN CAPITAL LETTER Y WITH ACUTE
<Multi_key> <Y> <apostrophe> : "Ý" U00DD # LATIN CAPITAL LETTER Y WITH ACUTE
<Multi_key> <asciicircum> <Y> : "Ŷ" U0176 # LATIN CAPITAL LETTER Y WITH CIRCUMFLEX
<Multi_key> <Y> <asciicircum> : "Ŷ" U0176 # LATIN CAPITAL LETTER Y WITH CIRCUMFLEX
<Multi_key> <Y> <grave> : "Ỳ" U1EF2 # LATIN CAPITAL LETTER Y WITH GRAVE
<Multi_key> <grave> <Y> : "Ỳ" U1EF2 # LATIN CAPITAL LETTER Y WITH GRAVE
<Multi_key> <quotedbl> <Y> : "Ÿ" U0178 # LATIN CAPITAL LETTER Y WITH DIAERESIS
<Multi_key> <Y> <quotedbl> : "Ÿ" U0178 # LATIN CAPITAL LETTER Y WITH DIAERESIS
<Multi_key> <acute> <a> : "á" U00E1 # LATIN SMALL LETTER A WITH ACUTE
<Multi_key> <a> <acute> : "á" U00E1 # LATIN SMALL LETTER A WITH ACUTE
<Multi_key> <apostrophe> <a> : "á" U00E1 # LATIN SMALL LETTER A WITH ACUTE
<Multi_key> <a> <apostrophe> : "á" U00E1 # LATIN SMALL LETTER A WITH ACUTE
<Multi_key> <asciicircum> <a> : "â" U00E2 # LATIN SMALL LETTER A WITH CIRCUMFLEX
<Multi_key> <a> <asciicircum> : "â" U00E2 # LATIN SMALL LETTER A WITH CIRCUMFLEX
<Multi_key> <grave> <a> : "à" U00E0 # LATIN SMALL LETTER A WITH GRAVE
@ -622,8 +624,8 @@
<Multi_key> <c> <comma> : "ç" U00E7 # LATIN SMALL LETTER C WITH CEDILLA
<Multi_key> <minus> <d> : "đ" U0111 # LATIN SMALL LETTER D WITH STROKE
<Multi_key> <d> <minus> : "đ" U0111 # LATIN SMALL LETTER D WITH STROKE
<Multi_key> <acute> <e> : "é" U00E9 # LATIN SMALL LETTER E WITH ACUTE
<Multi_key> <e> <acute> : "é" U00E9 # LATIN SMALL LETTER E WITH ACUTE
<Multi_key> <apostrophe> <e> : "é" U00E9 # LATIN SMALL LETTER E WITH ACUTE
<Multi_key> <e> <apostrophe> : "é" U00E9 # LATIN SMALL LETTER E WITH ACUTE
<Multi_key> <asciicircum> <e> : "ê" U00EA # LATIN SMALL LETTER E WITH CIRCUMFLEX
<Multi_key> <e> <asciicircum> : "ê" U00EA # LATIN SMALL LETTER E WITH CIRCUMFLEX
<Multi_key> <grave> <e> : "è" U00E8 # LATIN SMALL LETTER E WITH GRAVE
@ -634,8 +636,8 @@
<Multi_key> <e> <quotedbl> : "ë" U00EB # LATIN SMALL LETTER E WITH DIAERESIS
<Multi_key> <minus> <h> : "ħ" U0127 # LATIN SMALL LETTER H WITH STROKE
<Multi_key> <h> <minus> : "ħ" U0127 # LATIN SMALL LETTER H WITH STROKE
<Multi_key> <acute> <i> : "í" U00ED # LATIN SMALL LETTER I WITH ACUTE
<Multi_key> <i> <acute> : "í" U00ED # LATIN SMALL LETTER I WITH ACUTE
<Multi_key> <apostrophe> <i> : "í" U00ED # LATIN SMALL LETTER I WITH ACUTE
<Multi_key> <i> <apostrophe> : "í" U00ED # LATIN SMALL LETTER I WITH ACUTE
<Multi_key> <asciicircum> <i> : "î" U00EE # LATIN SMALL LETTER I WITH CIRCUMFLEX
<Multi_key> <i> <asciicircum> : "î" U00EE # LATIN SMALL LETTER I WITH CIRCUMFLEX
<Multi_key> <grave> <i> : "ì" U00EC # LATIN SMALL LETTER I WITH GRAVE
@ -650,8 +652,8 @@
<Multi_key> <l> <slash> : "ł" U0142 # LATIN SMALL LETTER L WITH STROKE
<Multi_key> <asciitilde> <n> : "ñ" U00F1 # LATIN SMALL LETTER N WITH TILDE
<Multi_key> <n> <asciitilde> : "ñ" U00F1 # LATIN SMALL LETTER N WITH TILDE
<Multi_key> <acute> <o> : "ó" U00F3 # LATIN SMALL LETTER O WITH ACUTE
<Multi_key> <o> <acute> : "ó" U00F3 # LATIN SMALL LETTER O WITH ACUTE
<Multi_key> <apostrophe> <o> : "ó" U00F3 # LATIN SMALL LETTER O WITH ACUTE
<Multi_key> <o> <apostrophe> : "ó" U00F3 # LATIN SMALL LETTER O WITH ACUTE
<Multi_key> <asciicircum> <o> : "ô" U00F4 # LATIN SMALL LETTER O WITH CIRCUMFLEX
<Multi_key> <o> <asciicircum> : "ô" U00F4 # LATIN SMALL LETTER O WITH CIRCUMFLEX
<Multi_key> <grave> <o> : "ò" U00F2 # LATIN SMALL LETTER O WITH GRAVE
@ -664,8 +666,8 @@
<Multi_key> <o> <asciitilde> : "õ" U00F5 # LATIN SMALL LETTER O WITH TILDE
<Multi_key> <quotedbl> <o> : "ö" U00F6 # LATIN SMALL LETTER O WITH DIAERESIS
<Multi_key> <o> <quotedbl> : "ö" U00F6 # LATIN SMALL LETTER O WITH DIAERESIS
<Multi_key> <acute> <u> : "ú" U00FA # LATIN SMALL LETTER U WITH ACUTE
<Multi_key> <u> <acute> : "ú" U00FA # LATIN SMALL LETTER U WITH ACUTE
<Multi_key> <apostrophe> <u> : "ú" U00FA # LATIN SMALL LETTER U WITH ACUTE
<Multi_key> <u> <apostrophe> : "ú" U00FA # LATIN SMALL LETTER U WITH ACUTE
<Multi_key> <asciicircum> <u> : "û" U00FB # LATIN SMALL LETTER U WITH CIRCUMFLEX
<Multi_key> <u> <asciicircum> : "û" U00FB # LATIN SMALL LETTER U WITH CIRCUMFLEX
<Multi_key> <grave> <u> : "ù" U00F9 # LATIN SMALL LETTER U WITH GRAVE
@ -674,8 +676,8 @@
<Multi_key> <u> <underscore> : "ū" U016B # LATIN SMALL LETTER U WITH MACRON
<Multi_key> <quotedbl> <u> : "ü" U00FC # LATIN SMALL LETTER U WITH DIAERESIS
<Multi_key> <u> <quotedbl> : "ü" U00FC # LATIN SMALL LETTER U WITH DIAERESIS
<Multi_key> <acute> <y> : "ý" U00FD # LATIN SMALL LETTER Y WITH ACUTE
<Multi_key> <y> <acute> : "ý" U00FD # LATIN SMALL LETTER Y WITH ACUTE
<Multi_key> <apostrophe> <y> : "ý" U00FD # LATIN SMALL LETTER Y WITH ACUTE
<Multi_key> <y> <apostrophe> : "ý" U00FD # LATIN SMALL LETTER Y WITH ACUTE
<Multi_key> <asciicircum> <y> : "ŷ" U0177 # LATIN SMALL LETTER Y WITH CIRCUMFLEX
<Multi_key> <y> <asciicircum> : "ŷ" U0177 # LATIN SMALL LETTER Y WITH CIRCUMFLEX
<Multi_key> <grave> <y> : "ỳ" U1EF3 # LATIN SMALL LETTER Y WITH GRAVE


+ 78
- 80
.config/fontconfig/fonts.conf View File

@ -1,82 +1,80 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
<fontconfig>
<match target="font">
<edit name="antialias" mode="assign">
<bool>true</bool>
</edit>
<edit name="autohint" mode="assign">
<bool>true</bool>
</edit>
<edit name="hinting" mode="assign">
<bool>true</bool>
</edit>
<edit name="hintstyle" mode="assign">
<const>hintslight</const>
</edit>
<edit name="lcdfilter" mode="assign">
<const>lcddefault</const>
</edit>
<edit name="rgba" mode="assign">
<const>rgb</const>
</edit>
</match>
<alias>
<family>monospace</family>
<prefer>
<family>Hack</family>
<family>Fira Code</family>
<family>Fantasque Sans Mono</family>
<family>DejaVu Sans Mono</family>
</prefer>
</alias>
<alias>
<family>sans</family>
<prefer>
<family>Noto Sans</family>
<family>DejaVu Sans</family>
<family>Noto Sans CJK JP</family>
</prefer>
</alias>
<alias>
<family>serif</family>
<prefer>
<family>Noto Serif</family>
<family>DejaVu Serif</family>
<family>Noto Serif CJK JP</family>
</prefer>
</alias>
<alias binding="same">
<family>Cambria</family>
<accept>
<family>Caladea</family>
</accept>
</alias>
<alias binding="same">
<family>Caladea</family>
<default>
<family>Cambria</family>
</default>
</alias>
<alias binding="same">
<family>Times New Roman</family>
<default>
<family>Liberation Serif</family>
</default>
</alias>
<alias binding="same">
<family>Arial</family>
<default>
<family>Liberation Sans</family>
</default>
</alias>
<dir prefix="xdg">fonts</dir>
<match target="font">
<edit name="antialias" mode="assign">
<bool>true</bool>
</edit>
<edit name="autohint" mode="assign">
<bool>true</bool>
</edit>
<edit name="hinting" mode="assign">
<bool>true</bool>
</edit>
<edit name="hintstyle" mode="assign">
<const>hintslight</const>
</edit>
<edit name="lcdfilter" mode="assign">
<const>lcddefault</const>
</edit>
<edit name="rgba" mode="assign">
<const>rgb</const>
</edit>
</match>
<alias>
<family>monospace</family>
<prefer>
<family>Hack</family>
<family>Fira Code</family>
<family>Fantasque Sans Mono</family>
<family>DejaVu Sans Mono</family>
</prefer>
</alias>
<alias>
<family>sans</family>
<prefer>
<family>Noto Sans</family>
<family>DejaVu Sans</family>
<family>Noto Sans CJK JP</family>
</prefer>
</alias>
<alias>
<family>serif</family>
<prefer>
<family>Noto Serif</family>
<family>DejaVu Serif</family>
<family>Noto Serif CJK JP</family>
</prefer>
</alias>
<alias binding="same">
<family>Cambria</family>
<accept>
<family>Caladea</family>
</accept>
</alias>
<alias binding="same">
<family>Caladea</family>
<default>
<family>Cambria</family>
</default>
</alias>
<alias binding="same">
<family>Times New Roman</family>
<default>
<family>Liberation Serif</family>
</default>
</alias>
<alias binding="same">
<family>Arial</family>
<default>
<family>Liberation Sans</family>
</default>
</alias>
<alias binding="same">
<family>Merriweather MG</family>
<default>
<family>Merriweather</family>
</default>
</alias>
<dir prefix="xdg">fonts</dir>
</fontconfig>

+ 14
- 10
.config/git/config View File

@ -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:

+ 5
- 5
.config/mpv/input.conf View File

@ -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:

+ 2
- 1
.config/pycodestyle View File

@ -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:

+ 3
- 3
.config/qutebrowser/config.py View File

@ -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.


+ 27
- 0
.config/vifm/vifmrc View File

@ -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,


+ 1
- 1
.config/youtube-dl/config View File

@ -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:

+ 24
- 9
.local/arch/init.sh View File

@ -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 <<EOF
GRUB_DEFAULT=0
GRUB_TIMEOUT=10
GRUB_TIMEOUT=5
GRUB_DISTRIBUTOR="Arch"
GRUB_CMDLINE_LINUX_DEFAULT="profile ipv6.disable=1"
GRUB_CMDLINE_LINUX=""
GRUB_TERMINAL_INPUT=console
GRUB_GFXMODE=1600x1200x24
GRUB_GFXPAYLOAD_LINUX=keep
GRUB_DISABLE_RECOVERY=true
GRUB_DISABLE_SUBMENU=true
GRUB_THEME=$THEME/theme.txt
GRUB_FONT=$THEME/fonts/DejaVuSansMono14.pf2
# vim:ft=cfg:
EOF
@ -209,13 +207,30 @@ sudo tee /etc/pacman.d/hooks/firefox.hook >/dev/null <<EOF
[Trigger]
Operation = Upgrade
Type = File
Target = usr/bin/firefox-developer-edition
Target = bin/firefox-developer-edition
[Action]
Description = Setting GTK_USE_PORTAL=1 for Firefox...
Description = Making Firefox use KDE dialogs...
When = PostTransaction
Exec = /bin/sed -i /usr/bin/firefox-developer-edition \
-e 's/exec/GTK_USE_PORTAL=1 &/;s/"\$@"/-allow-downgrade &/'
Exec = /usr/bin/sed -i /usr/bin/firefox-developer-edition \
-e 's/exec/GTK_USE_PORTAL=1 &/'
EOF
# }}}
# Disable wine file associations {{{
sudo sed -i /usr/share/wine/wine.inf \
-e 's/winemenubuilder.exe -a -r/winemenubuilder.exe -r/'
sudo tee /etc/pacman.d/hooks/wine.hook >/dev/null <<EOF
[Trigger]
Operation = Upgrade
Type = File
Target = usr/share/wine/wine.inf
[Action]
Description = Stopping Wine from hijacking file associations...
When = PostTransaction
Exec = /usr/bin/sed -i /usr/share/wine/wine.inf \
-e 's/winemenubuilder.exe -a -r/winemenubuilder.exe -r/'
EOF
# }}}
@ -227,7 +242,7 @@ xdg-user-dirs-update --set PUBLICSHARE "$HOME/.local/public"
# Set tty font {{{
sudo tee /etc/vconsole.conf >/dev/null <<'EOF'
KEYMAP=us
FONT=ter-v18n
FONT=ter-v22n
FONT_MAP=8859-2
EOF
sudo sed -i /etc/mkinitcpio.conf \


+ 0
- 1
.local/arch/packages.aur.txt View File

@ -7,7 +7,6 @@ exe-thumbnailer
google-java-format
gulp-cli
htmlhint
hyperfine-bin
kde-thumbnailer-apk
korla-icon-theme
lab-bin


+ 4
- 3
.local/arch/packages.repo.txt View File

@ -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


+ 5
- 10
.local/share/bash/aliases.sh View File

@ -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:

+ 0
- 6
.local/share/bash/bashrc.sh View File

@ -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:

+ 10
- 5
.local/share/bash/functions.sh View File

@ -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 '<string>' && 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 '<place> [country]' && return 1
curl -sS4 "wttr.in/~${1}+${2:-Greece}" | head -n -2
}
sri() { # Prints the SRI hash of a resource
__usage $# 1 '<URL> [algorithm]' && return 1
__usage $# 1 '<URL> [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 '<string>' && 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 '<iso> <usb> [bs]' && return 1
sudo dd if="$1" of="$2" status=progress bs="${3:-4M}" oflag=sync
}
# vim:fdm=syntax:fdl=0:

+ 1
- 3
.local/share/konsole/Default.profile View File

@ -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:

+ 1
- 1
.yarnrc View File

@ -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

Loading…
Cancel
Save