From 65e51faa9eb14eef42dbb2fe77a63a8ded0ae8b9 Mon Sep 17 00:00:00 2001 From: ObserverOfTime Date: Mon, 22 Feb 2021 18:41:12 +0200 Subject: [PATCH] Add neofetch config --- .config/dircolors | 2 + .config/git/config | 42 +++++---- .config/neofetch/config.conf | 165 ++++++++++++++++++++++++++++++++++ .config/pythonrc.py | 1 - .config/qutebrowser/config.py | 15 +++- .config/youtube-dl/config | 2 +- .local/arch/init.sh | 1 + .local/arch/packages.repo.txt | 3 +- .yarnrc | 2 +- README.md | 4 + 10 files changed, 212 insertions(+), 25 deletions(-) create mode 100644 .config/neofetch/config.conf diff --git a/.config/dircolors b/.config/dircolors index 3fdb1a8..e4c9316 100644 --- a/.config/dircolors +++ b/.config/dircolors @@ -95,11 +95,13 @@ STICKY_OTHER_WRITABLE 48;5;10;38;5;16 # dir that is sticky and other-writable .rz 38;5;247 .tar 38;5;247 .taz 38;5;247 +.tbr 38;5;247 .tbz 38;5;247 .tbz2 38;5;247 .tgz 38;5;247 .tlz 38;5;247 .txz 38;5;247 +.tzst 38;5;247 .tz 38;5;247 .whl 38;5;247 .xz 38;5;247 diff --git a/.config/git/config b/.config/git/config index 17540c9..f111f2b 100644 --- a/.config/git/config +++ b/.config/git/config @@ -1,12 +1,15 @@ [user] - email = chronobserver@disroot.org name = ObserverOfTime + email = chronobserver@disroot.org signingkey = 8A2DEA1DBAEBCA9E [core] + autocrlf = false + whitespace = cr-at-eol editor = ${EDITOR:-nvim} - pager = ${PAGER:-nvimpager} - whitespace = tabwidth=4,cr-at-eol + +[extensions] + objectFormat = sha256 [init] defaultBranch = master @@ -48,11 +51,14 @@ [tar "tar.lz4"] command = lz4 -q +[pager] + diff = ${PAGER:-nvimpager} + show = ${PAGER:-nvimpager} + [color "diff"] meta = yellow [diff] - algorithm = patience wsErrorHighlight = all mnemonicPrefix = true @@ -65,14 +71,17 @@ [difftool] prompt = false +[difftool "nvim"] + cmd = nvim -d \"$LOCAL\" \"$REMOTE\" + [difftool "meld"] - cmd = meld "$REMOTE" "$LOCAL" + cmd = meld \"$LOCAL\" \"$REMOTE\" [difftool "imgdiff"] - cmd = compare "$REMOTE" "$LOCAL" png:- | \ + cmd = compare \"$LOCAL\" \"$REMOTE\" png:- | \ montage -geometry 400x -font \ - Liberation-Sans -label "l/%f" "$LOCAL" \ - -label "diff" - -label "r/%f" "$REMOTE" x: + Liberation-Sans -label l/%f \"$LOCAL\" \ + -label diff - -label r/%f \"$REMOTE\" x: [merge] tool = fugitive @@ -81,15 +90,14 @@ keepBackup = false [mergetool "fugitive"] - cmd = nvim -f -c \"Gvdiffsplit!\" \"$MERGED\" + cmd = nvim -f +Gvdiffsplit\\! \"$MERGED\" [mergetool "meld"] - cmd = meld "$LOCAL" "$BASE" "$REMOTE" -o "$MERGED" + cmd = meld \"$LOCAL\" \"$BASE\" \"$REMOTE\" -o \"$MERGED\" [pretty] log = format:%h %s%d [%cn] (%ad) - log-color = format:%C(cyan)%h \ - %Creset%s%C(white)%d %C(yellow)[%an] %Cred(%ad) + color = format:%C(cyan)%h %Creset%s%C(white)%d %C(yellow)[%an] %Cred(%ad) [grep] lineNumber = true @@ -99,8 +107,7 @@ [alias] last = log -1 HEAD hist = log --date=short --graph --pretty=log - ls = log --date=short --graph --pretty=log-color --decorate - ll = log --date=short --graph --pretty=log-color --decorate --numstat + ls = log --date=short --graph --pretty=color --decorate rev = log --decorate --reverse --no-merges --stat @{1}.. amend = commit --amend -uno -a wdiff = diff --word-diff @@ -108,15 +115,12 @@ conflicts = diff --name-only --diff-filter=U root = rev-parse --show-toplevel shallow = clone --single-branch --depth=1 + compare = !git log $1...$2 --format=%m\\ %h\\ %s --left-right repush = !git commit --amend -a --no-edit && git push --force - fork-sync = "! \ - 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}" [filter "lfs"] - process = git-lfs filter-process required = true + process = git-lfs filter-process clean = git-lfs clean -- %f smudge = git-lfs smudge -- %f diff --git a/.config/neofetch/config.conf b/.config/neofetch/config.conf new file mode 100644 index 0000000..f0a0c01 --- /dev/null +++ b/.config/neofetch/config.conf @@ -0,0 +1,165 @@ +# See this wiki page for more info: +# https://github.com/dylanaraps/neofetch/wiki/Customizing-Info + +# shellcheck disable=SC2034,SC2154 + +get_de_wm() { + ((wm_run != 1)) && get_wm + ((de_run != 1)) && get_de + de_wm="$de ($wm)" +} + +get_terminal() { + ((term_run != 1)) && get_term + ((term_font_run != 1)) && get_term_font + terminal="${term^} ($term_font)" +} + +print_info() { + info "OS" distro + info "Kernel" kernel + info "Host" model + info "Uptime" uptime + info "Shell" shell + info "Resolution" resolution + info "DE & WM" de_wm + info "Theme" theme + info "Icons" icons + info "Terminal" terminal + info "CPU" cpu + info "GPU" gpu + info "Memory" memory + info "Disk" disk + info "Battery" battery +} + +# Hide/Show Fully qualified domain name. +# Values: 'on', 'off' +title_fqdn="off" + +# Shorten the output of the kernel function. +# Values: 'on', 'off' +kernel_shorthand="on" + +# Shorten the output of the distro function +# Values: 'on', 'tiny', 'off' +distro_shorthand="off" + +# Show/Hide OS Architecture. +# Values: 'on', 'off' +os_arch="off" + +# Shorten the output of the uptime function +# Values: 'on', 'tiny', 'off' +uptime_shorthand="tiny" + +# Show memory pecentage in output. +# Values: 'on', 'off' +memory_percent="on" + +# Show/Hide Package Manager names. +# Values: 'on', 'tiny' 'off' +package_managers="off" + +# Show the path to $SHELL +# Values: 'on', 'off' +shell_path="off" + +# Show $SHELL version +# Values: 'on', 'off' +shell_version="on" + +# CPU speed type +# Values: 'scaling_cur_freq', 'scaling_min_freq', +# 'scaling_max_freq', 'bios_limit', 'cpufreq'. +speed_type="cpufreq" + +# CPU speed shorthand +# Values: 'on', 'off'. +speed_shorthand="on" + +# Enable/Disable CPU brand in output. +# Values: 'on', 'off' +cpu_brand="off" + +# Hide/Show CPU speed. +# Values: 'on', 'off' +cpu_speed="on" + +# Display CPU cores in output +# Values: 'logical', 'physical', 'off' +cpu_cores="logical" + +# Hide/Show CPU temperature. +# Values: 'C', 'F', 'off' +cpu_temp="off" + +# Enable/Disable GPU Brand +# Values: 'on', 'off' +gpu_brand="on" + +# Which GPU to display +# Values: 'all', 'dedicated', 'integrated' +gpu_type="all" + +# Display refresh rate next to each monitor +# Values: 'on', 'off' +refresh_rate="on" + +# Shorten output of GTK Theme / Icons / Font +# Values: 'on', 'off' +gtk_shorthand="off" + +# Enable/Disable gtk2 Theme / Icons / Font +# Values: 'on', 'off' +gtk2="on" + +# Enable/Disable gtk3 Theme / Icons / Font +# Values: 'on', 'off' +gtk3="on" + +# Website to ping for the public IP +# Values: 'url' +public_ip_host="https://v4.ident.me" + +# Public IP timeout. +# Values: 'int' +public_ip_timeout=2 + +# Show Desktop Environment version +# Values: 'on', 'off' +de_version="on" + +# Which disks to display. +# The values can be any /dev/sdXX, mount point or directory. +disk_show=('/dev/nvme0n1p2' '/dev/sda2' '/dev/sdb2') + +# What to append to the Disk subtitle. +# Values: 'mount', 'name', 'dir', 'none' +disk_subtitle="name" + +# Show/Hide disk percent. +# Values: 'on', 'off' +disk_percent="on" + +# Bar characters +# Values: 'string', 'string' +bar_char_elapsed="=" +bar_char_total="-" + +# Toggle Bar border +# Values: 'on', 'off' +bar_border="on" + +# Progress bar length in spaces +# Values: 'num' +bar_length=25 + +# Info display +# Values: 'bar', 'infobar', 'barinfo', 'off' +cpu_display="off" +memory_display="off" +battery_display="bar" +disk_display="off" + +# vim:ft=sh: diff --git a/.config/pythonrc.py b/.config/pythonrc.py index 562da9c..69d4857 100644 --- a/.config/pythonrc.py +++ b/.config/pythonrc.py @@ -1,7 +1,6 @@ import atexit import os import readline -import sys histfile = os.path.join(os.getenv( 'XDG_CACHE_HOME', os.path.expanduser('~/.cache') diff --git a/.config/qutebrowser/config.py b/.config/qutebrowser/config.py index b53e59c..e3cf5c7 100644 --- a/.config/qutebrowser/config.py +++ b/.config/qutebrowser/config.py @@ -9,11 +9,24 @@ c.colors.webpage.prefers_color_scheme_dark = True # Require a confirmation before quitting the application. c.confirm_quit = ['downloads'] +# List of URLs to ABP-style adblocking rulesets. {{{1 +c.content.blocking.adblock.lists = [ + 'https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters.txt', # noqa + 'https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/privacy.txt', # noqa + 'https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/annoyances.txt', # noqa + 'https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/resource-abuse.txt', # noqa + 'https://raw.githubusercontent.com/kargig/greek-adblockplus-filter/master/void-gr-filters.txt', # noqa + 'https://raw.githubusercontent.com/ryanbr/fanboy-adblock/master/fanboy-antifacebook.txt', # noqa + 'https://raw.githubusercontent.com/hoshsadiq/adblock-nocoin-list/master/nocoin.txt', # noqa + 'https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/unbreak.txt', # noqa +] +# }}} + # Default encoding to use for websites. c.content.default_encoding = 'utf-8' # Value to send in the Accept-Language header. -c.content.headers.accept_language = 'en_GB,en' +c.content.headers.accept_language = 'en-GB,en,el;q=0.9' # User agent to send. c.content.headers.user_agent = ' '.join(( diff --git a/.config/youtube-dl/config b/.config/youtube-dl/config index 14820ae..ca00136 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/2021.02.04" +--user-agent "Mozilla/5.0 (Linux x86_64) youtube-dl/2021.02.22" # vim:ft=conf: diff --git a/.local/arch/init.sh b/.local/arch/init.sh index a4351ab..e603a5d 100755 --- a/.local/arch/init.sh +++ b/.local/arch/init.sh @@ -219,6 +219,7 @@ sudo tee /usr/local/bin/wget >/dev/null <<'EOF' exec /usr/bin/wget "$@" \ --hsts-file="${XDG_CACHE_HOME:-$HOME}/.wget-hsts" EOF +sudo chmod +x /usr/local/bin/{jarwrapper,sqlite3,wget} # }}} # Configure binfmt {{{ diff --git a/.local/arch/packages.repo.txt b/.local/arch/packages.repo.txt index 16f72b6..9361826 100644 --- a/.local/arch/packages.repo.txt +++ b/.local/arch/packages.repo.txt @@ -101,7 +101,7 @@ lib32-gst-plugins-good lib32-gst-plugins-ugly lib32-mesa-tkg-git lib32-vulkan-icd-loader -linux-firmware +linux-firmware-git linux-tkg-pds linux-tkg-pds-headers lldb @@ -153,7 +153,6 @@ qt5-imageformats qutebrowser r rclone -reflector ripgrep rstcheck rsync diff --git a/.yarnrc b/.yarnrc index e5942d7..0a720ac 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.10 node/v15.8.0 linux x64" +user-agent "yarn/1.22.10 node/v15.9.0 linux x64" username ObserverOfTime version-git-sign true diff --git a/README.md b/README.md index ad75164..f22b30d 100644 --- a/README.md +++ b/README.md @@ -74,6 +74,10 @@ Managed via [dotfiles.sh](https://github.com/eli-schwartz/dotfiles.sh) * [.config/mpv/input.conf](.config/mpv/input.conf): keybindings * [.config/mpv/mpv.conf](.config/mpv/mpv.conf): configuration file +## [Neofetch](https://github.com/dylanaraps/neofetch) + +* [.config/neofetch/config.conf](.config/neofetch/config.conf): configuration file + ## [Neovim](https://neovim.io/) > [In another repo](https://github.com/ObserverOfTime/dotnvim)