From 500beb2463ee5d2c2c11298bbea1e321e083ee40 Mon Sep 17 00:00:00 2001 From: Rohan Kumar Date: Mon, 16 Dec 2019 21:49:11 -0800 Subject: [PATCH 01/12] Overhaul launcher programs Offer dmenu/rofi functionality in a floating terminal window. --- .local/bin/app-launcher | 6 ++- .local/bin/sway-launcher | 93 ++++++++++++-------------------------- .local/bin/term-dmenu | 30 ++++++++++++ .local/bin/window-switcher | 18 ++++++++ 4 files changed, 81 insertions(+), 66 deletions(-) create mode 100755 .local/bin/term-dmenu create mode 100755 .local/bin/window-switcher diff --git a/.local/bin/app-launcher b/.local/bin/app-launcher index 327f9450..e719c70d 100755 --- a/.local/bin/app-launcher +++ b/.local/bin/app-launcher @@ -1,7 +1,11 @@ #!/usr/bin/env dash # launcher for .desktop files; used with app-runner script -cmd=$(SHELL=$HOME/.local/bin/app-runner j4-dmenu-desktop --dmenu=fzf | sed -n 2p) + +# see my `term-dmenu` script in ~/.local/bin +dmenu_program=term-dmenu + +cmd="$(SHELL=$HOME/.local/bin/app-runner j4-dmenu-desktop --dmenu=$dmenu_program | sed -n 2p)" [ -n "$cmd" ] && swaymsg exec "$cmd" # vi:ft=sh diff --git a/.local/bin/sway-launcher b/.local/bin/sway-launcher index ae1a7682..bf50dfbe 100755 --- a/.local/bin/sway-launcher +++ b/.local/bin/sway-launcher @@ -1,20 +1,11 @@ #!/usr/bin/env dash -# The following script is based on: +# POSIX-compliant shell script to replace dmenu/rofi's command-running +# functionality. Based on: # https://gitlab.com/FlyingWombat/my-scripts/blob/a0cb5717777c1587af381004aa8fb048206bee55/sway-launcher -# terminal application launcher for sway, using fzf -# original command: - -# Based on: https://github.com/swaywm/sway/issues/1367 - -# bindsym $altkey+space exec termite --name=launcher -e \ - -# "bash -c 'compgen -c | sort -u | fzf --no-extended --print-query | \ - -# tail -n1 | xargs -r swaymsg -t command exec'" - -# printf "\033]0;Menu\007" +# Pick your preferred dmenu-like program. It should not do any sorting. +dmenu_program='term-dmenu --no-extended --print-query --no-sort' HIST_FILE="${XDG_CACHE_HOME:-$HOME/.cache}/sway-launcher-history.txt" @@ -22,84 +13,56 @@ HIST_FILE="${XDG_CACHE_HOME:-$HOME/.cache}/sway-launcher-history.txt" # This may include the occasional non-executable file +# shellcheck disable=SC2046 # word-splitting isn't an issue here. command_list=$(stest -flx $(echo "$PATH" | tr : ' ' | sort -u)) # read existing command history if [ -f "$HIST_FILE" ]; then - command_history=$(cat "$HIST_FILE") - else - command_history="" - fi # search command list command_str=$(printf "%s\n" "${command_history}" "${command_list}" \ | sed -E 's/^[0-9]+ (.+)$/\1/' \ - | fzf --no-extended --print-query --no-sort \ + | $dmenu_program \ | tail -n1) || exit 1 if [ "$command_str" = "" ]; then - exit 1 - fi -# echo "Command: $command_str" - # using \E flag from perl regex - test "${command_str#*\\E}" != "$command_str" && echo "command can't contain '\E'" - test "${command_str#*\\E}" != "$command_str" && exit 1 -# get full line from history (with count number) - -hist_line=$(echo "$command_history" | grep -Pe "^[0-9]+ \Q$command_str\E$") - -# echo "Hist Line: $hist_line" - -if [ "$hist_line" = "" ]; then - - hist_count=1 - -else - - # Increment usage count - - hist_count=$(echo "$hist_line" | sed -E 's/^([0-9]+) .+$/\1/') - - hist_count=$((hist_count + 1)) - - # delete line, to add updated later - - # echo "Hist Before: $command_history" - - command_history=$(echo "$command_history" \ - | grep --invert-match -Pe "^[0-9]+ \Q$command_str\E$") - - # echo "Hist After: $command_history" - -fi - -# update history - -update_line="${hist_count} ${command_str}" - -printf "%s\n" "${update_line}" "${command_history}" \ - | sort --numeric-sort --reverse >"$HIST_FILE" - -# echo "$update_line" +update_history() { + # get full line from history (with count number) + hist_line=$(echo "$command_history" | grep -Pe "^[0-9]+ \Q$command_str\E$") + + if [ "$hist_line" = "" ]; then + hist_count=1 + else + # Increment usage count + hist_count=$(echo "$hist_line" | sed -E 's/^([0-9]+) .+$/\1/') + hist_count=$((hist_count + 1)) + # delete line, to add updated later + command_history=$(echo "$command_history" \ + | grep --invert-match -Pe "^[0-9]+ \Q$command_str\E$") + fi + + # update history + update_line="${hist_count} ${command_str}" + printf "%s\n" "${update_line}" "${command_history}" \ + | sort --numeric-sort --reverse >"$HIST_FILE" +} +update_history & # execute command - -echo "$command_str" - -swaymsg -t command exec "$command_str" +swaymsg -t command exec "$command_str" & # vi:ft=sh diff --git a/.local/bin/term-dmenu b/.local/bin/term-dmenu new file mode 100755 index 00000000..c89e75a4 --- /dev/null +++ b/.local/bin/term-dmenu @@ -0,0 +1,30 @@ +#!/usr/bin/env dash + +# term-dmenu is a dmenu/rofi-dmenu replacement that launches a terminal +# emulator to filter stdin using fzf. Arguments are passed to fzf. +# By default, it uses kitty. Change this if you wish. + +export FZF_DEFAULT_OPTS="$* $FZF_DEFAULT_OPTS" + +# This happens in three steps: + +# 1. if a named pipe for term-dmenu doesn't exist, create it +[ -p /tmp/term-dmenu ] || mkfifo /tmp/term-dmenu + +# 2. export stdin, separated by newlines, so the terminal process can access it +IFS=$(printf '\n') +input=$(cat) +export input + +# 3. open a floating terminal, running a shell command that does the following:. +# 3a. filter $input in fzf +# 3b. send the result to the named pipe in a detached abduco session +# shellcheck disable=SC2016 # I don't want expressions to expand +kitty --class launcher -e dash -c \ + 'output=$(echo "$input" | fzf); export output; abduco -rnf term-dmenu dash -c "echo \"$output\" >/tmp/term-dmenu" 2>/dev/null' + +# 4. send the value from the named pipe to stdout +cat Date: Tue, 17 Dec 2019 10:51:16 -0800 Subject: [PATCH 02/12] Version bumps, spellfile --- .config/coc/extensions/package.json | 2 +- .config/nvim/spell/en.utf-8.add | 5 +++++ .local/share/weechat/.weerc | 12 +----------- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/.config/coc/extensions/package.json b/.config/coc/extensions/package.json index c86ea8aa..a0686f61 100644 --- a/.config/coc/extensions/package.json +++ b/.config/coc/extensions/package.json @@ -12,7 +12,7 @@ "coc-json": ">=1.2.4", "coc-lists": ">=1.3.6", "coc-lua": ">=0.2.0", - "coc-markdownlint": ">=0.4.0", + "coc-markdownlint": ">=1.0.1", "coc-marketplace": ">=1.5.0", "coc-python": ">=1.2.6", "coc-rls": ">=1.1.4", diff --git a/.config/nvim/spell/en.utf-8.add b/.config/nvim/spell/en.utf-8.add index 80d5ff18..a770765d 100644 --- a/.config/nvim/spell/en.utf-8.add +++ b/.config/nvim/spell/en.utf-8.add @@ -294,3 +294,8 @@ metadata WebAssembly capsaicin workflow +featureful +performant +nontheless +Spotify +iTunes diff --git a/.local/share/weechat/.weerc b/.local/share/weechat/.weerc index 3c014db1..a58b8b84 100644 --- a/.local/share/weechat/.weerc +++ b/.local/share/weechat/.weerc @@ -1,21 +1,11 @@ # -# WeeChat 2.7-rc1 (compiled on Dec 6 2019 14:16:36) +# WeeChat 2.8-dev (compiled on Dec 15 2019 12:51:43) # # Use /autoconf load or cat this file to the FIFO pipe. # # For more info, see https://weechat.org/scripts/source/autoconf.py.html # -*/set Option changed: weechat.look.mouse on -*/set Option changed: weechat.bar.buflist.items "buflist" -*/set Option changed: weechat.bar.fset.items "fset" -*/set Option changed: weechat.bar.input.items "mode_indicator+[input_prompt]+(away),[input_search],[input_paste],input_text,[vi_buffer]" -*/set Option changed: weechat.bar.nicklist.items "chatters,buffer_nicklist" -*/set Option changed: weechat.bar.status.items "matrix_typing_notice,[buffer_last_number],[buffer_plugin],buffer_number+:+buffer_name+(buffer_modes),scroll,[lag],[hotlist],completion" -*/set Option changed: weechat.bar.vi_line_numbers.items "line_numbers" -*/set Option changed: exec.command.shell "sh" -*/set Option changed: script.look.sort "d" -*/set Option changed: matrix.server.matrix_org.address "matrix.org" */set weechat.look.mouse on */set weechat.bar.buflist.items "buflist" */set weechat.bar.fset.items "fset" From 28d02fccd860f17f9cf52114bfe53ad0d9c53556 Mon Sep 17 00:00:00 2001 From: Rohan Kumar Date: Tue, 17 Dec 2019 10:51:31 -0800 Subject: [PATCH 03/12] Use fixed base16 for delta --- .config/git/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/git/config b/.config/git/config index e49cd93a..b53eb65e 100644 --- a/.config/git/config +++ b/.config/git/config @@ -19,7 +19,7 @@ gpgsign = true [core] editor = nvim - pager = delta --dark --theme='Monokai Extended Origin' | less --tabs=2 -RFX + pager = delta --dark --theme='base16' | less --tabs=2 -RFX commitGraph = true [color] ui = true From 655b5c4a1f714c6806f4787eef14ecfc778f27f6 Mon Sep 17 00:00:00 2001 From: Rohan Kumar Date: Tue, 17 Dec 2019 10:51:51 -0800 Subject: [PATCH 04/12] Switch from tealdeer to tldr-c client --- .config/shell_common/aliases.sh | 7 ++++--- Executables/shell-scripts/updates/small-cc-programs.sh | 6 ++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.config/shell_common/aliases.sh b/.config/shell_common/aliases.sh index 4c9b8cf6..1ad8045a 100755 --- a/.config/shell_common/aliases.sh +++ b/.config/shell_common/aliases.sh @@ -57,12 +57,13 @@ alias battstat="upower -i /org/freedesktop/UPower/devices/battery_BAT0 | rg 'tim alias emoj="emoji-fzf preview | fzf --preview 'emoji-fzf get --name {1}' | cut -d \" \" -f 1 | emoji-fzf get" alias emoj-cp='emoj | wl-copy' alias weechat-matrix='source $GHQ_ROOT/github.com/poljar/weechat-matrix/venv/bin/activate && weechat -r "/script load matrix.py; /matrix connect matrix_org"' +alias sub='tuir -s' # Aliases that change existing commands +alias tuir='tuir --enable-media' +alias flatpak='flatpak --user' alias ddgr='ddgr -x' alias newsboat='echo -ne "\033]0;newsboat\007" && newsboat' -alias tldr='tldr -p' -alias tuir='tuir --enable-media' -alias sub='tuir -s' +alias tldr='tldr' alias glances='glances --disable-webui --disable-bg --disable-check-update' # mpd stuff diff --git a/Executables/shell-scripts/updates/small-cc-programs.sh b/Executables/shell-scripts/updates/small-cc-programs.sh index c515c204..f30a3510 100755 --- a/Executables/shell-scripts/updates/small-cc-programs.sh +++ b/Executables/shell-scripts/updates/small-cc-programs.sh @@ -12,6 +12,12 @@ start_time=$(date '+%s') # update this first; updating it kills all running mpv instances ghq_get_cd https://github.com/hoyon/mpv-mpris && make_install +# tldr +ghq_get_cd https://github.com/tldr-pages/tldr-cpp-client.git \ + && make -j "$threads" \ + && install -m0755 tldr "$BINPREFIX" \ + && install -p -m644 man/tldr.1 "$MANPREFIX/man1" + # rsync ghq_get_cd https://git.samba.org/rsync.git \ && configure_install --with-included-popt From f17426d5a73d01ad65f7aa1a33e5ae007ff726ed Mon Sep 17 00:00:00 2001 From: Rohan Kumar Date: Tue, 17 Dec 2019 10:53:46 -0800 Subject: [PATCH 05/12] Fix sway binds --- .config/sway/config_master | 18 +++++++++++------- .local/bin/grim-window | 4 +++- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.config/sway/config_master b/.config/sway/config_master index 091a0c15..7b146dab 100644 --- a/.config/sway/config_master +++ b/.config/sway/config_master @@ -12,9 +12,11 @@ set $up k set $right l # Your preferred terminal emulator set $term kitty -# Your preferred application launcher -bindsym $mod+z exec --no-startup-id kitty --class launcher sway-launcher -bindsym $mod+d exec --no-startup-id kitty --class launcher app-launcher + +# launchers +bindsym $mod+z exec sway-launcher +bindsym $mod+d exec app-launcher +bindsym Mod1+Tab exec window-switcher for_window [app_id="^launcher$"] floating enable for_window [app_id="^org.keepassxc.KeePassXC$"] floating enable for_window [app_id="^pavucontrol-qt$"] floating enable @@ -125,10 +127,11 @@ input * { # bindsym XF86TouchpadToggle exec /some/path/toggletouchpad.sh # toggle touchpad # Media player controls - bindsym XF86AudioPlay exec playerctl play-pause - bindsym XF86AudioPause exec playerctl pause - bindsym XF86AudioNext exec playerctl next - bindsym XF86AudioPrev exec playerctl previous + set $playerctl LD_LIBRARY_PATH="$HOME/.local/lib/:$LD_LIBRARY_PATH" GI_TYPELIB_PATH="$HOME/.local/lib/:$GI_TYPELIB_PATH" playerctl + bindsym XF86AudioPlay exec $playerctl play-pause + bindsym XF86AudioPause exec $playerctl pause + bindsym XF86AudioNext exec $playerctl next + bindsym XF86AudioPrev exec $playerctl previous # # Moving around: @@ -260,3 +263,4 @@ bar { inactive_workspace #32323200 #32323200 #5c5c5c } status_command i3status-rs ~/.config/sway/status.toml + icon_theme Papirus-Dark diff --git a/.local/bin/grim-window b/.local/bin/grim-window index 6888a851..b71de424 100755 --- a/.local/bin/grim-window +++ b/.local/bin/grim-window @@ -1,3 +1,5 @@ #!/usr/bin/env dash -grim -g "$(swaymsg -t get_tree | jq -r '.. | select(.pid? and .visible?) | .rect | "\(.x),\(.y) \(.width)x\(.height)"' | slurp)" "$@" +grim -g \ + "$(swaymsg -t get_tree | jq -r '.. | select(.pid? and .visible?) | .rect | "\(.x),\(.y) \(.width)x\(.height)"' | slurp)" \ + "$@" # vi:ft=sh From 56387bb25652da66c48420ad5ff8f54fddc38978 Mon Sep 17 00:00:00 2001 From: Rohan Kumar Date: Tue, 17 Dec 2019 10:54:04 -0800 Subject: [PATCH 06/12] Moar RSS --- .config/newsboat/urls | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.config/newsboat/urls b/.config/newsboat/urls index 7d404d53..0582319c 100644 --- a/.config/newsboat/urls +++ b/.config/newsboat/urls @@ -82,6 +82,8 @@ https://github.com/DavidAnson/markdownlint/commits/master/README.md.atom "git re https://github.com/igorshubovych/markdownlint-cli/releases.atom "git repos" "Programs" "Dev" # jq for yaml; can convert between yaml and json as well. https://github.com/mikefarah/yq/releases.atom "git repos" "Programs" "Dev" +# sh/shfmt for shell formatting +https://github.com/mvdan/sh/commits/master.atom "git repos" "Programs" "Dev" "~shfmt changelog" # best mail client; should with fetchmail/sendmail https://git.sr.ht/~sircmpwn/aerc/refs/rss.xml "git repos" "Programs" "Dev" "Favorite" "~aerc refs" # my school gave me unlimited GDrive storage, so i have to use it for *something*. @@ -423,6 +425,8 @@ https://latenightlinux.com/feed/ogg "Audio" "Media" "Linux" https://dlnxtend.com/rss "Audio" "Media" "Linux" # Saturday Morning Linux Review https://smlr.us/?feed=smlr-ogg "Audio" "Media" "Linux" +# On the Metal +https://feeds.transistor.fm/on-the-metal-0294649e-ec23-4eab-975a-9eb13fd94e06 "Audio" "Media" "Linux" # Video From a5323d0b345c5eb8404bf82fe0444c081b30d9c4 Mon Sep 17 00:00:00 2001 From: Rohan Kumar Date: Tue, 17 Dec 2019 10:54:18 -0800 Subject: [PATCH 07/12] System update: parallelize/optimize stack builds --- Executables/shell-scripts/updates/stack.sh | 44 +++++++++++++++++----- 1 file changed, 35 insertions(+), 9 deletions(-) diff --git a/Executables/shell-scripts/updates/stack.sh b/Executables/shell-scripts/updates/stack.sh index 7d5d1023..0647d49f 100755 --- a/Executables/shell-scripts/updates/stack.sh +++ b/Executables/shell-scripts/updates/stack.sh @@ -4,34 +4,59 @@ start_time=$(date '+%s') # shellcheck source=../../../.config/shell_common/functions_ghq.sh . "$HOME/.config/shell_common/functions_ghq.sh" +# shellcheck source=./cc_funcs.sh +. "$HOME/Executables/shell-scripts/updates/cc_funcs.sh" stack_local() { stack --local-bin-path="$HOME/Executables/stack/bin" "$@" } +if [ "$threads" -gt 4 ]; then + echo "using multiple threads" + ghc_opts="-O2 -optc-O3 -threaded -j$threads +RTS -A32m -RTS" +else + ghc_opts='-O2 -optc-O3 -threaded +RTS -A32m -RTS' +fi + +stack_local_optimized() { + stack_local "$@" --ghc-options="$ghc_opts" +} + stack_install_git() { - ghq_get_cd "$1" \ - && STACK_YAML="./stack.yaml" stack_local setup \ - && STACK_YAML="./stack.yaml" stack_local install + ghq_get_cd "$1" || return 1 + if [ -f ./stack-nightly.yaml ]; then + STACK_YAML=./stack-nightly.yaml + elif [ -f ./stack.yaml ]; then + STACK_YAML=./stack.yaml + fi + export STACK_YAML + stack_local setup \ + && stack_local_optimized install } stack_install_git_nightly() { - ghq_get_cd "$1" \ - && STACK_YAML="./stack.yaml" stack_local --resolver=nightly setup \ - && STACK_YAML="./stack.yaml" stack_local --resolver=nightly install + ghq_get_cd "$1" || return 1 + if [ -f ./stack-nightly.yaml ]; then + STACK_YAML=./stack-nightly.yaml + elif [ -f ./stack.yaml ]; then + STACK_YAML=./stack.yaml + fi + export STACK_YAML + stack_local --resolver=nightly setup \ + && stack_local_optimized --resolver=nightly install } stack_install_nightly_fallback() { stack_install_git_nightly "$1" \ || { - echo "Failed to update with nightly resolver; trying with specified resolver" \ + echo 'Failed to update with nightly resolver; trying with specified resolver' \ && stack_install_git "$1" } } -stack_local config set resolver nightly -stack_local upgrade +# update hackage data stack_local update +stack_install_nightly_fallback https://github.com/commercialhaskell/stack.git # Pandoc and friends stack_install_nightly_fallback https://github.com/jgm/pandoc.git @@ -50,6 +75,7 @@ stack_install_nightly_fallback https://github.com/hadolint/hadolint.git ghq_get_cd https://github.com/digital-asset/ghcide.git \ && STACK_YAML="./stack88.yaml" stack_local setup \ && STACK_YAML="./stack88.yaml" stack_local install + # source code grepper stack_install_nightly_fallback https://github.com/awgn/cgrep.git From bf99ee2bbd31ffab8fecdec97bbf025ba54b3779 Mon Sep 17 00:00:00 2001 From: Rohan Kumar Date: Tue, 17 Dec 2019 10:54:43 -0800 Subject: [PATCH 08/12] Uninstall unused tealdeer --- Executables/shell-scripts/bootstrap/cargo.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/Executables/shell-scripts/bootstrap/cargo.sh b/Executables/shell-scripts/bootstrap/cargo.sh index 9d2c0a73..68555d77 100644 --- a/Executables/shell-scripts/bootstrap/cargo.sh +++ b/Executables/shell-scripts/bootstrap/cargo.sh @@ -12,7 +12,6 @@ cargo_install_git https://github.com/Y2Z/monolith.git cargo_install_git https://github.com/anordal/shellharden.git cargo_install_git https://github.com/chmln/sd.git cargo_install_git https://github.com/dandavison/delta.git -cargo_install_git https://github.com/dbrgn/tealdeer.git cargo_install_git https://github.com/greshake/i3status-rust.git cargo_install_git https://github.com/jameslzhu/roflcat.git cargo_install_git https://github.com/lunaryorn/mdcat.git From ce21dc39e7e5e87ea04885feab6a72139c5decf6 Mon Sep 17 00:00:00 2001 From: Rohan Kumar Date: Tue, 17 Dec 2019 10:55:05 -0800 Subject: [PATCH 09/12] Fix shfmt update --- Executables/shell-scripts/updates/go.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Executables/shell-scripts/updates/go.sh b/Executables/shell-scripts/updates/go.sh index 486f3c33..0821114a 100755 --- a/Executables/shell-scripts/updates/go.sh +++ b/Executables/shell-scripts/updates/go.sh @@ -28,7 +28,7 @@ GO111MODULE=on go_update github.com/schollz/croc/v6 # Pager for log files go_update github.com/tigrawap/slit/cmd/slit # shell script formatter -go_update github.com/mvdan/sh/cmd/shfmt +GO111MODULE=on go_update mvdan.cc/sh/v3/cmd/shfmt # like jq but for yaml GO111MODULE=on go_update github.com/mikefarah/yq/v2 # curlie: better than httpie From aca1deeaa6387136308e961689ad57082e6c7a39 Mon Sep 17 00:00:00 2001 From: Rohan Kumar Date: Tue, 17 Dec 2019 10:55:18 -0800 Subject: [PATCH 10/12] Clean up $HOME, add completions and grimshot --- .config/shell_common/zsh/zplugin.zsh | 8 ++++++++ startup.sh | 3 +++ 2 files changed, 11 insertions(+) diff --git a/.config/shell_common/zsh/zplugin.zsh b/.config/shell_common/zsh/zplugin.zsh index 4d18cd0a..a5b68b7b 100644 --- a/.config/shell_common/zsh/zplugin.zsh +++ b/.config/shell_common/zsh/zplugin.zsh @@ -123,6 +123,9 @@ zplugin light sdushantha/kunst zi_program has'perl' pick'inxi' zplugin light smxi/inxi +zi_program has'grim' pick'grimshot' +zplugin light $GHQ_ROOT/github.com/swaywm/sway/contrib + # }}} # Git extensions {{{ @@ -135,6 +138,8 @@ zi0a zplugin light wfxr/emoji-cli # has ICE-selector wait'0b' so it gets loaded after diff-so-fancy +export FORGIT_GI_REPO_LOCAL="$XDG_DATA_HOME/forgit/gi/repos/dvcs/gitignore" + zi0b has'fzf' pick'forgit.plugin.zsh' zplugin light wfxr/forgit @@ -205,6 +210,9 @@ zplugin snippet $GHQ_ROOT/github.com/ytdl-org/youtube-dl/youtube-dl.zsh zi_completion has'podman' zplugin snippet $GOPATH/src/github.com/containers/libpod/completions/zsh/_podman +zi_completion has'mpv' +zplugin snippet https://github.com/mpv-player/mpv/blob/master/etc/_mpv.zsh + zi_completion pick'src/go' src'src/zsh' zplugin light zchee/zsh-completions diff --git a/startup.sh b/startup.sh index 33b55f01..38c00ee2 100755 --- a/startup.sh +++ b/startup.sh @@ -56,6 +56,7 @@ export QT_PLUGIN_PATH="/usr/lib64/qt5/plugins:$QT_PLUGIN_PATH" export QT_PLUGIN_PATH="$HOME/.local/lib64/qt5/plugins:$QT_PLUGIN_PATH" export PYTHONPYCACHEPREFIX="$XDG_CACHE_HOME/pycache" export TOOLBOX_PROFILE_DIR="$XDG_DATA_HOME/toolbox" + export HGPYTHON3=1 # Disable the golang google proxy export GOPROXY=direct @@ -85,6 +86,8 @@ export WAPM_PACKAGES="$HOME/Executables/wapm" export LUAROCKS_CONFIG="$XDG_CONFIG_HOME/luarocks/config.lua" export PIPX_HOME="$HOME/Executables/pipx" export PIPX_BIN_DIR="$HOME/Executables/pipx/bin" +export IPYTHONDIR="$XDG_CONFIG_HOME/ipython" +export JUPYTER_CONFIG_DIR="$XDG_CONFIG_HOME/jupyter" # Keep npm from polluting my $HOME export NPM_PACKAGES="$HOME/Executables/npm" export NODE_PATH="$NPM_PACKAGES/lib/node_modules:$NODE_PATH" From 1ae848ac6e864fc7c4199dc0626d1fe5fa8f834d Mon Sep 17 00:00:00 2001 From: Rohan Kumar Date: Tue, 17 Dec 2019 10:55:42 -0800 Subject: [PATCH 11/12] Formatting --- .local/bin/w3m-sandbox-tor | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.local/bin/w3m-sandbox-tor b/.local/bin/w3m-sandbox-tor index 5b1801be..92c3db58 100755 --- a/.local/bin/w3m-sandbox-tor +++ b/.local/bin/w3m-sandbox-tor @@ -1,7 +1,7 @@ #!/usr/bin/env dash cd "$(mktemp -d)" \ - && curl-tor "$@" >/tmp/page.html && w3m-sandbox /tmp/page.html + && curl-tor "$@" >/tmp/page.html \ + && w3m-sandbox /tmp/page.html # vi:ft=sh - From 29315dea010f8bd4cee1e9fc77a62d38f3d804d5 Mon Sep 17 00:00:00 2001 From: Rohan Kumar Date: Tue, 17 Dec 2019 10:56:16 -0800 Subject: [PATCH 12/12] Print message upon DNF bootstrap completion --- Executables/shell-scripts/bootstrap/sudo-dnf.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Executables/shell-scripts/bootstrap/sudo-dnf.sh b/Executables/shell-scripts/bootstrap/sudo-dnf.sh index 283e3a14..ae94d09d 100644 --- a/Executables/shell-scripts/bootstrap/sudo-dnf.sh +++ b/Executables/shell-scripts/bootstrap/sudo-dnf.sh @@ -303,6 +303,8 @@ dnf install ${packages[*]} --allowerasing --skip-broken -y iptables -I INPUT -p tcp -m tcp --dport 22 -j ACCEPT iptables -I INPUT -p udp --dport 60000:61000 -j ACCEPT +echo 'Initial bootstrap finished. After running "update-all" successfully, uninstall stack and cargo' + end_time=$(date '+%s') elapsed=$(echo "$end_time - $start_time" | bc) echo "Time elapsed: $elapsed seconds"