Compare commits

...

11 commits

Author SHA1 Message Date
a3b00c4693
mpv: Fix sponsorblock code and formatting
Fixed global variable naming (capitalized) and let code be formatted by
formatter.
2022-10-08 18:13:43 +02:00
485730ba83
tmux: Change todo.session burndown display
Changed to display overall accumulation of tasks again.
Would overall probably be best to display a combination of accomplished
and still to be done tasks.
2022-10-08 18:05:39 +02:00
209ac92eb5
wayland: Set fontconfig dpi for external screen
Correctly set dpi for currently connected screen of 24".
2022-10-08 18:04:49 +02:00
53c6373b00
riverwm: Fix rivercarro and brightness on launch
Automatically set brightness to 70% on startup.
Fixed options passed to rivercarro tiling manager (for current
rivercarro version, will have to be changed in future again).
2022-10-08 18:02:38 +02:00
7a18bc4a21
zsh: Make c-e always switch to editor
Added always listening to c-e to switch to edit current line in editor,
regardless of already being in vi-command mode or not.
2022-10-08 17:55:27 +02:00
cb698090c6
scripts: Fix nsxiv-rifle to work with symlinks 2022-10-08 17:54:24 +02:00
b8e97120d9
qutebrowser: Rewrite medium urls to use scribe.rip 2022-10-08 17:52:33 +02:00
b67ceb1330
git: Update commit signature key 2022-10-08 17:49:00 +02:00
179840e4c0
sh: Add vim personal knowledge base alias
Added alias `vw` to open the index page of my PKB (essentially the start
page of my wiki) using my zettelkasten.nvim plugin.
2022-08-10 09:01:09 +02:00
524272f063
services: Remove a slew of X-related services
These were largely remaining systemd services after I removed X and that
now dangle in limbo without working correctly.

Two services are not X related, which are the two dropdowns that I
rarely use anymore on riverwm. May substitute them for something similar
soon but do not need them at the moment.
2022-08-10 08:59:20 +02:00
8c00641c17
qutebrowser: Change image viewing hints from rapid
Changed the hinting style for image viewing from rapid hinting to
normal, single link hinting.

In the future I will have to think more about image viewing
shortcuts in general:

I want to be able to open the current page, a single link (default) and
multiple links in quick succession - how to accomplish without
overloading the lleader+i mapping terribly?
Plus, ideally I would want there to be a shortcut to open both links
(hint links) and images themselves (hint images) which may require even
further mappings.
2022-08-10 08:55:30 +02:00
22 changed files with 57 additions and 102 deletions

View file

@ -1,7 +1,7 @@
[user] [user]
email = marty.oehme@gmail.com email = marty.oehme@gmail.com
name = Marty Oehme name = Marty Oehme
signingkey = B7538B8F50A1C800 signingkey = 73BA40D5AFAF49C9
[init] [init]
defaultBranch = main defaultBranch = main
[alias] [alias]

View file

