From a471265d976e7a87d7f7606a4b43c522aadaefc1 Mon Sep 17 00:00:00 2001 From: ObserverOfTime Date: Sat, 25 Apr 2020 22:12:40 +0300 Subject: [PATCH] More updates --- .bash_profile | 19 ++- .config/dircolors | 1 + .config/fontconfig/fonts.conf | 29 ++++- .config/git/config | 27 ++++- .config/mpv/input.conf | 6 +- .config/mpv/mpv.conf | 21 ++-- .config/pip/pip.conf | 2 - .config/qutebrowser/config.py | 6 +- .config/vifm/vifmrc | 210 +++++++++++++++++++++------------- .config/youtube-dl/config | 2 +- .local/arch/init.sh | 4 + .local/arch/packages.aur.txt | 3 - .local/arch/packages.repo.txt | 9 +- .local/share/gnupg/gpg.conf | 2 +- .yarnrc | 2 +- 15 files changed, 230 insertions(+), 113 deletions(-) diff --git a/.bash_profile b/.bash_profile index 4594a90..e889534 100644 --- a/.bash_profile +++ b/.bash_profile @@ -74,7 +74,8 @@ export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME/npm/npmrc" # }}} # Set the paths used by android {{{ -export ANDROID_SDK_HOME="$HOME/.local/android" +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" export GRADLE_USER_HOME="$XDG_DATA_HOME/gradle" @@ -102,9 +103,23 @@ export CCACHE_DIR="$XDG_CACHE_HOME/ccache" export GNUPGHOME="$XDG_DATA_HOME/gnupg" # }}} -# Set the paths used by idea {{{ +# Set the paths used by docker {{{ +export DOCKER_CONFIG="$XDG_CONFIG_HOME/docker" +# }} + +# Set the paths used by texlive {{{ +export TEXMFCONFIG="$XDG_CONFIG_HOME/texmf" +export TEXMFHOME="$XDG_DATA_HOME/texmf" +export TEXMFVAR="$XDG_CACHE_HOME/texmf" +# }}} + +# Set the paths used by jetbrains {{{ export IDEA_PROPERTIES="$XDG_CONFIG_HOME/intellij-idea/idea.properties" export IDEA_VM_OPTIONS="$XDG_CONFIG_HOME/intellij-idea/idea.vmoptions" +export CLION_PROPERTIES="$XDG_CONFIG_HOME/clion/clion.properties" +export CLION_VM_OPTIONS="$XDG_CONFIG_HOME/clion/clion.vmoptions" +export PYCHARM_PROPERTIES="$XDG_CONFIG_HOME/pycharm/charm.properties" +export PYCHARM_VM_OPTIONS="$XDG_CONFIG_HOME/pycharm/charm.vmoptions" # }}} # Set the search path for commands {{{ diff --git a/.config/dircolors b/.config/dircolors index 8a3d564..a52645d 100644 --- a/.config/dircolors +++ b/.config/dircolors @@ -106,6 +106,7 @@ STICKY_OTHER_WRITABLE 48;5;10;38;5;16 # dir that is sticky and other-writable .z 38;5;247 .zip 38;5;247 .zoo 38;5;247 +.zst 38;5;247 # }}} # image formats (magenta) {{{ diff --git a/.config/fontconfig/fonts.conf b/.config/fontconfig/fonts.conf index ad37270..aaef83a 100644 --- a/.config/fontconfig/fonts.conf +++ b/.config/fontconfig/fonts.conf @@ -27,7 +27,6 @@ Hack Fira Code - Code New Roman Fantasque Sans Mono DejaVu Sans Mono @@ -51,5 +50,33 @@ + + Cambria + + Caladea + + + + + Caladea + + Cambria + + + + + Times New Roman + + Liberation Serif + + + + + Arial + + Liberation Sans + + + fonts diff --git a/.config/git/config b/.config/git/config index 74751cc..b7b140c 100644 --- a/.config/git/config +++ b/.config/git/config @@ -8,12 +8,12 @@ pager = ${PAGER:-nvimpager} whitespace = tabwidth=4,cr-at-eol +[advice] + detachedHead = false + [credential] helper = store -[gpg] - program = gpg2 - [commit] gpgSign = true status = true @@ -21,6 +21,27 @@ [status] submoduleSummary = 1 +[tar "tar.gz"] + command = gzip -c -f -n + +[tar "tgz"] + command = gzip -c -f -n + +[tar "tar.bz2"] + command = bzip2 -c -f + +[tar "tar.xz"] + command = xz -c -z - + +[tar "tar.zst"] + command = zstd -c -z -q - + +[tar "tar.lz"] + command = lzip -c -f + +[tar "tar.lz4"] + command = lz4 -q + [color "diff"] meta = yellow diff --git a/.config/mpv/input.conf b/.config/mpv/input.conf index 4ee9312..2e4f671 100644 --- a/.config/mpv/input.conf +++ b/.config/mpv/input.conf @@ -20,8 +20,8 @@ MBTN_LEFT_DBL cycle fullscreen l cycle-values loop-file "inf" "no" L cycle-values loop-playlist "inf" "no" -V cycle-values video-aspect "16:9" "4:3" "-1" -H cycle-values hwdec "no" "auto-copy" +V cycle-values video-params/aspect "16:9" "4:3" "-1" +H cycle-values hwdec "no" "auto-copy-safe" # }}} @@ -133,12 +133,14 @@ Ctrl+s screenshot window ? show-text ${playlist} I show-text ${track-list} +` show-text ${mpv-version} # }}} # script-binding {{{ i script-binding stats/display-stats-toggle +D script-binding discord/toggle-discord-rpc o script-binding kdialog/open-files O script-binding kdialog/open-url T script-binding kdialog/open-subs diff --git a/.config/mpv/mpv.conf b/.config/mpv/mpv.conf index 2cfce4e..902cc99 100644 --- a/.config/mpv/mpv.conf +++ b/.config/mpv/mpv.conf @@ -1,6 +1,3 @@ -# Profile -profile=gpu-hq - # Audio {{{ # Specify the audio output drivers to be used. @@ -25,13 +22,6 @@ slang=eng,ell # }}} -# Miscellaneous {{{ - -# How the player synchronizes audio and video. -video-sync=display-resample - -# }}} - # Network {{{ # User agent for HTTP streaming. @@ -75,10 +65,13 @@ ytdl-raw-options="yes-playlist=" screenshot-directory=~/Pictures/ # Set the image file type used for saving screenshots. -screenshot-format=png +screenshot-format=webp -# Set the PNG compression level. -screenshot-png-compression=8 +# Set the WebP compression level. +screenshot-webp-compression=5 + +# Write lossless WebP files. +screenshot-webp-lossless=yes # Specify the filename template used to save screenshots. screenshot-template=shot_%F_%wH-%wM-%wS @@ -89,7 +82,7 @@ screenshot-template=shot_%F_%wH-%wM-%wS # Specify the hardware video decoding API # that should be used if possible. -hwdec=auto-copy +hwdec=none # Specify the video output backend to be used. vo=gpu diff --git a/.config/pip/pip.conf b/.config/pip/pip.conf index 5a83401..541b6ed 100644 --- a/.config/pip/pip.conf +++ b/.config/pip/pip.conf @@ -6,8 +6,6 @@ disable-pip-version-check = true [download] # Include pre-release and development versions. pre = true -# Do not use binary packages. -no-binary = :all: # Specify type of progress to be displayed. progress-bar = pretty diff --git a/.config/qutebrowser/config.py b/.config/qutebrowser/config.py index b668fee..8170197 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.0', + 'QtWebEngine/5.14.2', 'Chromium/77.0.3865.129', - 'qutebrowser/1.10.1' + 'qutebrowser/1.10.2' )) # Allow JavaScript to read from or write to the clipboard. @@ -88,7 +88,7 @@ c.url.start_pages = [ # Search engines which can be used via the address bar. c.url.searchengines = { 'DEFAULT': c.url.start_pages[0] + '&q={}', - 'G': 'https://google.com/?q={}', + 'G': 'https://google.com/search?q={}', 'Q': 'https://qwant.com/?q={}' } diff --git a/.config/vifm/vifmrc b/.config/vifm/vifmrc index eb3f74b..8798281 100644 --- a/.config/vifm/vifmrc +++ b/.config/vifm/vifmrc @@ -25,16 +25,16 @@ set fillchars=vborder:┊ set grepprg=rg\ --color=never\ -Hn\ %i\ %a\ %s " Use fd instead of find -set findprg=fd\ --color=never\ %a\ %s +set findprg=fd\ --color=never\ %p\ %s " What should be saved automatically between vifm runs -set vifminfo=chistory,shistory,bookmarks,bmarks +set vifminfo=chistory,shistory " Maximum number of stored items in all histories set history=100 " Path to trash directory -set trashdir=~/.Trash +set trashdir=~/.cache/trash " Ignore case in search patterns unless " it contains at least one uppercase letter @@ -58,6 +58,9 @@ set statusline=' %t%= %A %10u:%-7g %15E %20d ' " Selected color scheme colorscheme ph +" Set --login flag for bash shell +let $SHELL = '/bin/bash --login' + " Single pane when started via vim plugin if $MYVIMRC != '' | only | endif " }}} @@ -73,10 +76,11 @@ if $MYVIMRC != '' | only | endif " %d the current directory name " %D the other window directory name " %m run the command in a menu window -command! df df -h %m 2>/dev/null -command! diff nvim -d %f %F +command! df df -h %a %m +command! diff diff %a %b %m command! make !!make %a -command! run !!./%f +command! run !!./%f %a +command! vdiff nvim -d %a %b " }}} " File types {{{ @@ -87,15 +91,19 @@ command! run !!./%f " Documents {{{ filextype *.pdf,*.epub \ {Zathura} zathura %f %i &, - \ {Okular} okular %f &, - \ {MComix} mcomix %f &, - \ {QComicBook} qcomicbook %f & -filextype *.odt,*.doc,*.docx,*.xls,*.xlsx,*.odp,*.pptx - \ {Libre Office} libreoffice %f & + \ {Okular} okular %f %i &, + \ {MComix} mcomix %f %i & +filextype *.doc,*.docx,*.odt + \ {Calligra} calligrawords %f %i & +filextype *.ppt,*.pptx,*.odp + \ {Calligra} calligrastage %f %i & +filextype *.xls,*.xlsx,*.csv + \ {Calligra} calligrasheets %f %i & fileviewer *.pdf pdftotext -nopgbrk %c - -fileviewer *.epub epub2txt %c -fileviewer *.docx docx2txt %f - -fileviewer *.odt odt2txt %f +fileviewer *.epub pandoc -f epub -t plain %c +fileviewer *.docx pandoc -f docx -t plain %c +fileviewer *.odt pandoc -f odt -t plain %c +fileviewer *.ipynb pandoc -f ipynb -t gfm %c " }}} " Audio {{{ @@ -115,22 +123,6 @@ filetype *.aac, \*.wav, \*.xspf \ {MPV} mpv %f & -filextype *.aac, - \*.au, - \*.axa, - \*.flac, - \*.mid, - \*.midi, - \*.mka, - \*.mp3, - \*.mpc, - \*.oga, - \*.ogg, - \*.ra, - \*.spx, - \*.wav, - \*.xspf - \ {SMPlayer} smplayer %f & fileviewer *.aac, \*.au, \*.axa, @@ -182,8 +174,7 @@ filextype *.anx, \*.xcf, \*.xwd, \*.yuv - \ {MPV} mpv %f &, - \ {SMPlayer} smplayer %f & + \ {MPV} mpv %f & fileviewer *.anx, \*.asf, \*.avi, @@ -221,6 +212,41 @@ fileviewer *.anx, " Images {{{ filextype *.apng, + \*.bmp, + \*.gif, + \*.ico, + \*.icon, + \*.j2k, + \*.jp2, + \*.jpeg, + \*.jpf, + \*.jpg, + \*.jpm, + \*.jpx, + \*.mng, + \*.pbm, + \*.pcx, + \*.pgm, + \*.png, + \*.ppm, + \*.tga, + \*.tif, + \*.tiff, + \*.webp, + \*.xbm, + \*.xpm + \ {ImageMagick} display %f %i &, + \ {Eye of Gnome} eog %f %i &, + \ {Gwenview} gwenview %f %i &, + \ {GIMP} gimp %f %i &, + \ {Krita} krita %f %i & +filextype *.svg,*.svgz + \ {ImageMagick} display %f %i &, + \ {Eye of Gnome} eog %f %i &, + \ {Gwenview} gwenview %f %i &, + \ {Inkscape} inkscape %f %i &, + \ {Karbon} karbon %f %i & +fileviewer *.apng, \*.bmp, \*.gif, \*.ico, @@ -246,8 +272,7 @@ filextype *.apng, \*.webp, \*.xbm, \*.xpm - \ {Eye of Gnome} eog %f &, - \ {Gwenview} gwenview %f & + \ identify %c " }}} " Archives {{{ @@ -266,98 +291,119 @@ filextype *.7z, \*.tar.bz2, \*.tar.gz, \*.tar.xz, + \*.tar.zst, \*.tbz2, \*.tgz, \*.txz, \*.war, \*.zip - \ {Ark} ark %f &, - \ {7zFM} 7zFM %f &, - \ {File Roller} file-roller %f & + \ {Ark} ark %f %i & filextype *.7z, \*.cb7, \*.cbr, \*.cbz, \*.rar, \*.zip - \ {MComix} mcomix %f &, - \ {Zathura} zathura %f &, - \ {QComicBook} qcomicbook %f & -" filetype *.deb {Install} sudo dpkg -i %f -" filetype *.rpm {Install} sudo dnf install %f -filetype *.pkg.tar,*.pkg.tar.* {Install} yay -U %f -fileviewer *.7z 7z l %c + \ {MComix} mcomix %f %i &, + \ {Zathura} zathura %f %i & +filetype *.7z,*.cb7 {Extract} 7z x %f +filetype *.asar {Extract} asar e %f %f:r +filetype *.rar,*.cbr {Extract} unrar %f +filetype *.tar {Extract} tar xf %f +filetype *.tar.br {Extract} tar -I brotli -xf %f +filetype *.tar.bz2,*.tbz2 {Extract} tar xjf %f +filetype *.tar.gz,*.tgz {Extract} tar xzf %f +filetype *.tar.xz,*.txz {Extract} tar xJf %f +filetype *.tar.zst {Extract} tar -I zst -xf %f +filetype *.apk, + \*.cbz, + \*.ear, + \*.jar, + \*.oxt, + \*.war, + \*.zip + \ {Extract} unzip %f +filetype *.pkg.tar,*.pkg.tar.* + \ {Install} sudo pacman -U %f +fileviewer *.7z,*.cb7 7z l %c fileviewer *.asar asar l %c -fileviewer *.rar unrar v %c +fileviewer *.rar,*.cbr unrar v %c fileviewer *.tar tar tf %c +fileviewer *.tar.br tar -I brotli -tf %c fileviewer *.tar.bz2,*.tbz2 tar tjf %c fileviewer *.tar.gz,*.tgz tar tzf %c fileviewer *.tar.xz,*.txz tar tJf %c -fileviewer *.zip,*.jar,*.war,*.ear,*.apk,*.oxt zip -sf %c +fileviewer *.tar.zst tar -I zst -tf %c +fileviewer *.apk, + \*.cbz, + \*.ear, + \*.jar, + \*.oxt, + \*.war, + \*.zip + \ zip -sf %c " }}} " Web {{{ filextype *.html,*.htm - \ {Qutebrowser} qutebrowser %f %i &, - \ {Firefox} firefox %f &, - \ {Iridium} iridium %f & + \ {qutebrowser} qutebrowser -- %f %i &, + \ {Firefox} firefox -- %f %i &, + \ {Chromium} chromium -- %f %i & " }}} " Hashes {{{ -filetype *.md5 {Check MD5 hash} md5sum -c %f %S -filetype *.sha1 {Check SHA1 hash} sha1sum -c %f %S -filetype *.sha256 {Check SHA256 hash} sha256sum -c %f %S -filetype *.sha512 {Check SHA512 hash} sha512sum -c %f %S +filetype *.md5 {Verify} md5sum -c %f %S +filetype *.sha1 {Verify} sha1sum -c %f %S +filetype *.sha256 {Verify} sha256sum -c %f %S +filetype *.sha512 {Verify} sha512sum -c %f %S " }}} " Torrents {{{ filetype *.torrent {Aria2} aria2c %f & -filextype *.torrent {Deluge} deluge %f & +filextype *.torrent {qBittorrent} qbittorent %f %i & fileviewer *.torrent dump_torrent -v %c " }}} " GPG files {{{ -filetype *.asc,*.sig {Check signature} gpg2 --verify %c -fileviewer *.gpg gpg2 --decrypt %f +filetype *.asc,*.sig {Verify} gpg --verify %c +fileviewer *.gpg gpg --decrypt %c " }}} -" Binaries & objects {{{ -filextype *.out,*.exe,*.bin okteta %f & +" Binary files {{{ +filextype *.out,*.exe,*.bin {Okteta} okteta %f %i & +filextype *.class + \ {Okteta} okteta %f %i &, + \ {Decompile} cfr %f --outputdir %d %i & fileviewer *.out,*.exe,*.bin xxd -u %c +fileviewer *.class cfr %c +fileviewer *.lnk pylnker %c fileviewer *.o nm %c " }}} " IDE projects {{{ filextype *.pro - \ {Qt Creator} qtcreator %f &, - \ {CLion} clion %d & + \ {Qt Creator} qtcreator %f %i &, + \ {CLion} clion %d %i & filextype .idea/ - \ {CLion} clion %d &, - \ {IntelliJ} intellij-idea-ultimate-edition %d &, - \ {PhpStorm} phpstorm %d &, - \ {PyCharm} pycharm %d &, -" }}} - -" Directories {{{ -filextype */ - \ {Dolphin} dolphin %f &, - \ {Gwenview} gwenview %f &, - \ {SMPlayer} smplayer ^f &, - \ {MPV} mpv %f & + \ {IntelliJ} intellij-idea-ultimate-edition %d %i &, + \ {CLion} clion %d %i &, + \ {PhpStorm} phpstorm %d %i &, + \ {PyCharm} pycharm %d %i & " }}} " Other {{{ +filextype */ + \ {Dolphin} dolphin %f %i &, + \ {Gwenview} gwenview %f %i &, + \ {MPV} mpv %f & filetype * {Default} xdg-open " }}} - " }}} " Marks {{{ -mark g ~/Documents/Code/GitHub/ +mark c ~/Documents/Code/ mark h ~/ mark t /tmp/ -mark u ~/Windows/ -mark w /media/windows/ " }}} " Mappings {{{ @@ -365,7 +411,7 @@ mark w /media/windows/ nnoremap S :shell " Start terminal in current directory -nnoremap T :!konsole --workdir "%d" & +nnoremap T :!konsole --workdir %d %i & " Display sorting dialog nnoremap s :sort @@ -378,10 +424,16 @@ nnoremap w :view vnoremap w :viewgv " Yank current directory path into the clipboard -nnoremap yd :!xclip %i <<< "%d" +nnoremap yd :!printf -- %d | xclip -sel c %i " Yank current file path into the clipboard -nnoremap yf :!xclip %i <<< "%c:p" +nnoremap yf :!printf -- %c:p | xclip -sel c %i + +" Yank current file contents into the clipboard +nnoremap yc :!xlip -sel c -i %c %i + +" Open filetype dialog +nnoremap o :file " Quit vifm nnoremap Q :quit diff --git a/.config/youtube-dl/config b/.config/youtube-dl/config index d5547b0..f67762c 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.08" +--user-agent "Mozilla/5.0 (Linux x86_64) youtube-dl/2020.03.24" # vim:ft=conf: diff --git a/.local/arch/init.sh b/.local/arch/init.sh index 0812061..075bb63 100755 --- a/.local/arch/init.sh +++ b/.local/arch/init.sh @@ -115,6 +115,8 @@ declare -A ALIASES=( [godoc]=go [gradlew]=gradle [bundler]=bundle + [mvnDebug]=mvn + [mvnw]=mvn ) mkdir -p "$DIRECTORY" aria2c -d "$DIRECTORY" -i - <> "$DIRECTORY/ffmpeg" printf 'complete -o default -F _clang clang++\n' >> "$DIRECTORY/clang" diff --git a/.local/arch/packages.aur.txt b/.local/arch/packages.aur.txt index 6a777e9..3ab7af3 100644 --- a/.local/arch/packages.aur.txt +++ b/.local/arch/packages.aur.txt @@ -8,7 +8,6 @@ google-java-format gulp-cli htmlhint hyperfine-bin -iridium-deb kde-thumbnailer-apk korla-icon-theme lab-bin @@ -27,9 +26,7 @@ sha3sum shellcheck-static stylelint svgo -syncplay-git trackma-git -ttf-ms-fonts ttf-twemoji-color vale-bin waifu2x-ncnn-vulkan-git diff --git a/.local/arch/packages.repo.txt b/.local/arch/packages.repo.txt index 74292ea..6556506 100644 --- a/.local/arch/packages.repo.txt +++ b/.local/arch/packages.repo.txt @@ -46,7 +46,6 @@ git-lfs glances gnupg go -goldendict gradle grunt-cli gst-plugins-bad @@ -111,9 +110,12 @@ networkmanager-pptp newsboat node-gyp nodejs +noto-fonts-cjk ntfs-3g okteta okular +openjdk-doc +openjdk8-doc optipng otf-fantasque-sans-mono otf-fira-code @@ -134,6 +136,7 @@ python-sphinx python-urwid qbittorrent qemu +qt5-imageformats qutebrowser r rclone @@ -156,6 +159,8 @@ texlive-latexextra thunderbird tor-browser ttf-hack +ttf-lato +ungoogled-chromium unzip valgrind vifm @@ -165,7 +170,9 @@ whois wine words xclip +xdg-desktop-portal-kde xdg-user-dirs +xdotool yarn yay youtube-dl diff --git a/.local/share/gnupg/gpg.conf b/.local/share/gnupg/gpg.conf index 37401da..aa6bf79 100644 --- a/.local/share/gnupg/gpg.conf +++ b/.local/share/gnupg/gpg.conf @@ -27,7 +27,7 @@ personal-cipher-preferences AES256 AES AES192 CAST5 personal-digest-preferences SHA256 SHA512 SHA384 SHA224 # The command line that should be run to view a photo ID -photo-viewer "eog %i" +photo-viewer "display %i" # Use the following options when verifying signatures verify-options show-photos pka-lookup diff --git a/.yarnrc b/.yarnrc index 57a3de6..6dc6afb 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.11.0 linux x64" +user-agent "yarn/1.22.4 node/v13.13.0 linux x64" username ObserverOfTime version-git-sign true