diff --git a/.config/nvim/init/plug.vim b/.config/nvim/init/plug.vim index d69801e..5c0462b 100644 --- a/.config/nvim/init/plug.vim +++ b/.config/nvim/init/plug.vim @@ -63,6 +63,9 @@ Plug 'HiPhish/info.vim' call plug#end() +let g:python_host_prog = '/usr/bin/python' +let g:python3_host_prog = '/usr/bin/python3' + " Install plugins automatically after installing plug if plug_install PlugInstall --sync diff --git a/.config/shell/arch b/.config/shell/arch index 567114f..832077e 100644 --- a/.config/shell/arch +++ b/.config/shell/arch @@ -30,6 +30,7 @@ yzf() { # List installable packages into fzf and install selection yas() { + # TODO also filter by provides field cache_dir="/tmp/yas-$USER" case "$1" in (-y*) rm -rf "$cache_dir"; shift; param=$1;; esac mkdir -p "$cache_dir" diff --git a/.config/shell/functions b/.config/shell/functions index 44cea77..efa5241 100644 --- a/.config/shell/functions +++ b/.config/shell/functions @@ -85,6 +85,10 @@ xtrace() { set +x } +retry() { + while ! "$@"; do sleep 2; done +} + # Shows source for given command, resolving nested aliases wh() { local res=$(which "$@" 2>/dev/null || type "$@") || return $? @@ -306,7 +310,7 @@ dns() { local dig="drill -Q" which drill >/dev/null || dig="dig +short" local server=1.1.1.1 - # allow changing DNS server with @ + # TODO allow changing DNS server with @ # TODO implement rdns via -x for arg; do local trimmed="${arg##*//}" @@ -519,7 +523,7 @@ alias rcr='rcs --compress --size-only --times' alias rcs='rsync --recursive --info=progress2,remove,symsafe,flist,del --human-readable' alias dsync='rc --delete --specials' alias move='rc --remove-source-files' -alias rdiff='rsync --recursive --progress --delete --links --dry-run' +alias rdiff='rsync --recursive --checksum --delete --links --dry-run' alias rdiffe='rdiff --existing --size-only' # Swap the names of two files diff --git a/.config/shell/graphical b/.config/shell/graphical index c08e56d..0d5a658 100644 --- a/.config/shell/graphical +++ b/.config/shell/graphical @@ -32,9 +32,6 @@ mozedit() ( test "$XDG_CURRENT_DESKTOP" = "KDE" || return 0 -# Fix errors regarding broken mim database -alias fixmime='sudo rm /usr/share/mime/packages/kde.xml && sudo update-mime-database /usr/share/mime' - # Switch theme across system: KDE, Konsole, taskwarrior, bat # WIP: Emacs, Mozilla, diffr (git pager) theme_save="$XDG_CACHE_HOME/theme" @@ -75,3 +72,6 @@ themeswitch() { export THEME=$(cat "$theme_save" 2> /dev/null) export THEME=${THEME:-$theme_default} themeswitch $THEME + +# Fix errors regarding broken mim database +alias fixmime='sudo rm /usr/share/mime/packages/kde.xml && sudo update-mime-database /usr/share/mime' diff --git a/.config/sway/config.d/autostart.conf##default b/.config/sway/config.d/autostart.conf##default index 39d6480..fa3e085 100644 --- a/.config/sway/config.d/autostart.conf##default +++ b/.config/sway/config.d/autostart.conf##default @@ -1,8 +1,16 @@ # assign [app_id="firefox"] workspace 2 -assign [class="sc.gui.final.FinalApp"] workspace 5 assign [title="JViewer.*"] workspace 5 assign [class="^sc.*"] workspace 6 +assign [class="sc.gui.final.FinalApp"] workspace 5 + +# Gaming & Communication at the end +assign [class="zoom"] workspace 7 +assign [class="steam"] workspace 8 +assign [class="DeltaChat"] workspace 8 assign [class="discord"] workspace 9 +#assign [title="Telegram"] workspace 9 +assign [app_id="org.telegram.desktop"] workspace 9 +assign [class="Signal"] workspace 9 exec swaymsg "workspace 2; exec firefox;" exec swaymsg "workspace 3; exec kitty;" diff --git a/.config/topgrade.d/topgrade.toml b/.config/topgrade.d/topgrade.toml index 3103edc..be746b0 100644 --- a/.config/topgrade.d/topgrade.toml +++ b/.config/topgrade.d/topgrade.toml @@ -58,7 +58,7 @@ pull_arguments = "--rebase --autostash --recurse-submodules" [linux] # Arguments to pass yay when updating packages -yay_arguments = "--nodiffmenu --overwrite '/usr/lib/node_modules/node-gyp/**' --overwrite '/usr/lib/node_modules/npm/**' --overwrite '/usr/lib/*' --ignore android-studio --ignore clion --ignore intellij-idea-ultimate-edition --ignore intellij-idea-ultimate-edition-jre --ignore webstorm --ignore linux --ignore stretchly-xeruf-git" +yay_arguments = "--diffmenu=false --overwrite '/usr/lib/node_modules/node-gyp/**' --overwrite '/usr/lib/node_modules/npm/**' --overwrite '/usr/lib/**' --ignore android-studio --ignore clion --ignore intellij-idea-ultimate-edition --ignore intellij-idea-ultimate-edition-jre --ignore webstorm --ignore linux --ignore stretchly-xeruf-git" #trizen_arguments = "--devel" #enable_tlmgr = true #emerge_sync_flags = "-q" diff --git a/.config/yay/config.json b/.config/yay/config.json index 9b1a903..18efef4 100644 --- a/.config/yay/config.json +++ b/.config/yay/config.json @@ -28,7 +28,7 @@ "sudoloop": true, "timeupdate": false, "devel": false, - "cleanAfter": true, + "cleanAfter": false, "provides": true, "pgpfetch": true, "upgrademenu": false, @@ -36,6 +36,6 @@ "diffmenu": true, "editmenu": false, "combinedupgrade": true, - "useask": false, + "useask": true, "batchinstall": false }