diff --git a/.config/bottom/bottom.toml b/.config/bottom/bottom.toml new file mode 100644 index 0000000..dc5dec9 --- /dev/null +++ b/.config/bottom/bottom.toml @@ -0,0 +1,27 @@ +[flags] +# Puts the CPU chart legend to the left side. +left_legend = true +# Groups processes with the same name by default. +group_processes = true +# Uses the older network legend. +use_old_network_legend = true +# Shows the battery widget. +battery = true +# Use a color scheme. +color = "gruvbox" +# Defaults to showing process memory usage by value. +mem_as_value = true +# Defaults to showing the process widget in tree mode. +tree = true + +[disk_filter] +list = ["/dev/nvme0n1p1"] +is_list_ignored = true +whole_word = true +regex = false + +[mount_filter] +list = ["/mnt/swap"] +is_list_ignored = true +whole_word = true +regex = false diff --git a/.config/fontconfig/fonts.conf b/.config/fontconfig/fonts.conf index 1e9c2a8..389d75c 100644 --- a/.config/fontconfig/fonts.conf +++ b/.config/fontconfig/fonts.conf @@ -1,8 +1,6 @@ - - + + - - fonts @@ -160,12 +158,24 @@ Carlito + + Consolas + + DMCA Sans Serif + + Palatino Linotype P052 + + Sitka Heading + + Libertinus Serif Display + + Helvetica @@ -190,5 +200,7 @@ Noto Sans + + fonts diff --git a/.config/git/config b/.config/git/config index c780958..db0d4ab 100644 --- a/.config/git/config +++ b/.config/git/config @@ -7,6 +7,7 @@ autocrlf = false whitespace = cr-at-eol editor = ${EDITOR:-nvim} + pager = ${PAGER:-nvimpager} askpass = ksshaskpass [extensions] @@ -25,6 +26,18 @@ [credential "https://github.com"] helper = !gh auth git-credential +[credential "https://gitlab.com"] + helper = !glab auth git-credential + +[credential "https://framagit.org"] + helper = !glab auth git-crendential + +[credential "https://gitlab.archlinux.org"] + helper = !glab auth git-crendential + +[credential "https://invent.kde.org"] + helper = !glab auth git-crendential + [commit] gpgSign = true status = true @@ -32,6 +45,9 @@ [push] autoSetupRemote = true +[rebase] + autoSquash = true + [status] submoduleSummary = 1 @@ -59,16 +75,27 @@ [tar "tar.br"] command = brotli -c -f -[pager] - diff = ${PAGER:-nvimpager} - show = ${PAGER:-nvimpager} +[color] + ui = true [color "diff"] meta = yellow + frag = magenta bold + commit = yellow bold + old = red bold + new = brightgreen bold + whitespace = red reverse + +[color "diff-highlight"] + oldNormal = red bold + oldHighlight = red bold 52 + newNormal = brightgreen bold + newHighlight = brightgreen bold 22 [diff] wsErrorHighlight = all mnemonicPrefix = true + colorMoved = default [diff "hex"] textconv = hexdump -v -C @@ -85,7 +112,7 @@ [difftool "meld"] cmd = meld \"$LOCAL\" \"$REMOTE\" -[difftool "imgdiff"] +[difftool "magick"] cmd = compare \"$LOCAL\" \"$REMOTE\" png:- | \ montage -geometry 400x -font \ Liberation-Sans -label l/%f \"$LOCAL\" \ @@ -98,20 +125,29 @@ keepBackup = false [mergetool "fugitive"] - cmd = nvim -f +Gvdiffsplit\\! \"$MERGED\" + cmd = nvim --cmd let\\ g:_mergetool=v:true +Gvdiffsplit\\! \"$MERGED\" [mergetool "meld"] cmd = meld \"$LOCAL\" \"$BASE\" \"$REMOTE\" -o \"$MERGED\" [pretty] - log = format:%h %s%d [%cn] (%ad) - color = format:%C(cyan)%h %Creset%s%C(white)%d %C(yellow)[%an] %Cred(%ad) + log = format:%C(auto,cyan)%h %Creset%s%d %C(auto,yellow)[%an] %C(auto,red)(%ad) [grep] lineNumber = true patternType = perl fallbackToNoIndex = true +[diff-so-fancy] + markEmptyLines = false + +[delta] + navigate = true + line-numbers = true + relative-paths = true + syntax-theme = gruvbox-dark + pager = less -R + [alias] last = log -1 HEAD hist = log --date=short --graph --pretty=log @@ -126,10 +162,10 @@ repush = !git commit --amend -a --no-edit && git push --force-with-lease [filter "lfs"] - required = true - process = git-lfs filter-process clean = git-lfs clean -- %f smudge = git-lfs smudge -- %f + process = git-lfs filter-process + required = true [url "git@github.com:"] insteadOf = http://github.com/ @@ -146,5 +182,3 @@ [url "aur@aur.archlinux.org:"] insteadOf = http://aur.archlinux.org/ insteadOf = @aur: - -# vim:noet:sw=4:ts=4: diff --git a/.config/htop/htoprc b/.config/htop/htoprc deleted file mode 100644 index 271b893..0000000 --- a/.config/htop/htoprc +++ /dev/null @@ -1,63 +0,0 @@ -# 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 -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 -highlight_changes_delay_secs=5 -find_comm_in_cmdline=1 -strip_exe_from_cmdline=1 -show_merged_command=1 -header_margin=1 -screen_tabs=0 -detailed_cpu_time=0 -cpu_count_from_one=1 -show_cpu_usage=1 -show_cpu_frequency=0 -show_cpu_temperature=0 -degree_fahrenheit=0 -update_process_names=0 -account_guest_in_cpu_meter=0 -color_scheme=5 -enable_mouse=1 -delay=15 -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/mpv.conf b/.config/mpv/mpv.conf index d8a2b55..732e7c1 100644 --- a/.config/mpv/mpv.conf +++ b/.config/mpv/mpv.conf @@ -82,7 +82,7 @@ screenshot-template=shot_%F_%wH-%wM-%wS # Specify the hardware video decoding API # that should be used if possible. -hwdec=none +hwdec=vaapi # Specify the video output backend to be used. vo=gpu diff --git a/.config/nvim b/.config/nvim index 1edf40f..46de54c 160000 --- a/.config/nvim +++ b/.config/nvim @@ -1 +1 @@ -Subproject commit 1edf40f8bde82a2536e86c24cd1096ac70dd0e5d +Subproject commit 46de54cecae3b131117c9f0d88dce80ae6728450 diff --git a/.config/nvimpager/init.vim b/.config/nvimpager/init.vim index af448b7..806f360 100644 --- a/.config/nvimpager/init.vim +++ b/.config/nvimpager/init.vim @@ -7,6 +7,10 @@ let &background = 'dark' let &foldenable = v:false +let &wrap = v:true + +let &linebreak = v:true + let &packpath = '' let s:packer = stdpath('data').'/site/pack/packer/' diff --git a/.config/pip/pip.conf b/.config/pip/pip.conf index 44afb7b..4559b52 100644 --- a/.config/pip/pip.conf +++ b/.config/pip/pip.conf @@ -20,7 +20,7 @@ local = true # Compile Python source files to bytecode. compile = true # Include pre-release and development versions. -pre = true +pre = false # Specify type of progress to be displayed. progress-bar = on diff --git a/.config/vifm/vifmrc b/.config/vifm/vifmrc index d6eb9ea..dd93b64 100644 --- a/.config/vifm/vifmrc +++ b/.config/vifm/vifmrc @@ -30,6 +30,9 @@ set findprg=fd\ --color=never\ %p\ %s " What should be saved automatically between vifm runs set vifminfo=chistory,shistory +" Redraw screen to get rid of graphics +set previewoptions=hardgraphicsclear + " Maximum number of stored items in all histories set history=100 @@ -278,7 +281,7 @@ fileviewer *.apng, \*.webp, \*.xbm, \*.xpm - \ identify -verbose %c + \ img2sixel -S -q low %c -w $((%pw*6)) %pd " }}} " Archives {{{ @@ -390,12 +393,11 @@ fileviewer *.o nm %c " IDE projects {{{ filextype *.pro - \ {Qt Creator} qtcreator %f %i &, - \ {CLion} clion %d %i & + \ {CLion} clion %d %i &, + \ {Qt Creator} qtcreator %f %i & filextype .idea/ \ {IntelliJ} intellij-idea-ultimate-edition %d %i &, \ {CLion} clion %d %i &, - \ {PhpStorm} phpstorm %d %i &, \ {PyCharm} pycharm %d %i & " }}} diff --git a/.local/share/bash/bashrc.sh b/.local/share/bash/bashrc.sh index 1ef4cc6..493c382 100644 --- a/.local/share/bash/bashrc.sh +++ b/.local/share/bash/bashrc.sh @@ -1,7 +1,7 @@ # shellcheck shell=bash # Define where cd looks for targets -[[ -d "$HOME/Documents/Code" ]] && CDPATH='.:~/Documents/Code' +[[ -d "$HOME/Documents/Code" ]] && CDPATH='.:/mnt/ext/Code' # Set the primary prompt string # shellcheck disable=SC2154 diff --git a/.local/share/bash/functions.sh b/.local/share/bash/functions.sh index e0280f9..c601155 100644 --- a/.local/share/bash/functions.sh +++ b/.local/share/bash/functions.sh @@ -88,7 +88,7 @@ sri() { # Prints the SRI hash of a resource } myip() { # What's my ip - drill myip.opendns.com @resolver1.opendns.com | awk '/^myip/{print $NF}' + dig +short +tls A myip.opendns.com @resolver1.opendns.com } urlencode() { # Encodes string for url diff --git a/.local/share/konsole/Default.profile b/.local/share/konsole/Default.profile index 693f062..a20db01 100644 --- a/.local/share/konsole/Default.profile +++ b/.local/share/konsole/Default.profile @@ -1,10 +1,13 @@ [Appearance] AntiAliasFonts=true -BoldIntense=false +BoldIntense=true ColorScheme=Gruvbox8 Font=Iosevka Custom,15,-1,5,50,0,0,0,0,0 LineSpacing=1 UseFontLineChararacters=true +WordMode=true +WordModeAttr=false +WordModeBrahmic=false [Cursor Options] CursorShape=2 @@ -25,7 +28,11 @@ TerminalMargin=2 TerminalRows=32 [Interaction Options] +AllowEscapedLinks=false CopyTextAsHTML=false +EscapedLinksSchema=https://;file:// +TextEditorCmd=6 +TextEditorCmdCustom= UnderlineFilesEnabled=true [Scrolling] diff --git a/.local/share/konsole/NvimTerm.profile b/.local/share/konsole/NvimTerm.profile index 03dec21..25929f3 100644 --- a/.local/share/konsole/NvimTerm.profile +++ b/.local/share/konsole/NvimTerm.profile @@ -5,6 +5,9 @@ ColorScheme=Gruvbox8 Font=Hack,16,-1,0,50,0,0,0,0,0 LineSpacing=1 UseFontLineChararacters=true +WordMode=true +WordModeAttr=false +WordModeBrahmic=false [Cursor Options] CursorShape=2 diff --git a/README.md b/README.md index 16f17f0..a12bba8 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,10 @@ * [.local/share/bash/bashrc.sh](.local/share/bash/bashrc.sh): interactive shell configuration file * [.local/share/bash/functions.sh](.local/share/bash/functions.sh): contains various functions +# [bottom](https://clementtsang.github.io/bottom/) + +* [.config/bottom/bottom.toml](.config/bottom/bottom.toml): configuration file + ## [Ccache](https://github.com/ccache/ccache) * [.config/ccache.cfg](.config/ccache.cfg): configuration file @@ -33,10 +37,6 @@ * [.config/fontconfig/fonts.conf](.config/fontconfig/fonts.conf): configuration file -## [Htop](https://hisham.hm/htop/) - -* [.config/htop/htoprc](.config/htop/htoprc): configuration file - ## [Git](https://git-scm.com/) * [.config/git/config](.config/git/config): configuration file