diff --git a/.bin/_config b/.bin/_config index c3d3097..9a9bc78 100644 --- a/.bin/_config +++ b/.bin/_config @@ -5,7 +5,7 @@ # FONTS # DFONT="FuraCodeNerdFont-13" # Font for dmenu -SFONT="FuraCodeNerdFont-13" # productive +SFONT="FuraCodeNerdFont-11" # productive BFONT="FuraCodeNerdFont-20" # couch distance HFONT="FuraCodeNerdFont-21" # presentation @@ -21,10 +21,10 @@ HTERM="st -f $HFONT" # # NOTION ORANGE -DMENUOPTS="-fn '$DFONT' -nb #121212 -nf #707070 -sf #FFA600 -sb #121212 -l 20 -i -f" +# DMENUOPTS="-fn '$DFONT' -nb #121212 -nf #707070 -sf #FFA600 -sb #121212 -l 20 -i -f" # SPECTRWM GREY -# DMENUOPTS="-fn '$DFONT' -nb #121212 -nf #707070 -sf #CCCCCC -sb #121212 -l 20 -i -f" +DMENUOPTS="-fn '$DFONT' -nb #121212 -nf #707070 -sf #CCCCCC -sb #121212 -l 20 -i -f" DMENU_CMD="dmenu $DMENUOPTS" DMENURUN_CMD="dmenu_run $DMENUOPTS" diff --git a/.bin/dev-src b/.bin/dev-src index 0a425d4..c675817 100755 --- a/.bin/dev-src +++ b/.bin/dev-src @@ -1,9 +1,25 @@ #!/bin/sh . ~/.bin/_config -cd "${DEVDIR}" +if [ ! -z "$1" ] +then + QUERY="--query $1" +fi +export INITIAL_QUERY="$1" -F=$(find * \ +cd /usr + +( find src \ + ports/{archivers,astro,audio,benchmarks} \ + ports/{biology,books,cad,chinese,comms} \ + ports/{converters,databases,devel,editors} \ + ports/{education,emulators,fonts,games} \ + ports/{geo,graphics,infrastructure} \ + ports/{inputmethods,japanese,java,korean} \ + ports/{lang,mail,math,meta,misc,multimedia} \ + ports/{mystuff,net,news,plan9,print} \ + ports/{productivity,security,shells,sysutils} \ + ports/{telephony,textproc,wayland,www,x11} \ -not -path "*/CVS/*" \ -not -path "*/.git/*" \ -type f \ @@ -20,17 +36,26 @@ F=$(find * \ -o -name "*.in" \ -o -name "*conf" \ -o -name "*devs" \ - -o -name "Makefile" \ + -o -name "patch-*" \ + -o -name "Makefile*" \ -o -name "PLIST*" \ -o -name "DESCR*" \ -o -name ".gitignore" \ -o -name ".cvsignore" \ - \) | fzf \ - --exact \ - --no-sort \ - --preview-window=right:65% \ - --preview='highlight -O ansi -O xterm256 --force {}' \ -); + \) > /tmp/dev-src-list.tmp && mv /tmp/dev-src-list.tmp /tmp/dev-src-list ) & + + +[ ! -f /tmp/dev-src-list ] \ + && wait + + +F="$(fzf --exact \ + --no-sort \ + --preview-window=right:65% \ + $QUERY \ + --preview='highlight -O ansi -O xterm256 --force {}' \ + < /tmp/dev-src-list + )" + +[ -z "$F" ] || v "$F" -test -z "$F" \ - || vim "$F"; diff --git a/.bin/sp b/.bin/sp index bfec5fc..7445ce1 100755 --- a/.bin/sp +++ b/.bin/sp @@ -1,7 +1,7 @@ -#!/bin/sh -x +#!/bin/sh # set the following quirk in .config/spectrwm/spectrwm.conf -# quirk[scratchpad] = FLOAT + ANYWHERE + FOCUSPREV +# quirk[scratchpad] = FLOAT + ANYWHERE # get scratchpad window id WID=$(wmctrl -x -l scratchpad | fgrep '.scratchpad' | cut -d" " -f1) @@ -15,10 +15,10 @@ else then # get current workspace ID CWID=$(wmctrl -d | awk '{ if ($2 == "*") print $1 }') - # move window to current workspace - wmctrl -i -r $WID -t $CWID # remove hidden flag wmctrl -i -r $WID -b remove,hidden + # move window to current workspace + wmctrl -i -r $WID -t $CWID # activate (give focus) wmctrl -i -R $WID else diff --git a/.config/spectrwm/spectrwm.conf b/.config/spectrwm/spectrwm.conf index b6a27e2..33bc2a5 100644 --- a/.config/spectrwm/spectrwm.conf +++ b/.config/spectrwm/spectrwm.conf @@ -17,7 +17,7 @@ bar_font_color_selected = rgb:ff/ff/ff bar_font = FuraCodeNerdFont-11 bar_font_pua = FuraCodeNerdFont-13 bar_action = cbar -bar_at_bottom = 1 +bar_at_bottom = 0 bar_format = +S +L  +N   +I   +M  +W +|1R +A %Y-%m-%d %H:%M workspace_indicator = listall,markcurrent,markactive,markempty,noindexes workspace_mark_current = '' @@ -32,7 +32,8 @@ stack_mark_max = '' # Custom Quirks quirk[IPMIView20-IPMIView20:IPMIView20-IPMIView20] = FLOAT + ANYWHERE -quirk[scratchpad] = FLOAT + ANYWHERE + FOCUSPREV +quirk[scratchpad] = FLOAT + ANYWHERE + OBEYAPPFOCUSREQ +quirk[tabbed] = FLOAT + ANYWHERE quirk[Nsxiv:tabbed] = NOFOCUSONMAP + FOCUSPREV # Window Manager Keys diff --git a/.kshrc b/.kshrc index e449423..ab8150f 100644 --- a/.kshrc +++ b/.kshrc @@ -147,17 +147,25 @@ bookmarks-clean() { && mv /tmp/browser_history ~/.browser_history } -alias webtorrent="~/node_modules/.bin/webtorrent" -rem-sync() { - ssh vorstand.uugrn.org "cat /home/vorstand/private/Kalender/uugrn.rem" > ~/.reminders/uugrn.rem +alias rem-edit="cd ~/.reminders && ./edit.sh" +alias rem-week="remind -c+cl1 ~/.reminders" +alias rem-all="remind -s -n1 ~/.reminders | sort" + +alias rem="remind -s+2 ~/.reminders | cut -d' ' -f1 -f6- | sort" +alias rem-edit-birthdays="vim ~/.reminders/birthdays.rem" +alias rem-edit-personal="vim ~/.reminders/personal.rem" + +rem-fetch-uugrn() { + ssh vorstand.uugrn.org \ + "cat /home/vorstand/private/Kalender/uugrn.rem" \ + > ~/.reminders/uugrn/uugrn.rem } -rem-edit-uug() { +rem-edit-uugrn() { vim sftp://vorstand@vorstand.uugrn.org/private/Kalender/uugrn.rem \ && ssh -q sdk@vorstand.uugrn.org /home/sdk/.bin/make_calendar.sh } -alias rem="remind -s ~/.reminders" -alias rem-edit-birthdays="vim ~/.reminders/birthdays.rem" -alias rem-edit-personal="vim ~/.reminders/personal.rem" + +alias webtorrent="~/node_modules/.bin/webtorrent" # vim-snippets alias snip_sh="vim ~/.vim/bundle/vim-snipmate/snippets/sh.snippets" @@ -382,7 +390,15 @@ cvs-import-simulate() { ports/$(dirname $PWD)/$(basename $PWD) sdk sdk_$(date +"%Y%m%d") } +pkg-reset() { + pkg_delete -cIX $( /dev/null +} + p() { cd "$(" \ + sh@codevoid.de diff --git a/.reminders/uugrn.rem b/.reminders/uugrn.rem deleted file mode 100644 index 45be196..0000000 --- a/.reminders/uugrn.rem +++ /dev/null @@ -1,32 +0,0 @@ -# Hier sind Einzeltermine und Ausnahmen hinterlegt -# Mit OMIT, kann einen Termin aus der unten definierten Serie raus nehmen -# Mir REM kann man neue Termine anlegen. Wenn ein Serientermin ersetzt -# werden soll, dann gibt es jeweils einen OMIT für das zu Löschende -# Datum und einen REM Eintrag für den Ersatztermin. - -# 2022 -OMIT 4 Nov 2022 # Dezernat 16 nicht verfügbar -REM 11 Nov 2022 AT 19:00 DURATION 4:30 MSG UUGRN Fixme (statt 4.Nov) \ -|Dezernat16, Emil-Maier-Str. 16, 69115 Heidelberg - -# 2023 -OMIT 6 Jan 2023 # Dezernat 16 nicht verfügbar + Feiertag -REM 13 Jan 2023 AT 19:00 DURATION 4:30 MSG UUGRN Fixme (statt 6.Jan) \ -|Dezernat16, Emil-Maier-Str. 16, 69115 Heidelberg - -OMIT 7 Apr 2023 # Dezernat 16 nicht verfügbar -REM 14 Apr 2023 AT 19:00 DURATION 4:30 MSG UUGRN Fixme (statt 7.Apr) \ -|Dezernat16, Emil-Maier-Str. 16, 69115 Heidelberg - -# Hier sind die Serien hinterlegt. Die müssen ganz unten stehen, weil -# sonst die darüber definierten OMIT Regeln nicht ziehen. - -# Serientermine -REM Third Monday AT 18:00 DURATION 4:00 SKIP MSG UUGRN Stammtisch \ -|METROPOLIS Lounge Walldorf, Impexstr. 1, 69190 Walldorf -REM First Friday AT 19:00 DURATION 4:30 SKIP MSG UUGRN FIXME \ -|Dezernat16, Emil-Maier-Str. 16, 69115 Heidelberg - -# Es ist möglich eine Location mit anzugeben. Dazu am Text eine Pipe -# anfügen und direkt (ohne Leerzeichen) die Location angeben. Beispiel: -# "UUGRN Stammtisch |Metropolis Walldorf"