Compare commits

..

4 commits

Author SHA1 Message Date
xeruf
6716a763b7 config/zsh/zlogin: fix malfunction on servers 2023-01-10 00:50:46 +01:00
xeruf
6723119ef3 config/music: ease restructuring 2023-01-10 00:47:53 +01:00
xeruf
66e8f203c4 bin: more typing options 2023-01-10 00:47:27 +01:00
xeruf
b2f743be35 config/doom: move back to original org-journal repo 2023-01-10 00:46:37 +01:00
7 changed files with 21 additions and 16 deletions

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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