@ -5,7 +5,6 @@
-- --
-- original from https://codeberg.org/jouni/mpv_sponsorblock_minimal -- original from https://codeberg.org/jouni/mpv_sponsorblock_minimal
-- adapted for local playback skipping and some refactoring by me -- adapted for local playback skipping and some refactoring by me
local options = { local options = {
API = "https://sponsor.ajay.app/api/skipSegments", API = "https://sponsor.ajay.app/api/skipSegments",
@ -15,21 +14,21 @@ local options = {
local function getranges() local function getranges()
local args = { local args = {
"curl", "curl", "-s", "-d", "videoID=" .. Youtube_id, "-d",
"-s", "categories=[" .. options.categories .. "]", "-G", options.API
"-d", }
"videoID="..youtube_id, local sponsors = mp.command_native({
"-d", name = "subprocess",
"categories=["..options.categories.."]", capture_stdout = true,
"-G", playback_only = false,
options.API} args = args
local sponsors = mp.command_native({name = "subprocess", capture_stdout = true, playback_only = false, args = args}) })
if string.match(sponsors.stdout, "%[(.-)%]") then if string.match(sponsors.stdout, "%[(.-)%]") then
ranges = {} Ranges = {}
for i in string.gmatch(string.sub(sponsors.stdout, 2, -2), "%[(.-)%]") do for i in string.gmatch(string.sub(sponsors.stdout, 2, -2), "%[(.-)%]") do
k,v = string.match(i,"(%d+.?%d*),(%d+.?%d*)") local k, v = string.match(i, "(%d+.?%d*),(%d+.?%d*)")
ranges[k] = v Ranges[k] = v
end end
end end
return return
@ -37,11 +36,14 @@ local function getranges()
local function skip_ads(name, pos) local function skip_ads(name, pos)
if pos ~= nil then if pos ~= nil then
for k,v in pairs(ranges) do for k, v in pairs(Ranges) do
if tonumber(k) <= pos and tonumber(v) > pos then if tonumber(k) <= pos and tonumber(v) > pos then
-- this message may sometimes be wrong -- this message may sometimes be wrong
-- it only seems to be a visual thing though -- it only seems to be a visual thing though
mp.osd_message("[sponsorblock] skipping forward "..math.floor(tonumber(v)-mp.get_property("time-pos")).."s") mp.osd_message("[sponsorblock] skipping forward " ..
math.floor(
tonumber(v) - mp.get_property("time-pos")) ..
"s")
-- need to do the +0.01 otherwise mpv will start spamming skip sometimes -- need to do the +0.01 otherwise mpv will start spamming skip sometimes
-- example: https://www.youtube.com/watch?v=4ypMJzeNooo -- example: https://www.youtube.com/watch?v=4ypMJzeNooo
mp.set_property("time-pos", tonumber(v) + 0.01) mp.set_property("time-pos", tonumber(v) + 0.01)
@ -54,17 +56,21 @@ end
local function file_loaded() local function file_loaded()
local video_path = mp.get_property("path") local video_path = mp.get_property("path")
local youtube_id1 = string.match(video_path, "https?://youtu%.be/([%w-_]+).*") local youtube_id1 = string.match(video_path,
local youtube_id2 = string.match(video_path, "https?://w?w?w?%.?youtube%.com/v/([%w-_]+).*") "https?://youtu%.be/([%w-_]+).*")
local youtube_id2 = string.match(video_path,
"https?://w?w?w?%.?youtube%.com/v/([%w-_]+).*")
local youtube_id3 = string.match(video_path, "/watch.*[?&]v=([%w-_]+).*") local youtube_id3 = string.match(video_path, "/watch.*[?&]v=([%w-_]+).*")
local youtube_id4 = string.match(video_path, "/embed/([%w-_]+).*") local youtube_id4 = string.match(video_path, "/embed/([%w-_]+).*")
local localytfile = string.match(video_path, "-([%a%d%-_]+)%.[mw][kpe][v4b][m]?$") local localytfile = string.match(video_path,
youtube_id = youtube_id1 or youtube_id2 or youtube_id3 or youtube_id4 or localytfile "-([%a%d%-_]+)%.[mw][kpe][v4b][m]?$")
if not youtube_id or string.len(youtube_id) < 11 then return end Youtube_id = youtube_id1 or youtube_id2 or youtube_id3 or youtube_id4 or
youtube_id = string.sub(youtube_id, 1, 11) localytfile
if not Youtube_id or string.len(Youtube_id) < 11 then return end
Youtube_id = string.sub(Youtube_id, 1, 11)
getranges() getranges()
if ranges then if Ranges then
ON = true ON = true
mp.add_key_binding("b", "sponsorblock", toggle) mp.add_key_binding("b", "sponsorblock", toggle)
mp.observe_property("time-pos", "native", skip_ads) mp.observe_property("time-pos", "native", skip_ads)

View file

@ -50,7 +50,7 @@ config.bind(leader + "tV", "set tabs.position left")
config.bind(lleader + "M", "spawn umpv {url}") config.bind(lleader + "M", "spawn umpv {url}")
config.bind(lleader + "m", "hint links spawn umpv {hint-url}") config.bind(lleader + "m", "hint links spawn umpv {hint-url}")
config.bind(lleader + "I", "spawn nsxiv-rifle {url}") config.bind(lleader + "I", "spawn nsxiv-rifle {url}")
config.bind(lleader + "i", "hint --rapid links spawn nsxiv-rifle {hint-url}") config.bind(lleader + "i", "hint links spawn nsxiv-rifle {hint-url}")
# bind youtube-dl to download the current page/links # bind youtube-dl to download the current page/links
config.bind(lleader + "dM", "spawn vidl {url}") config.bind(lleader + "dM", "spawn vidl {url}")

View file

@ -38,6 +38,7 @@ redirects = {
"www.instagram.com": "bibliogram.art", "www.instagram.com": "bibliogram.art",
"wikipedia.org": "wikiless.org", "wikipedia.org": "wikiless.org",
"en.wikipedia.org": "wikiless.org", "en.wikipedia.org": "wikiless.org",
"medium.com": "scribe.rip",
} }

View file

@ -1,6 +1,8 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# Open any of: quickmarks, bookmarks and browser history via dmenu (or rofi) # Open any of: quickmarks, bookmarks and browser history via dmenu (or rofi)
# Handle open -s && open -t with bemenu # Handle open -s && open -t with bemenu
#
# Requires sqlite3 binary installed to traverse the history.
#:bind o spawn --userscript /path/to/userscripts/qutedmenu open #:bind o spawn --userscript /path/to/userscripts/qutedmenu open
#:bind O spawn --userscript /path/to/userscripts/qutedmenu tab #:bind O spawn --userscript /path/to/userscripts/qutedmenu tab

View file

@ -20,7 +20,7 @@ cleanup() {
} }
from_local() { from_local() {
fpath="$(realpath "$1")" fpath="$(realpath -e "$1")"
ln -s "$fpath" "$cache_dir" ln -s "$fpath" "$cache_dir"
} }
@ -71,5 +71,5 @@ while [ -n "$1" ]; do
shift shift
done done
[ "$(find "$cache_dir" -type f -print | wc -l)" -ne 0 ] && [ "$(find -L "$cache_dir" -type f -print | wc -l)" -ne 0 ] &&
nsxiv -p "$cache_dir" nsxiv -p "$cache_dir"

View file

@ -1 +0,0 @@
/usr/lib/systemd/user/an2linuxserver.service

View file

@ -1 +0,0 @@
../dropdown-terminal.service

View file

@ -1 +0,0 @@
../dropdown-todo.service

View file

@ -1 +0,0 @@
../flashfocus.service

View file

@ -1 +0,0 @@
/usr/lib/systemd/user/greenclip.service

View file

@ -1 +0,0 @@
../x-started-confirm.service

View file

@ -1,13 +0,0 @@
[Unit]
Description=Terminal window hidden to be called at any point
Requires=x-started-confirm.service
After=x-started-confirm.service
[Service]
Type=simple
# workaround to allow relative executable invocation (i.e. current users' home dir)
ExecStart=/bin/bash -c 'kitty --title "dropdown-terminal" --class scratchpad'
Restart=always
[Install]
WantedBy=default.target

View file

@ -1,13 +0,0 @@
[Unit]
Description=Todo.md hidden vim instance
Requires=x-started-confirm.service
After=x-started-confirm.service
[Service]
Type=simple
# workaround to allow relative executable invocation (i.e. current users' home dir)
ExecStart=/bin/bash -c 'kitty --title "dropdown-todo" --class scratchpad nvim -c ":set nonumber norelativenumber noshowmode noruler laststatus=0 noshowcmd shortmess=F | :Limelight" %h/documents/records/todo.md'
Restart=always
[Install]
WantedBy=default.target

View file

@ -1,12 +0,0 @@
[Unit]
Description=Perform windows animations on focus
PartOf=graphical-session.target
Requires=x-started-confirm.service
After=x-started-confirm.service
[Service]
ExecStart=/usr/bin/flashfocus
Restart=on-failure
[Install]
WantedBy=default.target

View file

@ -1,3 +0,0 @@
[Unit]
Requires=x-started-confirm.service
After=x-started-confirm.service

View file

@ -1,10 +0,0 @@
[Unit]
Description=Monitor status of X server start
[Service]
Type=oneshot
ExecStart=/bin/bash -c '%h/.local/share/services/x-started-confirm.sh'
RestartSec=2
[Install]
WantedBy=default.target

View file

@ -10,8 +10,9 @@ unalias -a
# v shorthand for neovim # v shorthand for neovim
if exist nvim; then if exist nvim; then
alias v="nvim" alias v="nvim"
alias vs="nvim -c 'ScratchPad'"
alias vim="nvim" alias vim="nvim"
alias vs="nvim -c 'ScratchPad'" # open an empty 'scratchpad' which simply disappears after use
alias vw="nvim -c \"lua require 'zettelkasten'.index_open()\"" # open to personal wiki
elif exist vim; then elif exist vim; then
alias v="vim" alias v="vim"
else else

View file

@ -4,7 +4,7 @@ new-window -n dash
send-keys "cd ${XDG_DATA_HOME:-~/.local/share}/task/; fd . | entr -c task next" C-m send-keys "cd ${XDG_DATA_HOME:-~/.local/share}/task/; fd . | entr -c task next" C-m
split-window -h -l 71 split-window -h -l 71
send-keys "cd ${XDG_DATA_HOME:-~/.local/share}/task/; fd . | entr -c task summary" C-m send-keys "cd ${XDG_DATA_HOME:-~/.local/share}/task/; fd . | entr -c task summary" C-m
split-window -v "cd ${XDG_DATA_HOME:-~/.local/share}/task/; fd . | entr -c task end.after=tod-3m or entry.after=tod-1m burndown" split-window -v "cd ${XDG_DATA_HOME:-~/.local/share}/task/; fd . | entr -c task status:pending or +ACTIVE burndown"
select-pane -t 1 select-pane -t 1
split-window -v -l 5 split-window -v -l 5
send-keys "t" Space send-keys "t" Space

View file

@ -41,7 +41,7 @@
<bool>false</bool> <bool>false</bool>
</edit> </edit>
<edit name="dpi" mode="assign"> <edit name="dpi" mode="assign">
<double>92</double> <double>93</double>
</edit> </edit>
</match> </match>
</fontconfig> </fontconfig>

View file

@ -57,7 +57,7 @@ riverctl map normal $mod+Shift Space spawn "clipman pick --tool=bemenu"
riverctl map normal $mod+Shift R spawn "$term --class float -e qalc" riverctl map normal $mod+Shift R spawn "$term --class float -e qalc"
# Open emoji picker # Open emoji picker
riverctl map normal $mod+Shift E spawn "bemoji -t" riverctl map normal $mod+Shift E spawn "bemoji -nt"
# Open translation helper # Open translation helper
riverctl map normal $mod+Shift T spawn "bemenu-translate" riverctl map normal $mod+Shift T spawn "bemenu-translate"
@ -240,5 +240,6 @@ exec wl-paste -t text --watch clipman store &
riverctl default-layout rivercarro & riverctl default-layout rivercarro &
# start layouting engine # start layouting engine
killall rivercarro killall rivercarro
exec rivercarro -main-ratio 0.65 -view-padding 6 -outer-padding 6 & exec rivercarro -main-ratio 0.65 &
# brightnessctl set 100% # exec rivercarro -main-ratio 0.65 -view-padding 6 -outer-padding 6 & # -> does not work with current rivercarro version (0.1.4)
brightnessctl set 70%

View file

@ -70,13 +70,13 @@ prompt pure
# load additional aliases # load additional aliases
if [ -d "$CONFDIR/sh/alias.d" ]; then if [ -d "$CONFDIR/sh/alias.d" ]; then
for _alias in "$CONFDIR/sh/alias.d"/*.sh; do for _alias in "$CONFDIR/sh/alias.d"/*.sh; do
. "$_alias" source "$_alias"
done done
unset _alias unset _alias
fi fi
if [ -d "$ZSHCONFDIR/alias.d" ]; then if [ -d "$ZSHCONFDIR/alias.d" ]; then
for _alias in "$ZSHCONFDIR/alias.d"/*.sh; do for _alias in "$ZSHCONFDIR/alias.d"/*.sh; do
. "$_alias" source "$_alias"
done done
unset _alias unset _alias
fi fi
@ -171,6 +171,7 @@ bindkey -M isearch '^N' history-incremental-search-forward
# Send command to editor and back for execution # Send command to editor and back for execution
zle -N edit-command-line zle -N edit-command-line
bindkey '^e' edit-command-line bindkey '^e' edit-command-line
bindkey -M vicmd '^e' edit-command-line
# Deduplicate PATH - remove any duplicate entries from PATH # Deduplicate PATH - remove any duplicate entries from PATH
# from: https://unix.stackexchange.com/questions/40749/remove-duplicate-path-entries-with-awk-command # from: https://unix.stackexchange.com/questions/40749/remove-duplicate-path-entries-with-awk-command