Compare commits

..

No commits in common. "6716a763b7734305d4233412eb371af963b26ac1" and "76df60fd3bbd9114a202edda8b54e300c27e8ac2" have entirely different histories.

7 changed files with 16 additions and 21 deletions

View file

@ -58,6 +58,9 @@
;;; ORG
(unpin! org-journal)
(package! org-journal
:recipe (:host github :repo "toemacs/org-journal")
)
(package! websocket)
(package! org-roam-ui

View file

@ -6,7 +6,6 @@
"/home/janek/.local/share/puddletag/actions/standard.action",
"/home/janek/.local/share/puddletag/actions/caseconversion.action",
"/home/janek/.local/share/puddletag/actions/Artist splitting.action",
"/home/janek/.local/share/puddletag/actions/Genre Splitting.action",
"/home/janek/.local/share/puddletag/actions/Swap artists.action",
"/home/janek/.local/share/puddletag/actions/Genre House.action",
"/home/janek/.local/share/puddletag/actions/Genre Acoustic.action",
@ -17,7 +16,7 @@
},
"main": {
"lang": "auto",
"lastfolder": "/home/janek/data/4-media/music/Electronic/Feint",
"lastfolder": "/home/janek/data/4-media/music",
"maximized": false
},
"playlist": {
@ -44,7 +43,7 @@
"fontsize": 10,
"rowsize": 43,
"sort_fields": [
"title"
"genre"
],
"sort_reverse": false
},
@ -122,16 +121,15 @@
"%artist% - %track% - %title%",
"%artist% - %album% - %track% - %title%"
],
"index": 1
"index": 0
},
"functions": {
"last_used": "remove_dupes"
"last_used": "regex"
},
"actions": {
"checked": [
"Standard",
"Artist splitting",
"Genre Splitting"
"Artist splitting"
]
},
"quick_actions": {

View file

@ -68,7 +68,7 @@ formatsongs() {
(
find -maxdepth 1 -type d | formatin
find "$@" "$PWD" -type d | while read d;
do builtin cd "$d" && findsongs | formatin
do builtin cd $d && findsongs | formatin
done
)
# fd --no-ignore-vcs --type f --extension opus --exec opusdec --quiet "{}" "{.}.wav" \; ".*" "$@"
@ -91,9 +91,8 @@ formatin() {
formatsong() {
echo "$1" | sed -e 's/\b\(ft\|Ft\|Feat\|featuring\)\([ .]\)/feat\2/;
s/\bfeat /feat. /;
s/)(/) (/g;
s/ [[(]\(Free Download\|Original Mix\|Original\|Full Stream\|NCS Release\)[])]//i;
s/ (\(Acoustic\|Live|.* Remix\))/ [\1]/i;
s/ (\(Acoustic\|Live\))/ [\1]/i;
s/ \[\(feat.*\)\]/ (\1)/i;
s/^\([A-z]\+\) The \([^-]\+\)$/\1, the \2/g;
s/ \(\..\{2,4\}\)$/\1/;

View file

@ -61,7 +61,7 @@ find $HOME -maxdepth 1 -type l -exec file {} + |
sed 's/.* //' | xargs -r mkdir -p
link python /usr/bin/python3
# TODO don't link these prematurely, might lead to installation conflicts
# TODO don't do these prematurely
link fdfind /usr/bin/fd
link batcat /usr/bin/bat

View file

@ -1,3 +1,3 @@
if test -z "$DISPLAY" && test "$XDG_VTNR" -eq 1 && which startx >/dev/null
if test -z "$DISPLAY" && test "$XDG_VTNR" -eq 1
then exec startx
fi

View file

@ -1,6 +1,6 @@
#!/bin/sh
# Emacs in the terminal
pgrep --full "emacs" >/dev/null || emacs --daemon
pgrep --full "emacs .*-daemon" >/dev/null || emacs --daemon
emacsclient --create-frame --tty "$@"
exit=$?
stty sane

View file

@ -1,12 +1,7 @@
#!/bin/sh -e
# Type in NoVNC - from clipboard or interactively with german layout
# Type in NoVNC with german layout
xdotool search --onlyvisible --classname Navigator windowactivate # Activate Firefox
if test $# -gt 0
then
setxkbmap de
sleep 0.1
xdotool type --delay 80ms --clearmodifiers "${@:-$(xclip -sel clip -o)}"
xdotool type --delay 80ms --clearmodifiers "$@"
update-keyboard-layout >/dev/null
else
xdotool type --delay 80ms --clearmodifiers "${xclip -sel clip -o}"
fi