From 6899ba8fd259d12168e14dc56d6c5a71a3d45a44 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sat, 11 Nov 2023 14:23:59 +0100 Subject: [PATCH] Auto-commit kunsi-p14s.kunbox.net 2023-11-11 14:23:59 --- .config/dunst/dunstrc | 4 ++-- .config/fish/config.fish | 14 ++++++++++-- .config/grobi.conf | 40 ++++++++++---------------------- .config/i3/config | 15 +++++------- .config/i3pystatus/config.py | 26 ++++++++++----------- .fehbg | 2 +- .gnupg/gpg-agent.conf | 10 ++++---- .ssh/config | 44 ++++++++++++++++++------------------ 8 files changed, 73 insertions(+), 82 deletions(-) diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc index b128f25..0f31d13 100644 --- a/.config/dunst/dunstrc +++ b/.config/dunst/dunstrc @@ -113,7 +113,7 @@ # # It's important to note that markup inside the format option will be parsed # regardless of what this is set to. - markup = full + markup = no # The format of the message. Possible variables are: # %a appname @@ -129,7 +129,7 @@ # Alignment of message text. # Possible values are "left", "center" and "right". - alignment = right + alignment = left # Show age of message if message is older than show_age_threshold # seconds. diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 235373a..ad4ea94 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -4,7 +4,6 @@ set -U fish_features stderr-nocaret qmark-noglob set PATH $PATH /home/kunsi/.local/bin /home/kunsi/.gem/ruby/2.6.0/bin/ /home/kunsi/.bin set -U -x SSH_AUTH_SOCK $(gpgconf --list-dirs agent-ssh-socket) -gpgconf --launch gpg-agent alias bwr='cd ~/git/bundlewrap/' alias cal='cal -v -m -3' @@ -17,7 +16,8 @@ alias tmp='cd (mktemp -d -p /home/kunsi --suffix=.(date +%F))' alias v='vim -p' alias voc-ansible='/home/kunsi/.bin/voc-ansible' alias voc2gui='cd /home/kunsi/git/voctomix/ && .venv/bin/python voctogui/voctogui.py' -alias weechat='mosh rx300 -- tmux attach-session -d -t weechat-tmux' +alias weechat='mosh carlene -- tmux attach-session -d -t weechat-tmux' +alias wipa="watch -cn0.3 'ip --color=always -brief addr show; echo; ip --color=always route show; ip -6 --color=always route show'" alias youtube-dl='yt-dlp --compat-options youtube-dl' alias lumos='mosquitto_pub -h 172.19.138.20 -t /switch/wohnzimmer/stehlampe/cmnd/POWER -m "ON"' @@ -25,6 +25,11 @@ alias nox='mosquitto_pub -h 172.19.138.20 -t /switch/wohnzimmer/stehlampe/cmnd/P alias coffee='mosquitto_pub -h 172.19.138.20 -t /switch/kueche/kaffeemaschine/cmnd/POWER -m "ON"' alias nocoffee='mosquitto_pub -h 172.19.138.20 -t /switch/kueche/kaffeemaschine/cmnd/POWER -m "OFF"' +alias wg_up='sudo networkctl up wg_htz-cloud_wi' +alias wg_down='sudo networkctl down wg_htz-cloud_wi' +alias voc_up='sudo systemctl start openvpn-client@c3voc' +alias voc_down='sudo systemctl stop openvpn-client@c3voc' + alias ga.='git add .' alias ga='git add' alias gc='git commit' @@ -35,10 +40,15 @@ alias gp='git push' alias gpu='git push -u origin HEAD' alias gs='git status --short' +alias libreoffice_present='libreoffice --impress --invisible --show' + set -x BW_ITEM_WORKERS 16 set -x BW_NODE_WORKERS 16 set -x BW_KEEPASS_FILE /home/kunsi/git/passwords/voc.kdbx +# mollys mpd, see /etc/hosts +set -x MPD_HOST mpd.local + function fish_greeting echo -n "" end diff --git a/.config/grobi.conf b/.config/grobi.conf index a3f219b..8fec3e5 100644 --- a/.config/grobi.conf +++ b/.config/grobi.conf @@ -9,6 +9,18 @@ on_failure: - xrandr --auto rules: + - name: 'home' + outputs_connected: + - HDMI-A-0 + - DisplayPort-0 + configure_row: + - DisplayPort-0 + - HDMI-A-0 + primary: eDP + execute_after: + - xset s off + - sudo rfkill block wifi + - name: 'presentation' outputs_connected: - HDMI-A-0 @@ -43,34 +55,6 @@ rules: execute_after: - xset s off - - name: 'docked DP3+4' - outputs_connected: - - DisplayPort-3 - - DisplayPort-4 - configure_row: - - eDP - - DisplayPort-3 - - DisplayPort-4 - primary: DisplayPort-4 - execute_after: - - xset s off - - sudo rfkill block wifi - - sudo light -S 100 - - - name: 'docked DP5+6' - outputs_connected: - - DisplayPort-5 - - DisplayPort-6 - configure_row: - - eDP - - DisplayPort-5 - - DisplayPort-6 - primary: DisplayPort-6 - execute_after: - - xset s off - - sudo rfkill block wifi - - sudo light -S 100 - - name: 'internal only' configure_single: eDP primary: eDP diff --git a/.config/i3/config b/.config/i3/config index 919e477..0c72e9b 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -5,8 +5,8 @@ font pango:DB Office Regular 8 floating_modifier $mod -bindsym $mod+Return exec alacritty -bindsym $mod+Shift+Return exec alacritty --class terminal-floating -e python +bindsym $mod+Return exec kitty +bindsym $mod+Shift+Return exec kitty --class terminal-floating -e python bindsym $mod+Shift+x kill @@ -110,11 +110,10 @@ for_window [class="Gnome-calculator"] floating enable for_window [class="realvnc-vncviewer"] floating enable for_window [class="terminal-floating"] floating enable -workspace $ws1 output DisplayPort-3 -workspace $ws2 output DisplayPort-4 -workspace $ws3 output DisplayPort-3 -workspace $ws9 output eDP -workspace $ws10 output DisplayPort-4 +workspace $ws1 output DisplayPort-0 +workspace $ws2 output HDMI-A-0 +workspace $ws3 output DisplayPort-0 +workspace $ws10 output HDMI-A-0 exec_always setxkbmap -synch exec_always ~/.fehbg @@ -125,8 +124,6 @@ exec xsetroot -solid "#000000" exec xss-lock -n /home/kunsi/.bin/notify.sh -- /home/kunsi/.bin/screenlock.sh exec xinput disable 'SynPS/2 Synaptics TouchPad' -exec qpwgraph - bindsym XF86Favorites exec /home/kunsi/.bin/screenlock.sh bindsym XF86AudioRaiseVolume exec wpctl set-volume @DEFAULT_AUDIO_SINK@ 2%+; exec wpctl set-mute @DEFAULT_AUDIO_SINK@ 0 diff --git a/.config/i3pystatus/config.py b/.config/i3pystatus/config.py index 5a2095e..77b44ef 100644 --- a/.config/i3pystatus/config.py +++ b/.config/i3pystatus/config.py @@ -19,16 +19,16 @@ status.register("shell", format="♪D {output}", command="wpctl get-volume @DEFAULT_AUDIO_SINK@ | cut -d: -f2", interval=1) -status.register("shell", - format="{output}", - hints = {"markup": "pango"}, - command="/home/kunsi/.config/i3pystatus/microphone-status.sh", - on_rightclick="pactl set-source-mute alsa_input.pci-0000_07_00.6.HiFi__hw_acp__source toggle", - interval=1) +#status.register("shell", +# format="{output}", +# hints = {"markup": "pango"}, +# command="/home/kunsi/.config/i3pystatus/microphone-status.sh", +# on_rightclick="pactl set-source-mute alsa_input.pci-0000_07_00.6.HiFi__hw_acp__source toggle", +# interval=1) status.register("backlight", format="{percentage}%", - backlight="amdgpu_bl0", + backlight="amdgpu_bl1", on_leftclick="sudo light -S 10", on_rightclick="sudo light -S 50", interval=1) @@ -41,7 +41,7 @@ status.register("shell", on_rightclick="xset s off") status.register("clock", - format=("%a, %Y-%m-%d %H:%M:%S (W%V)", "Europe/Berlin")) + format=("%a, %Y-%m-%d %H:%M:%S %z (W%V)", "Europe/Berlin")) status.register("clock", format=("%Y-%m-%d %H:%M:%S UTC", "UTC")) @@ -58,8 +58,8 @@ status.register("battery", status.register("load", format="{avg1}") -status.register("amdgpu", - format="G: {temp}°C {gpu_usage}%") +#status.register("amdgpu", +# format="G: {temp}°C {gpu_usage}%") status.register("temp", format="C: {temp:.0f}°C", hints={"markup": "pango"}, @@ -97,9 +97,9 @@ status.register("shell", status.register("wifionice", hints = {"markup": "pango"}, url_on_click='https://travelynx.franzi.business/s/{last_station_no}?train={train_type}%20{train_no}', - wifi_adapters=['wlp3s0'], + wifi_adapters=['wlp2s0'], format_offtrain='Wann wieder Zug?', - format_ontrain='{train_type} {train_no} [{speed}km/h ]> {next_station}[ ' + format_ontrain='{train_type} {train_no} [~ {speed}km/h ]> {next_station}[ ' '\[{next_platform}\] {arrival_time} ' '({arrival_in}[ | {delay}])][ ' '(Net: {net_current} > \[{net_duration}\] ' @@ -119,7 +119,7 @@ status.register("network", detect_active=True, freq_divisor=1000000000, divisor=1024, - on_leftclick="alacritty --class terminal-floating -e sudo wifi-menu", + on_leftclick="kitty --class terminal-floating -e sudo wifi-menu", hints={"markup":"pango"}) #status.register("mpd", diff --git a/.fehbg b/.fehbg index 6ad3873..c7cdddf 100755 --- a/.fehbg +++ b/.fehbg @@ -1,2 +1,2 @@ #!/bin/sh -feh --no-fehbg --bg-scale '/home/kunsi/Pictures/The-rendezvous_peppercarrot-wallpaper_by-David-Revoy.jpg' +feh --no-fehbg --bg-fill '/home/kunsi/Pictures/IMG_20231013_175516.jpg' diff --git a/.gnupg/gpg-agent.conf b/.gnupg/gpg-agent.conf index 16dc82d..0e9db9e 100644 --- a/.gnupg/gpg-agent.conf +++ b/.gnupg/gpg-agent.conf @@ -1,8 +1,8 @@ -default-cache-ttl 2 -default-cache-ttl-ssh 5 -max-cache-ttl 2 -max-cache-ttl-ssh 30 +default-cache-ttl 120 +default-cache-ttl-ssh 120 +max-cache-ttl 600 +max-cache-ttl-ssh 1800 no-allow-external-cache enable-ssh-support ignore-cache-for-signing -pinentry-program /usr/bin/pinentry-qt +pinentry-program /usr/bin/pinentry diff --git a/.ssh/config b/.ssh/config index 1fad955..3426cac 100755 --- a/.ssh/config +++ b/.ssh/config @@ -5,6 +5,24 @@ Host * Include ~/.ssh/bwnodes +Host mixer191.lan.c3voc.de + Hostname 10.73.191.1 +Host encoder191.lan.c3voc.de + Hostname 10.73.191.3 + +Host ch-jump + Hostname jump.chaos-at-home.org + Port 2342 + User c3voc + +Host 10.73.7.* + ProxyJump ch-jump + +Host wrt194 + Hostname 178.250.162.46 + User root + Localforward 127.0.0.1:8080 127.0.0.1:80 + Host akamai.lan.c3voc.de User root @@ -14,14 +32,12 @@ Host cloudflare.lan.c3voc.de Host fastly.lan.c3voc.de User root -Host *.lan.c3voc.de +Host *.lan.c3voc.de 172.19.138.10 172.19.138.117 SetEnv TERM=xterm-256color - -#Host 10.73.200.201 -# User voc - -Host 172.19.138.4 + # for info-beamer and openwrt + HostKeyAlgorithms +ssh-rsa PubkeyAcceptedKeyTypes +ssh-rsa + #User voc Host voc-servercase-switch HostName 10.73.200.200 @@ -31,26 +47,10 @@ Host voc-servercase-switch SetEnv TERM=xterm-256color User admin -Host r3spluto - HostName r3spluto.ffdus.de - Port 62969 - -Host qzwi - #HostName 2a00:f820:528::4 - HostName 31.47.232.108 - LocalForward 3389 localhost:389 - -Host qzwi-backup - HostName 2a01:4f9:6b:2d99::28:6:1969 - Host proxmox-backupstorage HostName 2a01:4f9:6b:2d99::c0ff:ee User root -Host luther-netcup - HostName 46.38.249.46 - User sub4632_80 - Host voellerei HostName voellerei.club.entropia.de Port 22