diff --git a/.dotter/global.toml b/.dotter/global.toml index 6c2ae8c..d2e309e 100644 --- a/.dotter/global.toml +++ b/.dotter/global.toml @@ -24,7 +24,6 @@ vcs = "~" [nvim.files] "nvim/.config/nvim/spell/de.utf-8.add.spl" = { target = "~/.config/nvim/spell/de.utf-8.add.spl", type = "symbolic" } "nvim/.config/nvim/spell/en.utf-8.add.spl" = { target = "~/.config/nvim/spell/en.utf-8.add.spl", type = "symbolic" } -"nvim/.config/nvim/snippets/quarto.snippets" = { target = "~/.config/nvim/snippets/quarto.snippets", type = "symbolic" } nvim = "~" [scripts.files] diff --git a/bootstrap/dotlink.sh b/bootstrap/dotlink.sh index ba7f148..9cf3d69 100644 --- a/bootstrap/dotlink.sh +++ b/bootstrap/dotlink.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh # relink all stowed files from anywhere # grepping is to remove meaningless stderr lines until this bug is fixed: # https://github.com/aspiers/stow/issues/65 @@ -10,8 +10,6 @@ # to customize this to your own needs, change the `push folder` to the # location of your dotfiles (stow) repository -dotlink() { - cd ~/.dotfiles || return - dotter "${@:-deploy}" - cd "$OLDPWD" || return -} +alias dotlink="pushd ~/.dotfiles;\ + dotter deploy;\ + popd" diff --git a/desktop/.config/river/init b/desktop/.config/river/init index 1f142af..21dd169 100755 --- a/desktop/.config/river/init +++ b/desktop/.config/river/init @@ -4,6 +4,12 @@ if [ -d "$TURNSTILE_ENV_DIR" ]; then echo "$DISPLAY" >"$TURNSTILE_ENV_DIR/DISPLAY" echo "$WAYLAND_DISPLAY" >"$TURNSTILE_ENV_DIR/WAYLAND_DISPLAY" + echo "ADDING KEYCHAIN TO ENV" + keychain --eval --quiet --agents ssh,gpg C414FF88A557F29AFEF76C7E73BA40D5AFAF49C9 + echo "$SSH_AUTH_SOCK">"$TURNSTILE_ENV_DIR/SSH_AUTH_SOCK" + echo "$SSH_AGENT_PID">"$TURNSTILE_ENV_DIR/SSH_AGENT_PID" + echo "$GPG_AGENT_INFO">"$TURNSTILE_ENV_DIR/GPG_AGENT_INFO" + echo "DONE ADDING KEYCHAIN TO ENV" fi mod="Mod4" diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index 2e6e902..a9d1cc3 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -24,7 +24,7 @@ "grug-far.nvim": { "branch": "main", "commit": "3e72486d0123d08f5b253847ab6e00ca12353242" }, "helpview.nvim": { "branch": "main", "commit": "49e8d4782ae73274a35d606fde2844b6e958a0c7" }, "hunk.nvim": { "branch": "master", "commit": "b475ba0011e4b8ef7d7ddecd9764ee1a5f41366d" }, - "image.nvim": { "branch": "master", "commit": "a4638ec549c6aa56264cb0371255192ff37a8a90" }, + "image.nvim": { "branch": "master", "commit": "6ffafab2e98b5bda46bf227055aa84b90add8cdc" }, "img-clip.nvim": { "branch": "main", "commit": "0bb8b5ced45c2672c70184c87d014194b0705815" }, "jupytext.nvim": { "branch": "main", "commit": "c8baf3ad344c59b3abd461ecc17fc16ec44d0f7b" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, diff --git a/nvim/.config/nvim/lua/core/languages.lua b/nvim/.config/nvim/lua/core/languages.lua index 755fb8c..ad2b5bb 100644 --- a/nvim/.config/nvim/lua/core/languages.lua +++ b/nvim/.config/nvim/lua/core/languages.lua @@ -9,7 +9,7 @@ local nushell = { lsp = { nushell = {} }, ts = { "nu" } } if vim.fn.executable("nufmt") == 1 then - nushell.format = { nu = { "nufmt" } } + nushell.format = {nu = {"nufmt"}} end local languages = { @@ -103,10 +103,7 @@ local languages = { lint = { typescript = { "eslint_d" }, typescriptreact = { "eslint_d" } }, format = { typescript = { "prettier" }, typescriptreact = { "prettier" } }, }, - typst = { - lsp = { tinymist = { settings = { formatterMode = "typstyle" } } }, - ts = { "typst" }, - }, + typst = { lsp = { tinymist = { settings = { formatterMode = "typstyle" } } }, ts = { "typst" } }, vue = { format = { vue = { "prettier", "rustywind" } } }, yaml = { lsp = { yamlls = {}, ansiblels = {} }, ts = { "yaml" }, format = { yaml = { "prettier" } } }, zsh = { format = { zsh = { "shfmt" } } }, diff --git a/nvim/.config/nvim/lua/plugins/data_analysis.lua b/nvim/.config/nvim/lua/plugins/data_analysis.lua index 96e8823..b4d7fc8 100644 --- a/nvim/.config/nvim/lua/plugins/data_analysis.lua +++ b/nvim/.config/nvim/lua/plugins/data_analysis.lua @@ -55,9 +55,7 @@ return { -- image display { - -- "3rd/image.nvim", -- using Fork until https://github.com/3rd/image.nvim/pull/280 is merged - "UnaTried/image.nvim", - name = "image.nvim", + "3rd/image.nvim", version = false, dependencies = { { "leafo/magick" }, -- luarock, ensure global luarock51 dependency @@ -73,8 +71,12 @@ return { only_render_image_at_cursor = true, filetypes = { "markdown", "vimwiki", "quarto" }, }, - neorg = { only_render_image_at_cursor = true }, - typst = { only_render_image_at_cursor = true }, + neorg = { + only_render_image_at_cursor = true, + }, + typst = { + only_render_image_at_cursor = true, + }, }, }, config = function(_, opts) @@ -104,7 +106,7 @@ return { "benlubas/molten-nvim", dependencies = { { "willothy/wezterm.nvim", config = true }, - { "image.nvim", optional = true }, + { "3rd/image.nvim", optional = true }, }, build = ":UpdateRemotePlugins", init = function() diff --git a/qutebrowser/config/alias.py b/qutebrowser/config/alias.py index f87d6b1..671718b 100644 --- a/qutebrowser/config/alias.py +++ b/qutebrowser/config/alias.py @@ -40,6 +40,3 @@ c.aliases["cookie-block"] = "spawn --userscript qute-cookie-block" # open last downloads in dmenu-like c.aliases["recent-downloads"] = "spawn --userscript recently-downloaded" - -# annotate with hypothesis -c.aliases["hypothesis"] = "jseval (function(){window.hypothesisConfig=function(){return{showHighlights:true,appType:'bookmarklet'};};var d=document,s=d.createElement('script');s.setAttribute('src','https://hypothes.is/embed.js');d.body.appendChild(s)})();'hypothesis enabled'" diff --git a/qutebrowser/config/maps.py b/qutebrowser/config/maps.py index ccc757a..648181b 100644 --- a/qutebrowser/config/maps.py +++ b/qutebrowser/config/maps.py @@ -86,7 +86,6 @@ config.bind('"p', "send-to-scihub", mode="normal") # view current page doi on s config.bind(";p", "hint links run send-to-scihub") # view linked doi on scihub config.bind(lleader + "r", "readable", mode="normal") -config.bind(lleader + "a", "hypothesis", mode="normal") # set stylesheets for the browser to use config.bind( diff --git a/qutebrowser/data/userscripts/linkding_add.sh b/qutebrowser/data/userscripts/linkding_add.sh index 4deb17e..40768fa 100755 --- a/qutebrowser/data/userscripts/linkding_add.sh +++ b/qutebrowser/data/userscripts/linkding_add.sh @@ -12,16 +12,6 @@ # Configure your shaarli instance with this: INSTANCE="https://links.martyoeh.me" -_open() { - if command -v open >/dev/null 2>&1; then - open "$1" & - elif command -v mimeo >/dev/null 2>&1; then - mimeo "$1" & - else - xdg-open "$1" & - fi -} - # send page to shaarli instance and open the 'post' page to edit it if [ "$#" -gt 0 ]; then BM="$INSTANCE/bookmarks/new?url=$*&auto_close" @@ -29,8 +19,9 @@ else BM="$INSTANCE/bookmarks/new?url=$QUTE_URL&auto_close" fi -if [ "$QUTE_FIFO" != "" ]; then +if [ -n "$QUTE_FIFO" ]; then echo "open -t -r $BM" >>"$QUTE_FIFO" else - _open "$BM" + xdg-open "$BM" fi + diff --git a/qutebrowser/data/userscripts/qute-gemini b/qutebrowser/data/userscripts/qute-gemini index 56ae668..e5ffa7a 100755 --- a/qutebrowser/data/userscripts/qute-gemini +++ b/qutebrowser/data/userscripts/qute-gemini @@ -21,7 +21,6 @@ # continue surfing like normal, only that you can now also access # any gemini pages as if they were part of the normal http protocol. -import shutil import cgi import html import os @@ -380,10 +379,7 @@ def open_url(url: str, open_args: str) -> None: with open(fifo, "w") as qfifo: qfifo.write(f"open {open_args} {to_open}") return - if shutil.which("mimeo"): - _ = os.system(f"mimeo {to_open}") - elif shutil.which("xdg-open"): - _ = os.system(f"xdg-open {to_open}") + os.system(f"xdg-open {to_open}") if __name__ == "__main__": diff --git a/qutebrowser/data/userscripts/shaarli_add.sh b/qutebrowser/data/userscripts/shaarli_add.sh index 20c9175..2d3e289 100755 --- a/qutebrowser/data/userscripts/shaarli_add.sh +++ b/qutebrowser/data/userscripts/shaarli_add.sh @@ -12,16 +12,6 @@ # Configure your shaarli instance with this: SHAARLI_INSTANCE="https://links.martyoeh.me" -_open() { - if command -v open >/dev/null 2>&1; then - open "$1" & - elif command -v mimeo >/dev/null 2>&1; then - mimeo "$1" & - else - xdg-open "$1" & - fi -} - # send page to shaarli instance and open the 'post' page to edit it if [ "$#" -gt 0 ]; then BM="$SHAARLI_INSTANCE/?post=$*" @@ -32,6 +22,6 @@ fi if [ -n "$QUTE_FIFO" ]; then echo "open -t -r $BM" >>"$QUTE_FIFO" else - _open "$BM" + xdg-open "$BM" fi diff --git a/qutebrowser/data/userscripts/wallabag_add.sh b/qutebrowser/data/userscripts/wallabag_add.sh index 4b982e3..3d3eedf 100755 --- a/qutebrowser/data/userscripts/wallabag_add.sh +++ b/qutebrowser/data/userscripts/wallabag_add.sh @@ -12,16 +12,6 @@ # Configure your wallabag instance with this: WALLABAG_INSTANCE="https://read.martyoeh.me" -_open() { - if command -v open >/dev/null 2>&1; then - open "$1" & - elif command -v mimeo >/dev/null 2>&1; then - mimeo "$1" & - else - xdg-open "$1" & - fi -} - # only works for wallabag v2.* if [ "$#" -gt 0 ]; then BM="$WALLABAG_INSTANCE/bookmarklet?url=$*" @@ -32,5 +22,5 @@ fi if [ -n "$QUTE_FIFO" ]; then echo "open -b -r $BM" >>"$QUTE_FIFO" else - _open "$BM" + xdg-open "$BM" fi diff --git a/qutebrowser/scripts/recently-downloaded b/qutebrowser/scripts/recently-downloaded index 5e87be9..19dd925 100755 --- a/qutebrowser/scripts/recently-downloaded +++ b/qutebrowser/scripts/recently-downloaded @@ -100,14 +100,19 @@ if [ -z "$line" ]; then exit 0 fi +msg info "file is $line" path="$DOWNLOAD_DIR/$line" +filetype=$(xdg-mime query filetype "$path") +application=$(xdg-mime query default "$filetype") -msg info "Opening »$line«." +if [ -z "$application" ]; then + die "Do not know how to open »$line« of type $filetype" +fi -if command -v open >/dev/null 2>&1; then +msg info "Opening »$line« (of type $filetype) with ${application%.desktop}" + +if type open >/dev/null 2>&1; then open "$path" & -elif command -v mimeo >/dev/null 2>&1; then - mimeo "$path" & else xdg-open "$path" & fi diff --git a/services/sv/_example/log/run b/services/sv/_example/log/run new file mode 100755 index 0000000..aca60e4 --- /dev/null +++ b/services/sv/_example/log/run @@ -0,0 +1,3 @@ +#!/usr/bin/env sh + +exec svlogd -ttt /home/marty/myservice/logs diff --git a/services/sv/_example/run b/services/sv/_example/run new file mode 100755 index 0000000..962758c --- /dev/null +++ b/services/sv/_example/run @@ -0,0 +1,4 @@ +#!/bin/sh -e + +exec 2>&1 +exec /home/marty/myservice/example-service.sh diff --git a/services/sv/loadenv/log/run b/services/sv/loadenv/log/run deleted file mode 100755 index e9f8c5c..0000000 --- a/services/sv/loadenv/log/run +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env sh - -exec vlogger -t loadenv -p daemon diff --git a/services/sv/loadenv/run b/services/sv/loadenv/run deleted file mode 100755 index 4e45759..0000000 --- a/services/sv/loadenv/run +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# Loadenv service ensures turstile environment gets populated with all -# profile-loaded environment variables. -# -# To use this service with other turnstile user services, ensure it gets -# started before anything else is started by putting it into `turnstile-ready` -# service conf as a core service. -# -# Will also load the profile file from a custom XDG-compliant -# ~/.config/sh/profile directory before falling back to the home directory -# ~/.profile file. -# This location can be manually overriden by putting the following into the -# service conf file: -# XDG_PROFILE=/my/location/somewhere/profile - -[ -r ./conf ] && . ./conf - -if [ -e "$HOME/.config/sh/profile" ]; then - XDG_PROFILE="${XDG_PROFILE:-HOME/.config/sh/profile}" -fi - -ENV=${XDG_PROFILE:-$HOME/.profile} sh -i -c env | while IFS= read -r line; do - value=${line#*=} - name=${line%%=*} - echo "$value" > "$TURNSTILE_ENV_DIR/$name" -done - -exec 2>&1 -exec pause diff --git a/services/sv/river/run b/services/sv/river/run index cb6ab26..0bc4d0b 100755 --- a/services/sv/river/run +++ b/services/sv/river/run @@ -2,5 +2,9 @@ [ -r ./conf ] && . ./conf +if [ -d "$TURNSTILE_ENV_DIR" ]; then + echo "$HOME/.local/bin:$PATH" > "$TURNSTILE_ENV_DIR/PATH" +fi + exec 2>&1 exec chpst -e "$TURNSTILE_ENV_DIR" river -log-level warning diff --git a/services/sv/turnstile-ready/conf b/services/sv/turnstile-ready/conf index 97b5c92..68063d2 100644 --- a/services/sv/turnstile-ready/conf +++ b/services/sv/turnstile-ready/conf @@ -1 +1 @@ -core_services="loadenv dbus" +core_services="dbus" diff --git a/social/.config/tut/config.ini b/social/.config/tut/config.ini index 16efe8a..c6b7031 100644 --- a/social/.config/tut/config.ini +++ b/social/.config/tut/config.ini @@ -243,7 +243,7 @@ video-reverse=false # Your audio viewer. # default=xdg-open -audio-viewer=mimeo +audio-viewer=xdg-open # Open the audio viewer in the same terminal as toot. Only for terminal based # viewers. @@ -261,7 +261,7 @@ audio-reverse=false # Your web browser. # default=xdg-open -link-viewer=mimeo +link-viewer=xdg-open # Open the browser in the same terminal as toot. Only for terminal based # browsers. diff --git a/terminal/.config/nushell/config.nu b/terminal/.config/nushell/config.nu index ccb2053..72e382c 100644 --- a/terminal/.config/nushell/config.nu +++ b/terminal/.config/nushell/config.nu @@ -63,9 +63,7 @@ alias l = ls alias cl = clear alias md = mkdir -def --env mcd [path: path] { +def --env mcd [path: one_of(string glob)] { mkdir $path cd $path } - -alias v = nvim