From 7d541c9f7eb5c0107e388fa7e249c5762643c1b0 Mon Sep 17 00:00:00 2001 From: Von Birne <> Date: Mon, 29 Nov 2021 23:40:17 +0100 Subject: [PATCH 01/74] i3pystatus/ice-status.py change api url cert for portal.imice.de expired 2 weeks ago --- .config/i3pystatus/ice-status.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.config/i3pystatus/ice-status.py b/.config/i3pystatus/ice-status.py index 0102911..4a1f3b1 100755 --- a/.config/i3pystatus/ice-status.py +++ b/.config/i3pystatus/ice-status.py @@ -33,11 +33,11 @@ try: now = datetime.now() - trip_info_req = get('https://portal.imice.de/api1/rs/tripInfo/trip') + trip_info_req = get('https://iceportal.de/api1/rs/tripInfo/trip') trip_info_req.raise_for_status() trip_info = trip_info_req.json()['trip'] - ice_status_req = get('https://portal.imice.de/api1/rs/status') + ice_status_req = get('https://iceportal.de/api1/rs/status') ice_status_req.raise_for_status() ice_status = ice_status_req.json() From a4d873becd78cab8f47bcab6d98718f2c7400486 Mon Sep 17 00:00:00 2001 From: Von Birne <> Date: Mon, 29 Nov 2021 23:42:39 +0100 Subject: [PATCH 02/74] i3pystatus/ice-status.py cast time to int --- .config/i3pystatus/ice-status.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/i3pystatus/ice-status.py b/.config/i3pystatus/ice-status.py index 4a1f3b1..8e77810 100755 --- a/.config/i3pystatus/ice-status.py +++ b/.config/i3pystatus/ice-status.py @@ -67,7 +67,7 @@ try: ice_status['speed'], next_stop, ice_status['connectivity']['currentState'], - format_time(ice_status['connectivity']['remainingTimeSeconds']), + format_time(int(ice_status['connectivity']['remainingTimeSeconds'])), ice_status['connectivity']['nextState'], )) except Exception as e: From 27a5932bcc5603894f7cab2b65f2be2ba594c2ef Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Tue, 30 Nov 2021 18:46:31 +0100 Subject: [PATCH 03/74] update some stuff --- .bin/backup-and-update-system | 8 +++++--- .config/rofi/config.rasi | 9 +++++++-- .fehbg | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.bin/backup-and-update-system b/.bin/backup-and-update-system index 8b9e653..d60bc73 100755 --- a/.bin/backup-and-update-system +++ b/.bin/backup-and-update-system @@ -1,7 +1,6 @@ -#!/bin/sh +#!/bin/bash -set -euo pipefail -set -x +set -xeuo pipefail # Push some git repos pass git push @@ -46,5 +45,8 @@ done fi ) +printf '\aPress enter to continue with updating the system' +read + # Do updates sudo pacman -Syu --noconfirm diff --git a/.config/rofi/config.rasi b/.config/rofi/config.rasi index a3fa4b3..b3ba019 100644 --- a/.config/rofi/config.rasi +++ b/.config/rofi/config.rasi @@ -1,9 +1,14 @@ configuration { - modi: "window,run,drun"; + modi: "drun"; show-icons: true; sidebar-mode: true; - theme: "sidetab"; display-window: "Window"; display-run: "Execute"; display-drun: "Activate"; } +//@theme "/usr/share/rofi/themes/sidebar.rasi" +//@theme "/usr/share/rofi/themes/paper-float.rasi" +//@theme "/usr/share/rofi/themes/dmenu.rasi" +//@theme "/usr/share/rofi/themes/android_notification.rasi" +//@theme "/usr/share/rofi/themes/Arc-Dark.rasi" +@theme "/usr/share/rofi/themes/sidebar.rasi" diff --git a/.fehbg b/.fehbg index 9b3f00c..a6af162 100755 --- a/.fehbg +++ b/.fehbg @@ -1,2 +1,2 @@ #!/bin/sh -feh --no-fehbg --bg-scale '/home/kunsi/Pictures/2021-08-28_The-Treasure_by-David-Revoy.jpg' +feh --no-fehbg --bg-scale '/home/kunsi/Pictures/2021-10-20_ep36_panel1.jpg' From 239d0031924974f4cf38c32219999ad5d1af3f26 Mon Sep 17 00:00:00 2001 From: vonbirne Date: Sun, 5 Dec 2021 14:31:53 +0000 Subject: [PATCH 04/74] fix some bugs (#1) * change base url of api requests because the cert for portal.imice.de expired some weeks ago * cast arguments of format_time() to int because it threw a type error ** there might be nicer solutions Co-authored-by: Von Birne <> Reviewed-on: https://git.franzi.business/kunsi/dotfiles/pulls/1 Co-authored-by: vonbirne Co-committed-by: vonbirne --- .config/i3pystatus/ice-status.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.config/i3pystatus/ice-status.py b/.config/i3pystatus/ice-status.py index 0102911..8e77810 100755 --- a/.config/i3pystatus/ice-status.py +++ b/.config/i3pystatus/ice-status.py @@ -33,11 +33,11 @@ try: now = datetime.now() - trip_info_req = get('https://portal.imice.de/api1/rs/tripInfo/trip') + trip_info_req = get('https://iceportal.de/api1/rs/tripInfo/trip') trip_info_req.raise_for_status() trip_info = trip_info_req.json()['trip'] - ice_status_req = get('https://portal.imice.de/api1/rs/status') + ice_status_req = get('https://iceportal.de/api1/rs/status') ice_status_req.raise_for_status() ice_status = ice_status_req.json() @@ -67,7 +67,7 @@ try: ice_status['speed'], next_stop, ice_status['connectivity']['currentState'], - format_time(ice_status['connectivity']['remainingTimeSeconds']), + format_time(int(ice_status['connectivity']['remainingTimeSeconds'])), ice_status['connectivity']['nextState'], )) except Exception as e: From 05636a6568e984a0aa01efa5b6402f5872b70fb0 Mon Sep 17 00:00:00 2001 From: Von Birne <> Date: Tue, 7 Dec 2021 20:31:15 +0100 Subject: [PATCH 05/74] fix the bug with format time for real ice_status['connectivity']['remainingTimeSeconds'] might be None --- .config/i3pystatus/ice-status.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.config/i3pystatus/ice-status.py b/.config/i3pystatus/ice-status.py index 8e77810..f9c9fb6 100755 --- a/.config/i3pystatus/ice-status.py +++ b/.config/i3pystatus/ice-status.py @@ -8,6 +8,8 @@ from sys import exit # bundlewrap.utils.text.format_duration, but trimmed down def format_time(seconds): + if seconds is None: + return "?" components = [] if seconds >= 3600: hours = int(seconds / 3600) @@ -67,7 +69,7 @@ try: ice_status['speed'], next_stop, ice_status['connectivity']['currentState'], - format_time(int(ice_status['connectivity']['remainingTimeSeconds'])), + format_time(ice_status['connectivity']['remainingTimeSeconds']), ice_status['connectivity']['nextState'], )) except Exception as e: From 88ed4d22f00a1ee55a42b2421641cdaf380e3c54 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Thu, 9 Dec 2021 10:44:58 +0100 Subject: [PATCH 06/74] i3pystatus/ice-status.py: fix error when seconds is None As recommended by vonbirne in https://git.franzi.business/kunsi/dotfiles/pulls/2 --- .config/i3pystatus/ice-status.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.config/i3pystatus/ice-status.py b/.config/i3pystatus/ice-status.py index 8e77810..c1a79ca 100755 --- a/.config/i3pystatus/ice-status.py +++ b/.config/i3pystatus/ice-status.py @@ -8,6 +8,8 @@ from sys import exit # bundlewrap.utils.text.format_duration, but trimmed down def format_time(seconds): + if seconds is None: + return "?" components = [] if seconds >= 3600: hours = int(seconds / 3600) From defa59dfe26e01ce9b0af8b9680c1622300a4e92 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Fri, 10 Dec 2021 15:53:20 +0100 Subject: [PATCH 07/74] ice-status: fix int conversion --- .config/i3pystatus/ice-status.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.config/i3pystatus/ice-status.py b/.config/i3pystatus/ice-status.py index c1a79ca..c3a57e6 100755 --- a/.config/i3pystatus/ice-status.py +++ b/.config/i3pystatus/ice-status.py @@ -10,6 +10,7 @@ from sys import exit def format_time(seconds): if seconds is None: return "?" + seconds = int(seconds) components = [] if seconds >= 3600: hours = int(seconds / 3600) @@ -69,7 +70,7 @@ try: ice_status['speed'], next_stop, ice_status['connectivity']['currentState'], - format_time(int(ice_status['connectivity']['remainingTimeSeconds'])), + format_time(ice_status['connectivity']['remainingTimeSeconds']), ice_status['connectivity']['nextState'], )) except Exception as e: From 28ac266087969f229b5eb300e061b30e8cbf1bd6 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Wed, 22 Dec 2021 09:05:01 +0100 Subject: [PATCH 08/74] ssh: add qzwi --- .ssh/config | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.ssh/config b/.ssh/config index 2591b72..de25f4f 100755 --- a/.ssh/config +++ b/.ssh/config @@ -5,6 +5,10 @@ Host * Include ~/.ssh/bwnodes +Host qzwi + #HostName 2a00:f820:528::4 + HostName 31.47.232.108 + Host luther-netcup HostName 46.38.249.46 User sub4632_80 From 149df0bc9719d2b41a9fe95e14fa58571a193690 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Thu, 30 Dec 2021 16:17:29 +0100 Subject: [PATCH 09/74] backup-and-update-system: add missing newline --- .bin/backup-and-update-system | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bin/backup-and-update-system b/.bin/backup-and-update-system index d60bc73..35db9f8 100755 --- a/.bin/backup-and-update-system +++ b/.bin/backup-and-update-system @@ -45,7 +45,7 @@ done fi ) -printf '\aPress enter to continue with updating the system' +printf '\aPress enter to continue with updating the system\n' read # Do updates From 0afb0abb3cfd8ef8dd33ead0e2d789e16dc5eca0 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Thu, 30 Dec 2021 16:17:50 +0100 Subject: [PATCH 10/74] switch to yt-dlp --- .config/fish/config.fish | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 080caa5..197993b 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -14,6 +14,8 @@ alias v='vim -p' alias l='ls -lAh' alias please='sudo' +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"' alias nox='mosquitto_pub -h 172.19.138.20 -t /switch/wohnzimmer/stehlampe/cmnd/POWER -m "OFF"' alias coffee='mosquitto_pub -h 172.19.138.20 -t /switch/kueche/kaffeemaschine/cmnd/POWER -m "ON"' From 928edb1a9d2b169e49e261fe66105445c27a7ae2 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Thu, 30 Dec 2021 16:18:18 +0100 Subject: [PATCH 11/74] i3: fix workspace 8 naming --- .config/i3/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/i3/config b/.config/i3/config index 2c8f466..33a5f09 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -50,7 +50,7 @@ set $ws4 "4" set $ws5 "5" set $ws6 "6" set $ws7 "7" -set $ws8 "9" +set $ws8 "8" set $ws9 "9:media" set $ws10 "10:mail" From 60b069259b1d0b2cb7c1411ae8df82ab58cc4c1e Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Thu, 30 Dec 2021 16:18:36 +0100 Subject: [PATCH 12/74] mpv: add downmix and mono profiles --- .config/mpv/mpv.conf | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.config/mpv/mpv.conf b/.config/mpv/mpv.conf index 0aaf0f5..faebfd2 100644 --- a/.config/mpv/mpv.conf +++ b/.config/mpv/mpv.conf @@ -13,6 +13,12 @@ osd-on-seek=bar hls-bitrate=max +[downmix] +af=lavfi="pan=stereo|FL < 0.5*FC + 0.3*FLC + 0.3*FL + 0.3*BL + 0.3*SL + 0.5*LFE | FR < 0.5*FC + 0.3*FRC + 0.3*FR + 0.3*BR + 0.3*SR + 0.5*LFE",lavfi="acompressor=10" + +[mono] +af=lavfi=[pan=1c|c0=0.5*c0+0.5*c1] + [extension.gif] cache=no no-pause From b52bb097137b4eeac8f9d2d92150570f86944f28 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Tue, 4 Jan 2022 18:04:22 +0100 Subject: [PATCH 13/74] backup-and-update-system: move to new backup server --- .bin/backup-and-update-system | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bin/backup-and-update-system b/.bin/backup-and-update-system index 35db9f8..4f21154 100755 --- a/.bin/backup-and-update-system +++ b/.bin/backup-and-update-system @@ -34,7 +34,7 @@ done --exclude "/home/kunsi/VirtualBox VMs/" \ --exclude "/home/kunsi/qemu/Windows_10.qcow2" \ --exclude "/home/kunsi/tmp.*/" \ - "/home/kunsi" "kunsi-t470@home.nas":backups/ + "/home/kunsi" "kunsi-t470@htz-hel.backup-kunsi":backups/ # Exit code 24 means some files have vanished during rsync. # I don't know why, but this is very common, apparently? From e2ec5258317fef6fc941e1d3172b3d52a9560692 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Tue, 4 Jan 2022 18:09:31 +0100 Subject: [PATCH 14/74] ssh: remove some leftover hosts --- .ssh/config | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/.ssh/config b/.ssh/config index de25f4f..a62cd43 100755 --- a/.ssh/config +++ b/.ssh/config @@ -8,30 +8,20 @@ Include ~/.ssh/bwnodes Host qzwi #HostName 2a00:f820:528::4 HostName 31.47.232.108 + LocalForward 3389 localhost:389 + +Host proxmox-backupstorage + HostName 2a01:4f9:6b:2d99::2 + User root Host luther-netcup HostName 46.38.249.46 User sub4632_80 -Host shells - HostName shells.entropia.de - Port 22 - User kunsi - Host voellerei HostName voellerei.club.entropia.de Port 22 User entropia -Host raeumlichkeit - HostName raeumlichkeit.club.entropia.de - Port 22 - User kunsi - -Host poc - HostName poc-gw.entropia.de - Port 22 - User kunsi - Host router-remote HostName franzi-home.kunbox.net From f721f26ef2931d6071f80a920528b43296cf5214 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Thu, 6 Jan 2022 19:22:44 +0100 Subject: [PATCH 15/74] backup-and-update-system: use new rotating mechanism --- .bin/backup-and-update-system | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.bin/backup-and-update-system b/.bin/backup-and-update-system index 4f21154..14dc9b2 100755 --- a/.bin/backup-and-update-system +++ b/.bin/backup-and-update-system @@ -2,6 +2,8 @@ set -xeuo pipefail +backup_ssh="kunsi-t470@backup-kunsi.htz-hel.kunbox.net" + # Push some git repos pass git push git --git-dir=$HOME/.cfg/ --work-tree=$HOME push @@ -13,6 +15,7 @@ do done # Do a backup. +ssh $backup_ssh "sudo /usr/local/bin/rotate-single-backup-client kunsi-t470" ( rsync -zaAP --numeric-ids --delete --relative \ --rsync-path="/usr/bin/rsync --fake-super" \ @@ -34,7 +37,7 @@ done --exclude "/home/kunsi/VirtualBox VMs/" \ --exclude "/home/kunsi/qemu/Windows_10.qcow2" \ --exclude "/home/kunsi/tmp.*/" \ - "/home/kunsi" "kunsi-t470@htz-hel.backup-kunsi":backups/ + "/home/kunsi" "$backup_ssh":backups/ # Exit code 24 means some files have vanished during rsync. # I don't know why, but this is very common, apparently? From 3fa132b42a966d65c3c131d4ca61e2f11a15d92a Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Thu, 6 Jan 2022 19:23:42 +0100 Subject: [PATCH 16/74] ssh: add qzwi-backup --- .ssh/config | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.ssh/config b/.ssh/config index a62cd43..3fc94e6 100755 --- a/.ssh/config +++ b/.ssh/config @@ -10,6 +10,9 @@ Host qzwi 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::2 User root From 8a54702823c85cb2f701b4e17d0e27ed6fedf2b2 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sun, 9 Jan 2022 08:14:05 +0100 Subject: [PATCH 17/74] backup-and-update-system: fix rotation --- .bin/backup-and-update-system | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bin/backup-and-update-system b/.bin/backup-and-update-system index 14dc9b2..d4b3795 100755 --- a/.bin/backup-and-update-system +++ b/.bin/backup-and-update-system @@ -15,7 +15,6 @@ do done # Do a backup. -ssh $backup_ssh "sudo /usr/local/bin/rotate-single-backup-client kunsi-t470" ( rsync -zaAP --numeric-ids --delete --relative \ --rsync-path="/usr/bin/rsync --fake-super" \ @@ -47,6 +46,7 @@ ssh $backup_ssh "sudo /usr/local/bin/rotate-single-backup-client kunsi-t470" exit 1 fi ) +ssh $backup_ssh "sudo /usr/local/bin/rotate-single-backup-client kunsi-t470" printf '\aPress enter to continue with updating the system\n' read From dd9302c48ece1215fc2557f4748aea0897a4ea15 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sun, 9 Jan 2022 08:14:29 +0100 Subject: [PATCH 18/74] fish: add date to temp dirs --- .config/fish/config.fish | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 197993b..b7b019b 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -7,7 +7,7 @@ alias weechat='mosh rx300 -- tmux attach-session -d -t weechat-tmux' alias voc-ansible='/home/kunsi/.bin/voc-ansible' alias share-via-ssh='/home/kunsi/git/share-via-ssh/share-via-ssh' -alias tmp='cd (mktemp -d -p /home/kunsi)' +alias tmp='cd (mktemp -d -p /home/kunsi --suffix=.(date +%F))' alias bwr='cd ~/git/bundlewrap/' alias v='vim -p' From 6b222023c8f8716b07552ed93469496521d564fe Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sat, 15 Jan 2022 06:31:29 +0100 Subject: [PATCH 19/74] backup-and-update-system: use pacman input --- .bin/backup-and-update-system | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.bin/backup-and-update-system b/.bin/backup-and-update-system index d4b3795..941ece1 100755 --- a/.bin/backup-and-update-system +++ b/.bin/backup-and-update-system @@ -48,8 +48,7 @@ done ) ssh $backup_ssh "sudo /usr/local/bin/rotate-single-backup-client kunsi-t470" -printf '\aPress enter to continue with updating the system\n' -read +printf '\a' # Do updates -sudo pacman -Syu --noconfirm +sudo pacman -Syu From a4ec8c66609342993f1108e829ae1f57cb82cad7 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sat, 15 Jan 2022 06:31:55 +0100 Subject: [PATCH 20/74] i3: some more options --- .config/i3/config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.config/i3/config b/.config/i3/config index 33a5f09..cb9c42c 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -94,6 +94,8 @@ bindsym $mod+c mode "resize" default_border pixel 1 hide_edge_borders smart +force_display_urgency_hint 1000 ms +focus_on_window_activation smart bar { status_command python ~/.config/i3pystatus/config.py From 86ac55622581de6aca825f2e3ff786fcb788f29b Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sat, 15 Jan 2022 06:32:19 +0100 Subject: [PATCH 21/74] ssh: proxmox-backupstorage changed ips --- .ssh/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ssh/config b/.ssh/config index 3fc94e6..2a9b709 100755 --- a/.ssh/config +++ b/.ssh/config @@ -14,7 +14,7 @@ Host qzwi-backup HostName 2a01:4f9:6b:2d99::28:6:1969 Host proxmox-backupstorage - HostName 2a01:4f9:6b:2d99::2 + HostName 2a01:4f9:6b:2d99::c0ff:ee User root Host luther-netcup From f453eed9e0797d3ec6c6b519c3e807055fd0a5b9 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sat, 15 Jan 2022 08:15:07 +0100 Subject: [PATCH 22/74] i3: persist trackpoint settings --- .bin/trackpoint-settings.sh | 4 ++++ .config/i3/config | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100755 .bin/trackpoint-settings.sh diff --git a/.bin/trackpoint-settings.sh b/.bin/trackpoint-settings.sh new file mode 100755 index 0000000..cd174f7 --- /dev/null +++ b/.bin/trackpoint-settings.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +echo -n 255 > /sys/devices/platform/i8042/serio1/serio2/sensitivity +echo -n 200 > /sys/devices/platform/i8042/serio1/serio2/speed diff --git a/.config/i3/config b/.config/i3/config index cb9c42c..b7335ea 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -118,7 +118,7 @@ workspace $ws10 output DP2-1 exec_always setxkbmap -synch exec_always ~/.fehbg -exec_always xinput set-prop "TPPS/2 IBM TrackPoint" "libinput Accel Speed" 0.8 +exec_always sudo /home/kunsi/.bin/trackpoint-settings.sh exec xset s noblank && xset s 90 10 && xset -dpms exec xsetroot -solid "#000000" From f23e8f5e65a6e32060c8fd6405d2fb1811c5d2c1 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sun, 13 Feb 2022 08:47:44 +0100 Subject: [PATCH 23/74] new computer, who dis? --- .bin/backup-and-update-system | 34 +------------------------------- .config/i3/config | 16 ++++++--------- .config/i3pystatus/config.py | 27 +++++-------------------- .config/i3pystatus/ice-status.py | 2 +- .gnupg/gpg-agent.conf | 1 + 5 files changed, 14 insertions(+), 66 deletions(-) diff --git a/.bin/backup-and-update-system b/.bin/backup-and-update-system index 941ece1..b54b7ce 100755 --- a/.bin/backup-and-update-system +++ b/.bin/backup-and-update-system @@ -15,39 +15,7 @@ do done # Do a backup. -( - rsync -zaAP --numeric-ids --delete --relative \ - --rsync-path="/usr/bin/rsync --fake-super" \ - -e "ssh" --delete-excluded \ - --exclude "/home/kunsi/.cache/" \ - --exclude "/home/kunsi/.config/Ferdi/" \ - --exclude "/home/kunsi/.config/Rambox/" \ - --exclude "/home/kunsi/.local/lib/python*/site-packages/" \ - --exclude "/home/kunsi/.local/share/TelegramDesktop/tdata/user_data/cache/" \ - --exclude "/home/kunsi/.local/share/sddm/" \ - --exclude "/home/kunsi/.mozilla/firefox/*/storage/*" \ - --exclude "/home/kunsi/.npm/" \ - --exclude "/home/kunsi/.nvm/" \ - --exclude "/home/kunsi/.platformio/" \ - --exclude "/home/kunsi/.ssh/cm-*" \ - --exclude "/home/kunsi/.vdirsyncer" \ - --exclude "/home/kunsi/Downloads/" \ - --exclude "/home/kunsi/Schreibtisch/" \ - --exclude "/home/kunsi/VirtualBox VMs/" \ - --exclude "/home/kunsi/qemu/Windows_10.qcow2" \ - --exclude "/home/kunsi/tmp.*/" \ - "/home/kunsi" "$backup_ssh":backups/ - - # Exit code 24 means some files have vanished during rsync. - # I don't know why, but this is very common, apparently? - exitcode=$? - if [[ $exitcode != 0 ]] && [[ $exitcode != 24 ]] - then - exit 1 - fi -) -ssh $backup_ssh "sudo /usr/local/bin/rotate-single-backup-client kunsi-t470" - +sudo /usr/local/bin/generate-backup-with-retries printf '\a' # Do updates diff --git a/.config/i3/config b/.config/i3/config index b7335ea..c9a6a5e 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -5,8 +5,8 @@ font pango:DB Office Regular 9 floating_modifier $mod -bindsym $mod+Return exec xiate -bindsym $mod+Shift+Return exec xiate -class xiate-floating -e python +bindsym $mod+Return exec kitty +bindsym $mod+Shift+Return exec kitty --class terminal-floating -e python bindsym $mod+Shift+x kill @@ -98,7 +98,7 @@ force_display_urgency_hint 1000 ms focus_on_window_activation smart bar { - status_command python ~/.config/i3pystatus/config.py + status_command /opt/i3pystatus/venv/bin/python ~/.config/i3pystatus/config.py position top tray_output primary workspace_buttons yes @@ -108,7 +108,7 @@ for_window [window_role="pop-up"] floating enable for_window [class="Pavucontrol"] floating enable for_window [class="Gnome-calculator"] floating enable for_window [class="realvnc-vncviewer"] floating enable -for_window [class="xiate-floating"] floating enable +for_window [class="terminal-floating"] floating enable workspace $ws1 output DP2-2 workspace $ws2 output DP2-1 @@ -124,13 +124,9 @@ exec xset s noblank && xset s 90 10 && xset -dpms 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 xinput disable 'ELAN Touchscreen' -#bindsym Control+$mod+l exec /home/kunsi/.bin/screenlock.sh bindsym XF86Tools exec /home/kunsi/.bin/screenlock.sh -bindsym XF86Display exec arandr - bindsym $mod+Prior exec pactl set-sink-volume @DEFAULT_SINK@ +2%; exec pactl set-sink-mute @DEFAULT_SINK@ 0 bindsym $mod+Next exec pactl set-sink-volume @DEFAULT_SINK@ -2%; exec pactl set-sink-mute @DEFAULT_SINK@ 0 bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +2%; exec pactl set-sink-mute @DEFAULT_SINK@ 0 @@ -138,8 +134,8 @@ bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -2%; exec bindsym XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle bindsym XF86AudioMicMute exec pactl set-source-mute alsa_input.pci-0000_00_1f.3.analog-stereo toggle -bindsym XF86MonBrightnessUp exec xbacklight +5 -bindsym XF86MonBrightnessDown exec xbacklight -5 +bindsym XF86MonBrightnessUp exec sudo light -A 5 +bindsym XF86MonBrightnessDown exec sudo light -U 5 bindsym $mod+Print exec maim ~/screenshot_$(date +%Y-%m-%d_%H%M%S).png bindsym $mod+Shift+Print exec maim -i $(xdotool getactivewindow) ~/screenshot_$(date +%Y-%m-%d_%H%M%S).png diff --git a/.config/i3pystatus/config.py b/.config/i3pystatus/config.py index ac02e9d..85a8e2b 100644 --- a/.config/i3pystatus/config.py +++ b/.config/i3pystatus/config.py @@ -8,7 +8,7 @@ status.register("pulseaudio", format="♪I {volume}%", format_muted="♪I -∞dB", step="2", - sink="alsa_output.pci-0000_00_1f.3.analog-stereo") + sink="alsa_output.pci-0000_07_00.6.HiFi__hw_Generic_1__sink") status.register("pulseaudio", format="♪D {volume}%", format_muted="♪D -∞dB", @@ -17,9 +17,9 @@ status.register("pulseaudio", status.register("backlight", format="{percentage}%", - backlight="intel_backlight", - on_leftclick="xbacklight =10", - on_rightclick="xbacklight =50", + backlight="amdgpu_bl0", + on_leftclick="sudo light -S 10", + on_rightclick="sudo light -S 50", interval=1) status.register("shell", @@ -42,16 +42,6 @@ status.register("battery", "CHR": "↑", "FULL": "", }) -status.register("battery", - battery_ident="BAT1", - format="B1: {status}{percentage:.2f}% {remaining:%E%h:%M}", - alert=True, - alert_percentage=5, - status={ - "DIS": "↓", - "CHR": "↑", - "FULL": "", - }) status.register("load", format="{avg1}") @@ -81,13 +71,6 @@ status.register("shell", on_leftclick='systemctl --user start redshift.service', on_rightclick='systemctl --user stop redshift.service', interval=1) -status.register("shell", - format="{output}", - hints = {"markup": "pango"}, - command="/home/kunsi/.config/i3pystatus/touchscreen.sh", - interval=1, - on_leftclick="xinput enable 'ELAN Touchscreen'", - on_rightclick="xinput disable 'ELAN Touchscreen'") status.register("shell", format="{output}", hints = {"markup": "pango"}, @@ -110,7 +93,7 @@ status.register("network", detect_active=True, freq_divisor=1000000000, divisor=1024, - on_leftclick="xiate -class xiate-floating -e sudo wifi-menu", + on_leftclick="kitty --class terminal-floating -e sudo wifi-menu", hints={"markup":"pango"}) #status.register("mpd", diff --git a/.config/i3pystatus/ice-status.py b/.config/i3pystatus/ice-status.py index c3a57e6..c4fab99 100755 --- a/.config/i3pystatus/ice-status.py +++ b/.config/i3pystatus/ice-status.py @@ -26,7 +26,7 @@ def format_time(seconds): try: - wifi_ssid = check_output("iw dev wlp4s0 link | awk '/SSID/ {print $2}'", shell=True).decode().strip().lower() + wifi_ssid = check_output("iw dev wlp3s0 link | awk '/SSID/ {print $2}'", shell=True).decode().strip().lower() if wifi_ssid not in ( 'wifi@db', diff --git a/.gnupg/gpg-agent.conf b/.gnupg/gpg-agent.conf index 5f48733..16dc82d 100644 --- a/.gnupg/gpg-agent.conf +++ b/.gnupg/gpg-agent.conf @@ -5,3 +5,4 @@ max-cache-ttl-ssh 30 no-allow-external-cache enable-ssh-support ignore-cache-for-signing +pinentry-program /usr/bin/pinentry-qt From 0a9ca8b889d78f1c711e1a4357a310c02f899023 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Mon, 14 Feb 2022 19:38:06 +0100 Subject: [PATCH 24/74] moar new computer --- .bin/notify.sh | 2 +- .bin/pulseaudio-assert-volume | 2 +- .config/grobi.conf | 42 ++++++++++++++++++++++++++++++ .config/grobi/grobi.conf | 42 ------------------------------ .config/i3/config | 10 +++---- .config/systemd/user/grobi.service | 11 -------- 6 files changed, 49 insertions(+), 60 deletions(-) create mode 100644 .config/grobi.conf delete mode 100644 .config/grobi/grobi.conf delete mode 100644 .config/systemd/user/grobi.service diff --git a/.bin/notify.sh b/.bin/notify.sh index 3e2d48c..b1be7c2 100755 --- a/.bin/notify.sh +++ b/.bin/notify.sh @@ -1,3 +1,3 @@ #!/bin/bash -echo 'meowww?' | osd_cat --pos middle --align center --delay 9 -O 15 -f '-*-dejavu sans-*-*-*-*-120-200-*-*-*-*-*-*' +notify-send --expire-time=9000 --app-name=i3lock "screen lock will activate shortly" diff --git a/.bin/pulseaudio-assert-volume b/.bin/pulseaudio-assert-volume index b8bdd6c..51a7671 100755 --- a/.bin/pulseaudio-assert-volume +++ b/.bin/pulseaudio-assert-volume @@ -30,7 +30,7 @@ try: if line.startswith('volume:'): for speaker, absolute, percent in findall('([a-z-]+):\W+([0-9]+)\W+\/\W+([0-9]+)%', line): - if int(percent) < 100: + if int(percent) > 3 and int(percent) < 100: print(f' sink {sink_id} speaker {speaker} at {percent} % volume', flush=True) needs_adjusting = True diff --git a/.config/grobi.conf b/.config/grobi.conf new file mode 100644 index 0000000..a4a4d8f --- /dev/null +++ b/.config/grobi.conf @@ -0,0 +1,42 @@ +# vim:ft=yaml + +execute_after: + - xset s 90 10 + - /home/kunsi/.fehbg + - sudo rfkill unblock wifi +# - xrandr --output eDP --set "Broadcast RGB" "Full" + +on_failure: + - xrandr --auto + +rules: + - name: 'presentation' + outputs_connected: + - HDMI-A-0 + configure_row: + - HDMI-A-0 + - eDP + primary: eDP + execute_after: + - xset s off + - systemctl --user stop redshift.service + + - name: 'docked' + 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 +# - xrandr --output DP2-2 --set "Broadcast RGB" "Full" +# - xrandr --output DP2-1 --set "Broadcast RGB" "Full" + + - name: 'internal only' + configure_single: eDP + primary: eDP diff --git a/.config/grobi/grobi.conf b/.config/grobi/grobi.conf deleted file mode 100644 index a7c7fdf..0000000 --- a/.config/grobi/grobi.conf +++ /dev/null @@ -1,42 +0,0 @@ -# vim:ft=yaml - -execute_after: - - xset s 90 10 - - /home/kunsi/.fehbg - - sudo rfkill unblock wifi - - xrandr --output eDP1 --set "Broadcast RGB" "Full" - -on_failure: - - xrandr --auto - -rules: - - name: 'presentation' - outputs_connected: - - HDMI2 - configure_row: - - HDMI2@1920x1080 - - eDP1 - primary: eDP1 - execute_after: - - xset s off - - systemctl --user stop redshift.service - - - name: 'docked with dock-connector' - outputs_connected: - - DP2-1 - - DP2-2 - configure_row: - - eDP1 - - DP2-2 - - DP2-1 - primary: DP2-1 - execute_after: - - xset s off - - sudo rfkill block wifi - - xbacklight =100 - - xrandr --output DP2-2 --set "Broadcast RGB" "Full" - - xrandr --output DP2-1 --set "Broadcast RGB" "Full" - - - name: 'internal only' - configure_single: eDP1 - primary: eDP1 diff --git a/.config/i3/config b/.config/i3/config index c9a6a5e..a9aa9ac 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -110,11 +110,11 @@ for_window [class="Gnome-calculator"] floating enable for_window [class="realvnc-vncviewer"] floating enable for_window [class="terminal-floating"] floating enable -workspace $ws1 output DP2-2 -workspace $ws2 output DP2-1 -workspace $ws3 output DP2-2 -workspace $ws9 output eDP1 -workspace $ws10 output DP2-1 +workspace $ws1 output DisplayPort-3 +workspace $ws2 output DisplayPort-4 +workspace $ws3 output DisplayPort-3 +workspace $ws9 output eDP +workspace $ws10 output DisplayPort-4 exec_always setxkbmap -synch exec_always ~/.fehbg diff --git a/.config/systemd/user/grobi.service b/.config/systemd/user/grobi.service deleted file mode 100644 index f51829e..0000000 --- a/.config/systemd/user/grobi.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Automatically configure monitors/outputs for Xorg via RANDR - -[Service] -ExecStart=/home/kunsi/git/grobi/grobi watch --verbose --config=/home/kunsi/.config/grobi/grobi.conf -Restart=always -RestartSec=10 -StartLimitInterval=0 - -[Install] -WantedBy=default.target From 0599466e2cf32b84ad482d2af85646a76b3108e7 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Mon, 14 Feb 2022 20:17:20 +0100 Subject: [PATCH 25/74] add i3bar indicator for microphone status --- .config/i3/config | 2 +- .config/i3pystatus/config.py | 6 ++++++ .config/i3pystatus/microphone-status.sh | 10 ++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100755 .config/i3pystatus/microphone-status.sh diff --git a/.config/i3/config b/.config/i3/config index a9aa9ac..66f0cab 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -132,7 +132,7 @@ bindsym $mod+Next exec pactl set-sink-volume @DEFAULT_SINK@ -2%; exec pactl set- bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +2%; exec pactl set-sink-mute @DEFAULT_SINK@ 0 bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -2%; exec pactl set-sink-mute @DEFAULT_SINK@ 0 bindsym XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle -bindsym XF86AudioMicMute exec pactl set-source-mute alsa_input.pci-0000_00_1f.3.analog-stereo toggle +bindsym XF86AudioMicMute exec pactl set-source-mute alsa_input.pci-0000_07_00.6.HiFi__hw_acp__source toggle bindsym XF86MonBrightnessUp exec sudo light -A 5 bindsym XF86MonBrightnessDown exec sudo light -U 5 diff --git a/.config/i3pystatus/config.py b/.config/i3pystatus/config.py index 85a8e2b..29efc14 100644 --- a/.config/i3pystatus/config.py +++ b/.config/i3pystatus/config.py @@ -14,6 +14,12 @@ status.register("pulseaudio", format_muted="♪D -∞dB", step="2", sink="@DEFAULT_SINK@") +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}%", diff --git a/.config/i3pystatus/microphone-status.sh b/.config/i3pystatus/microphone-status.sh new file mode 100755 index 0000000..deae5ae --- /dev/null +++ b/.config/i3pystatus/microphone-status.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +OUT="$(pactl get-source-mute alsa_input.pci-0000_07_00.6.HiFi__hw_acp__source | cut -d' ' -f2)" + +if [ "$OUT" = "yes" ] +then + echo 'M' +else + echo 'Microphone unmuted' +fi From 5c85dcdbf6434a06d261a4c1405644b21eee7301 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Mon, 14 Feb 2022 20:18:44 +0100 Subject: [PATCH 26/74] mute correct source/sink when locking --- .bin/screenlock.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.bin/screenlock.sh b/.bin/screenlock.sh index 1699d56..0ac138f 100755 --- a/.bin/screenlock.sh +++ b/.bin/screenlock.sh @@ -5,8 +5,8 @@ tmpbg="/tmp/lock_$(whoami).png" xset s noblank xset s 90 10 -pactl set-sink-mute alsa_output.pci-0000_00_1f.3.analog-stereo 1 -pactl set-source-mute alsa_input.pci-0000_00_1f.3.analog-stereo 1 +pactl set-sink-mute alsa_output.pci-0000_07_00.6.HiFi__hw_Generic_1__sink 1 +pactl set-source-mute alsa_input.pci-0000_07_00.6.HiFi__hw_acp__source 1 i3lock -e -t -i /home/kunsi/Pictures/laptop_unbenutzbar.png From f0bde065fa7547774ba1f1f89c4783b3a0565b23 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Mon, 14 Feb 2022 20:49:55 +0100 Subject: [PATCH 27/74] add kitty config --- .config/kitty/kitty.conf | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .config/kitty/kitty.conf diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf new file mode 100644 index 0000000..d11c634 --- /dev/null +++ b/.config/kitty/kitty.conf @@ -0,0 +1,12 @@ +font_size 10.0 +cursor #4d5b86 +cursor_shape block +scrollback_lines -1 +sync_to_monitor yes +enable_audio_bell no +visual_bell_duration 0.1 +window_alert_on_bell yes + +remember_window_size no +initial_window_width 100c +initial_window_height 30c From 8f11b1320b9837cd3366c2e422e3ec5302a3af83 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Tue, 1 Mar 2022 06:44:44 +0100 Subject: [PATCH 28/74] backup-and-update-system: remove unneeded and outdated backup_ssh variable --- .bin/backup-and-update-system | 2 -- 1 file changed, 2 deletions(-) diff --git a/.bin/backup-and-update-system b/.bin/backup-and-update-system index b54b7ce..c6ce0aa 100755 --- a/.bin/backup-and-update-system +++ b/.bin/backup-and-update-system @@ -2,8 +2,6 @@ set -xeuo pipefail -backup_ssh="kunsi-t470@backup-kunsi.htz-hel.kunbox.net" - # Push some git repos pass git push git --git-dir=$HOME/.cfg/ --work-tree=$HOME push From 83797204b3fb5a949573f85eb84e368cc083dd26 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Tue, 1 Mar 2022 06:45:20 +0100 Subject: [PATCH 29/74] fish: add alias for rm --one-file-system --- .config/fish/config.fish | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.config/fish/config.fish b/.config/fish/config.fish index b7b019b..4d18731 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -31,6 +31,8 @@ alias gp='git push' alias gpu='git push -u origin HEAD' alias gs='git status --short' +alias rm='rm --one-file-system' + set -x BW_ITEM_WORKERS 16 set -x BW_NODE_WORKERS 16 From a4406b81e2b185ee6da6ee93f8e17915a5517cd1 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Tue, 1 Mar 2022 06:46:37 +0100 Subject: [PATCH 30/74] grobi: add configuration for DisplayPort5+6 Sometimes after suspending, the docked displays will get detected as DP5+6 instead of 3+4 --- .config/grobi.conf | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/.config/grobi.conf b/.config/grobi.conf index a4a4d8f..4615304 100644 --- a/.config/grobi.conf +++ b/.config/grobi.conf @@ -4,7 +4,6 @@ execute_after: - xset s 90 10 - /home/kunsi/.fehbg - sudo rfkill unblock wifi -# - xrandr --output eDP --set "Broadcast RGB" "Full" on_failure: - xrandr --auto @@ -21,7 +20,7 @@ rules: - xset s off - systemctl --user stop redshift.service - - name: 'docked' + - name: 'docked DP3+4' outputs_connected: - DisplayPort-3 - DisplayPort-4 @@ -34,8 +33,20 @@ rules: - xset s off - sudo rfkill block wifi - sudo light -S 100 -# - xrandr --output DP2-2 --set "Broadcast RGB" "Full" -# - xrandr --output DP2-1 --set "Broadcast RGB" "Full" + + - 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 From d93735a60c2bb25acc06d9ff57ca1f107a4707f8 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Tue, 1 Mar 2022 06:47:02 +0100 Subject: [PATCH 31/74] feh: new background --- .fehbg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.fehbg b/.fehbg index a6af162..3db87c5 100755 --- a/.fehbg +++ b/.fehbg @@ -1,2 +1,2 @@ #!/bin/sh -feh --no-fehbg --bg-scale '/home/kunsi/Pictures/2021-10-20_ep36_panel1.jpg' +feh --no-fehbg --bg-scale '/home/kunsi/Pictures/2022-02-17_4-studies_krita-speedpainting_cc-by_david_revoy_2.jpg' From b170187208101dffb8e148685f4f07eec9948d44 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sat, 5 Mar 2022 14:13:35 +0100 Subject: [PATCH 32/74] add abdce config --- .abcde.conf | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .abcde.conf diff --git a/.abcde.conf b/.abcde.conf new file mode 100644 index 0000000..5273037 --- /dev/null +++ b/.abcde.conf @@ -0,0 +1,6 @@ +CDDBMETHOD=cdtext,musicbrainz +FLACENCODERSYNTAX=default +FLAC=flac +CDROM=/dev/sr0 +OUTPUTTYPE=flac +OUTPUTFORMAT='${ARTISTFILE}/${ALBUMFILE}/${TRACKNUM}_${TRACKFILE}' From b295fd359a1f3686ae184bce9fbb5851770f102f Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sun, 6 Mar 2022 18:05:56 +0100 Subject: [PATCH 33/74] i3pystatus: fix wifi device detection --- .config/i3pystatus/rfkill-wifi.py | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/.config/i3pystatus/rfkill-wifi.py b/.config/i3pystatus/rfkill-wifi.py index 29f9b63..b338d21 100755 --- a/.config/i3pystatus/rfkill-wifi.py +++ b/.config/i3pystatus/rfkill-wifi.py @@ -12,11 +12,20 @@ for line in check_output(['rfkill', '-rn']).decode('UTF-8').splitlines(): 'hard': True if hard == 'blocked' else False, } -if devices['phy0']['hard']: - wlan = '#FF0000' -elif devices['phy0']['soft']: - wlan = '#FF9900' -else: - wlan = '#00FF00' +wifi_dev = None +for device in devices: + if device.startswith('phy'): + wifi_dev = device + break -print(f'WLAN') +if not wifi_dev: + print('No WLAN?') +else: + if devices[wifi_dev]['hard']: + wlan = '#FF0000' + elif devices[wifi_dev]['soft']: + wlan = '#FF9900' + else: + wlan = '#00FF00' + + print(f'WLAN') From bd8c68235e8251e96877aa42c46e54315781cf80 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sat, 19 Mar 2022 10:31:01 +0100 Subject: [PATCH 34/74] i3pystatus/ice-status: only show net info if we actually have information --- .config/i3pystatus/ice-status.py | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/.config/i3pystatus/ice-status.py b/.config/i3pystatus/ice-status.py index c4fab99..1f41417 100755 --- a/.config/i3pystatus/ice-status.py +++ b/.config/i3pystatus/ice-status.py @@ -66,12 +66,22 @@ try: else: next_stop = 'Endstation, bitte Aussteigen' - print('{}km/h > {} (Net: {} > [{}] {})'.format( + net_current = ice_status['connectivity']['currentState'] + net_future = ice_status['connectivity']['nextState'] + + if net_current not in (None, 'NO_INFO') or net_future not in (None, 'NO_INFO'): + net = ' (Net: {} > [{}] {})'.format( + net_current, + format_time(ice_status['connectivity']['remainingTimeSeconds']), + net_future, + ) + else: + net = '' + + print('{}km/h > {}{}'.format( ice_status['speed'], next_stop, - ice_status['connectivity']['currentState'], - format_time(ice_status['connectivity']['remainingTimeSeconds']), - ice_status['connectivity']['nextState'], + net, )) except Exception as e: print(repr(e)) From b89bf2f691ffae70733e478b8edb1b7e42a90666 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sat, 26 Mar 2022 13:29:29 +0100 Subject: [PATCH 35/74] backup-and-update-system: run pacdiff after update --- .bin/backup-and-update-system | 1 + 1 file changed, 1 insertion(+) diff --git a/.bin/backup-and-update-system b/.bin/backup-and-update-system index c6ce0aa..9804df7 100755 --- a/.bin/backup-and-update-system +++ b/.bin/backup-and-update-system @@ -18,3 +18,4 @@ printf '\a' # Do updates sudo pacman -Syu +sudo DIFFPROG='diff -u --color' pacdiff From 7c544daf0eb61cf0e46e53eca27b80a23fd65eb7 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sat, 26 Mar 2022 13:30:17 +0100 Subject: [PATCH 36/74] dunst/i3: use DB Office Regular 9pt --- .config/dunst/dunstrc | 2 +- .config/i3/config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc index dda5611..b128f25 100644 --- a/.config/dunst/dunstrc +++ b/.config/dunst/dunstrc @@ -85,7 +85,7 @@ ### Text ### - font = Monospace 8 + font = pango:DB Office Regular 9 # The spacing between lines. If the height is smaller than the # font height, it will get raised to the font height. diff --git a/.config/i3/config b/.config/i3/config index 66f0cab..98e0251 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -1,6 +1,6 @@ set $mod Mod4 -#font pango:B612 Regular 7 +#font pango:B612 Regular 9 font pango:DB Office Regular 9 floating_modifier $mod From 352a35bf55291490c08a17972fe23fc4d9ce01aa Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sat, 26 Mar 2022 13:30:45 +0100 Subject: [PATCH 37/74] i3: use XF86Favorites for locking the screen --- .config/i3/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/i3/config b/.config/i3/config index 98e0251..8380df4 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -125,7 +125,7 @@ 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' -bindsym XF86Tools exec /home/kunsi/.bin/screenlock.sh +bindsym XF86Favorites exec /home/kunsi/.bin/screenlock.sh bindsym $mod+Prior exec pactl set-sink-volume @DEFAULT_SINK@ +2%; exec pactl set-sink-mute @DEFAULT_SINK@ 0 bindsym $mod+Next exec pactl set-sink-volume @DEFAULT_SINK@ -2%; exec pactl set-sink-mute @DEFAULT_SINK@ 0 From 5a5e6231d1cb98e69f9bcfe22ff47e201c1b7065 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sat, 26 Mar 2022 13:31:13 +0100 Subject: [PATCH 38/74] i3pystatus: fix disk space usage display --- .config/i3pystatus/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/i3pystatus/config.py b/.config/i3pystatus/config.py index 29efc14..9804915 100644 --- a/.config/i3pystatus/config.py +++ b/.config/i3pystatus/config.py @@ -118,7 +118,7 @@ status.register("network", # max_field_len=200) status.register("disk", - path="/home", + path="/home/kunsi", format="{used}/{total}G",) status.run() From 9f83f9e908c0199ab163d7f6dac80b48bfb95d13 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sat, 26 Mar 2022 13:31:35 +0100 Subject: [PATCH 39/74] ssh: add afra-{open,close} --- .ssh/config | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.ssh/config b/.ssh/config index 2a9b709..f67e508 100755 --- a/.ssh/config +++ b/.ssh/config @@ -28,3 +28,11 @@ Host voellerei Host router-remote HostName franzi-home.kunbox.net + +Host afra-open + HostName 172.23.42.69 + User open + +Host afra-close + HostName 172.23.42.69 + User close From 57c5e442a9d6a041842d69bd75e932b862b7c4dd Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sat, 26 Mar 2022 18:18:50 +0100 Subject: [PATCH 40/74] i3pystatus: fix Exception on empty arrival time --- .config/i3pystatus/ice-status.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.config/i3pystatus/ice-status.py b/.config/i3pystatus/ice-status.py index 1f41417..195dbff 100755 --- a/.config/i3pystatus/ice-status.py +++ b/.config/i3pystatus/ice-status.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -from datetime import datetime +from datetime import datetime, timedelta from requests import get from subprocess import check_output from sys import exit @@ -52,8 +52,12 @@ try: else: delay = '' - arrival = datetime.fromtimestamp(stop['timetable']['actualArrivalTime']/1000) - arrival_in = arrival - now + if stop['timetable'].get('actualArrivalTime', 0): + arrival = datetime.fromtimestamp(stop['timetable']['actualArrivalTime']/1000) + arrival_in = arrival - now + else: + arrival = datetime.now() + arrival_in = timedelta() next_stop = '{} [{}] {} ({}{})'.format( stop['station']['name'], From 438e7441fe0c3d7a20b1a11d4c252d1cc2f13cd0 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sun, 5 Jun 2022 12:18:43 +0200 Subject: [PATCH 41/74] add global gitignore --- .config/gitignore-global | 2 ++ .gitconfig | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 .config/gitignore-global diff --git a/.config/gitignore-global b/.config/gitignore-global new file mode 100644 index 0000000..3fafd07 --- /dev/null +++ b/.config/gitignore-global @@ -0,0 +1,2 @@ +__pycache__ +*.egg-info diff --git a/.gitconfig b/.gitconfig index 71336c7..79b4552 100755 --- a/.gitconfig +++ b/.gitconfig @@ -23,3 +23,5 @@ [init] defaultBranch = main +[core] + excludesFile = ~/.config/gitignore-global From 92280706ee7fa6ac883fd0f024d58f5b4cc911b0 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sun, 5 Jun 2022 12:27:26 +0200 Subject: [PATCH 42/74] Auto-commit kunsi-p14s.kunbox.net --- .bin/voc-ansible | 4 +++- .config/fish/config.fish | 5 +++++ .config/grobi.conf | 10 ++++++++++ .config/i3/config | 2 +- .gtkrc-2.0 | 2 +- .ssh/config | 4 ++++ 6 files changed, 24 insertions(+), 3 deletions(-) diff --git a/.bin/voc-ansible b/.bin/voc-ansible index 8f82b67..a1daba7 100755 --- a/.bin/voc-ansible +++ b/.bin/voc-ansible @@ -1,6 +1,8 @@ #!/bin/bash -cd ~/git/voc-cm/ansible/ +cd ~/git/cm/ansible/ + +source ../.venv/bin/activate export KEEPASS_PW=$(pass show voc/keepass) diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 4d18731..24000ac 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -32,6 +32,11 @@ alias gpu='git push -u origin HEAD' alias gs='git status --short' alias rm='rm --one-file-system' +alias cal='cal -v -m -3' + +alias ipa='ip -brief --color=always addr show; echo; ip --color=always route show; ip -6 --color=always route show' + +alias voc2gui='cd /home/kunsi/git/voctomix/ && .venv/bin/python voctogui/voctogui.py' set -x BW_ITEM_WORKERS 16 set -x BW_NODE_WORKERS 16 diff --git a/.config/grobi.conf b/.config/grobi.conf index 4615304..882c57c 100644 --- a/.config/grobi.conf +++ b/.config/grobi.conf @@ -20,6 +20,16 @@ rules: - xset s off - systemctl --user stop redshift.service + - name: 'DP0' + outputs_connected: + - DisplayPort-0 + configure_row: + - DisplayPort-0 + - eDP + primary: eDP + execute_after: + - xset s off + - name: 'docked DP3+4' outputs_connected: - DisplayPort-3 diff --git a/.config/i3/config b/.config/i3/config index 8380df4..79672f7 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -1,7 +1,7 @@ set $mod Mod4 #font pango:B612 Regular 9 -font pango:DB Office Regular 9 +font pango:DB Office Regular 8 floating_modifier $mod diff --git a/.gtkrc-2.0 b/.gtkrc-2.0 index 171dc0e..7ab7af6 100644 --- a/.gtkrc-2.0 +++ b/.gtkrc-2.0 @@ -1,4 +1,4 @@ -gtk-theme-name="breeze-dark" +gtk-theme-name="Skeuos-Teal-Dark" gtk-enable-animations=1 diff --git a/.ssh/config b/.ssh/config index f67e508..259234b 100755 --- a/.ssh/config +++ b/.ssh/config @@ -5,6 +5,10 @@ Host * Include ~/.ssh/bwnodes +Host r3spluto + HostName r3spluto.ffdus.de + Port 62969 + Host qzwi #HostName 2a00:f820:528::4 HostName 31.47.232.108 From cd6ada85d97259f20dbe32ba80568fb3c9a39832 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sat, 2 Jul 2022 15:56:49 +0200 Subject: [PATCH 43/74] i3pystatus: add magic link option to check in to travelynx --- .config/i3pystatus/config.py | 1 + .config/i3pystatus/ice-status.py | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.config/i3pystatus/config.py b/.config/i3pystatus/config.py index 9804915..ecc1a09 100644 --- a/.config/i3pystatus/config.py +++ b/.config/i3pystatus/config.py @@ -89,6 +89,7 @@ status.register("shell", format="{output}", hints = {"markup": "pango"}, command="/home/kunsi/.config/i3pystatus/ice-status.py", + on_leftclick="/home/kunsi/.config/i3pystatus/ice-status.py --link", ignore_empty_stdout=True, interval=2) diff --git a/.config/i3pystatus/ice-status.py b/.config/i3pystatus/ice-status.py index 195dbff..a99d652 100755 --- a/.config/i3pystatus/ice-status.py +++ b/.config/i3pystatus/ice-status.py @@ -3,7 +3,11 @@ from datetime import datetime, timedelta from requests import get from subprocess import check_output -from sys import exit +from sys import argv, exit + +LINK_MODE = False +if len(argv) > 1 and argv[1] == '--link': + LINK_MODE = True # bundlewrap.utils.text.format_duration, but trimmed down @@ -44,9 +48,18 @@ try: ice_status_req.raise_for_status() ice_status = ice_status_req.json() + if LINK_MODE: + check_output(['xdg-open', 'https://travelynx.franzi.business/s/{}?train={}%20{}'.format( + trip_info['stopInfo']['actualLast'], + trip_info['trainType'], + trip_info['vzn'], + )]) + exit(0) + next_stop_id = trip_info['stopInfo']['actualNext'] for stop in trip_info['stops']: if stop['station']['evaNr'] == next_stop_id: + if stop['timetable']['departureDelay']: delay = ' | {}'.format(stop['timetable']['departureDelay']) else: From e486f477bba5df81146eaefa9be3b9c33c35b767 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sat, 2 Jul 2022 18:30:50 +0200 Subject: [PATCH 44/74] i3pystatus: make travelynx url configurable to user --- .config/i3pystatus/ice-status.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.config/i3pystatus/ice-status.py b/.config/i3pystatus/ice-status.py index a99d652..902a805 100755 --- a/.config/i3pystatus/ice-status.py +++ b/.config/i3pystatus/ice-status.py @@ -8,6 +8,10 @@ from sys import argv, exit LINK_MODE = False if len(argv) > 1 and argv[1] == '--link': LINK_MODE = True + if len(argv) > 2: + LINK_TARGET = argv[2] + else: + LINK_TARGET = 'travelynx.franzi.business' # bundlewrap.utils.text.format_duration, but trimmed down @@ -49,7 +53,8 @@ try: ice_status = ice_status_req.json() if LINK_MODE: - check_output(['xdg-open', 'https://travelynx.franzi.business/s/{}?train={}%20{}'.format( + check_output(['xdg-open', 'https://{}/s/{}?train={}%20{}'.format( + LINK_TARGET, trip_info['stopInfo']['actualLast'], trip_info['trainType'], trip_info['vzn'], From 2957373488c3f619050a0a3f253f4a61216bbc11 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sun, 3 Jul 2022 14:08:12 +0200 Subject: [PATCH 45/74] i3pystatus: try to use scheduledArrivalTime if actual arrival time does not exist --- .config/i3pystatus/ice-status.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.config/i3pystatus/ice-status.py b/.config/i3pystatus/ice-status.py index 902a805..c34bf6d 100755 --- a/.config/i3pystatus/ice-status.py +++ b/.config/i3pystatus/ice-status.py @@ -73,6 +73,9 @@ try: if stop['timetable'].get('actualArrivalTime', 0): arrival = datetime.fromtimestamp(stop['timetable']['actualArrivalTime']/1000) arrival_in = arrival - now + elif stop['timetable'].get('scheduledArrivalTime', 0): + arrival = datetime.fromtimestamp(stop['timetable']['scheduledArrivalTime']/1000) + arrival_in = arrival - now else: arrival = datetime.now() arrival_in = timedelta() From 98a1a1ea640e7846cefc3553332f0d140ae82272 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Wed, 6 Jul 2022 08:31:05 +0200 Subject: [PATCH 46/74] i3pystatus: add amdgpu and wifionice modules --- .config/i3pystatus/config.py | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/.config/i3pystatus/config.py b/.config/i3pystatus/config.py index ecc1a09..30f5c39 100644 --- a/.config/i3pystatus/config.py +++ b/.config/i3pystatus/config.py @@ -1,7 +1,7 @@ from i3pystatus import Status status = Status( - logfile='/dev/null', + logfile='/tmp/i3pystatus.log', ) status.register("pulseaudio", @@ -51,9 +51,10 @@ status.register("battery", status.register("load", format="{avg1}") - +status.register("amdgpu", + format="G: {temp}°C {gpu_usage}%") status.register("temp", - format="{temp:.0f}°C", + format="C: {temp:.0f}°C", hints={"markup": "pango"}, # lm_sensors_enable=True, dynamic_color=True) @@ -85,13 +86,25 @@ status.register("shell", on_leftclick="xinput enable 'SynPS/2 Synaptics TouchPad'", on_rightclick="xinput disable 'SynPS/2 Synaptics TouchPad'") -status.register("shell", - format="{output}", +status.register("wifionice", wifi_adapters=['wlp3s0']) +status.register("wifionice", hints = {"markup": "pango"}, - command="/home/kunsi/.config/i3pystatus/ice-status.py", - on_leftclick="/home/kunsi/.config/i3pystatus/ice-status.py --link", - ignore_empty_stdout=True, - interval=2) + travelynx_url='travelynx.franzi.business', + wifi_adapters=['wlp3s0'], + format_offtrain='Wann wieder Zug?', + format_ontrain='{speed}km/h > {next_station}[ ' + '\[{next_platform}\] {arrival_time} ' + '({arrival_in}[ | {delay_minutes}])][ ' + '(Net: {net_current} > [{net_duration}] ' + '{net_expected})]', + log_level='DEBUG') +#status.register("shell", +# format="{output}", +# hints = {"markup": "pango"}, +# command="/home/kunsi/.config/i3pystatus/ice-status.py", +# on_leftclick="/home/kunsi/.config/i3pystatus/ice-status.py --link", +# ignore_empty_stdout=True, +# interval=2) status.register("network", interface="wlp4s0", From fc772c25a0bafe1c4f5a31f19469a25a2eaeef8e Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Mon, 8 Aug 2022 08:09:52 +0200 Subject: [PATCH 47/74] give alacritty a try --- .config/alacritty/alacritty.yml | 34 +++++++++++++++++++++++++++++++++ .vimrc | 1 + 2 files changed, 35 insertions(+) create mode 100644 .config/alacritty/alacritty.yml diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml new file mode 100644 index 0000000..139b482 --- /dev/null +++ b/.config/alacritty/alacritty.yml @@ -0,0 +1,34 @@ +bell: + duration: 100 + color: '#4d5b86' + +colors: + primary: + foreground: '#D9D4CF' + background: '#000000' + normal: + black: '#232323' + red: '#FF000F' + green: '#8CE10B' + yellow: '#FFB900' + blue: '#008DF8' + magenta: '#6D43A6' + cyan: '#00D8EB' + white: '#FFFFFF' + bright: + black: '#444444' + red: '#FF2740' + green: '#ABE15B' + yellow: '#FFD242' + blue: '#4FB4FF' + magenta: '#9A5FEB' + cyan: '#67FFF0' + white: '#FFFFFF' + cursor: + cursor: '#4d5b86' + text: '#000000' + +cursor: + blinking: true + +live_config_reload: true diff --git a/.vimrc b/.vimrc index 24cd979..10eaa3c 100644 --- a/.vimrc +++ b/.vimrc @@ -1,3 +1,4 @@ +set ttymouse=sgr set number set lbr set fdc=0 From 8ef0e8835b31f3571a90e6601e022d062bf959ae Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Mon, 8 Aug 2022 08:11:31 +0200 Subject: [PATCH 48/74] voc uses bundlewrap now --- .bin/voc-ansible | 9 --------- .config/fish/config.fish | 2 ++ .ssh/config | 10 ++++++++++ 3 files changed, 12 insertions(+), 9 deletions(-) delete mode 100755 .bin/voc-ansible diff --git a/.bin/voc-ansible b/.bin/voc-ansible deleted file mode 100755 index a1daba7..0000000 --- a/.bin/voc-ansible +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -cd ~/git/cm/ansible/ - -source ../.venv/bin/activate - -export KEEPASS_PW=$(pass show voc/keepass) - -./ansible-playbook-keepass --become --become-method=sudo --user voc --inventory event $@ site.yml diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 24000ac..a9013be 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -41,6 +41,8 @@ alias voc2gui='cd /home/kunsi/git/voctomix/ && .venv/bin/python voctogui/voctogu set -x BW_ITEM_WORKERS 16 set -x BW_NODE_WORKERS 16 +set -x BW_KEEPASS_FILE /home/kunsi/git/passwords/voc.kdbx + function fish_greeting echo -n "" end diff --git a/.ssh/config b/.ssh/config index 259234b..fecea1b 100755 --- a/.ssh/config +++ b/.ssh/config @@ -5,6 +5,16 @@ Host * Include ~/.ssh/bwnodes +Host voc-servercase-switch + HostName 10.73.0.253 + KexAlgorithms diffie-hellman-group-exchange-sha1,diffie-hellman-group14-sha1,diffie-hellman-group1-sha1 + HostKeyAlgorithms ssh-dss,ssh-rsa + Ciphers aes128-cbc,3des-cbc + User admin + +Host 10.73.200.101 + User voc + Host r3spluto HostName r3spluto.ffdus.de Port 62969 From 910d8b91d0dc2c2dd5b55e9e86442916e8517204 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Mon, 8 Aug 2022 08:11:57 +0200 Subject: [PATCH 49/74] git: auto setup remotes --- .gitconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitconfig b/.gitconfig index 79b4552..1bec0e0 100755 --- a/.gitconfig +++ b/.gitconfig @@ -25,3 +25,5 @@ defaultBranch = main [core] excludesFile = ~/.config/gitignore-global +[push] + autoSetupRemote = true From 391bc96f7dc3a14b18978cb99319097dd62a9654 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Mon, 8 Aug 2022 08:12:20 +0200 Subject: [PATCH 50/74] i3pystatus uses native wifionice module now --- .config/i3pystatus/config.py | 11 +-- .config/i3pystatus/ice-status.py | 113 ----------------------- .config/i3pystatus/screensaver-status.sh | 2 - 3 files changed, 5 insertions(+), 121 deletions(-) delete mode 100755 .config/i3pystatus/ice-status.py diff --git a/.config/i3pystatus/config.py b/.config/i3pystatus/config.py index 30f5c39..9028661 100644 --- a/.config/i3pystatus/config.py +++ b/.config/i3pystatus/config.py @@ -86,18 +86,17 @@ status.register("shell", on_leftclick="xinput enable 'SynPS/2 Synaptics TouchPad'", on_rightclick="xinput disable 'SynPS/2 Synaptics TouchPad'") -status.register("wifionice", wifi_adapters=['wlp3s0']) +#status.register("wifionice", wifi_adapters=['wlp3s0']) status.register("wifionice", hints = {"markup": "pango"}, travelynx_url='travelynx.franzi.business', wifi_adapters=['wlp3s0'], format_offtrain='Wann wieder Zug?', - format_ontrain='{speed}km/h > {next_station}[ ' + format_ontrain='[{speed}km/h ]> {next_station}[ ' '\[{next_platform}\] {arrival_time} ' - '({arrival_in}[ | {delay_minutes}])][ ' - '(Net: {net_current} > [{net_duration}] ' - '{net_expected})]', - log_level='DEBUG') + '({arrival_in}[ | {delay}])][ ' + '(Net: {net_current} > \[{net_duration}\] ' + '{net_expected})]') #status.register("shell", # format="{output}", # hints = {"markup": "pango"}, diff --git a/.config/i3pystatus/ice-status.py b/.config/i3pystatus/ice-status.py deleted file mode 100755 index c34bf6d..0000000 --- a/.config/i3pystatus/ice-status.py +++ /dev/null @@ -1,113 +0,0 @@ -#!/usr/bin/env python3 - -from datetime import datetime, timedelta -from requests import get -from subprocess import check_output -from sys import argv, exit - -LINK_MODE = False -if len(argv) > 1 and argv[1] == '--link': - LINK_MODE = True - if len(argv) > 2: - LINK_TARGET = argv[2] - else: - LINK_TARGET = 'travelynx.franzi.business' - - -# bundlewrap.utils.text.format_duration, but trimmed down -def format_time(seconds): - if seconds is None: - return "?" - seconds = int(seconds) - components = [] - if seconds >= 3600: - hours = int(seconds / 3600) - seconds -= hours * 3600 - components.append('{}h'.format(hours)) - if seconds >= 60: - minutes = int(seconds / 60) - seconds -= minutes * 60 - components.append('{}m'.format(minutes)) - if not components: - components.append('now') - return " ".join(components) - - -try: - wifi_ssid = check_output("iw dev wlp3s0 link | awk '/SSID/ {print $2}'", shell=True).decode().strip().lower() - - if wifi_ssid not in ( - 'wifi@db', - 'wifionice' - ): - exit(0) - - now = datetime.now() - - trip_info_req = get('https://iceportal.de/api1/rs/tripInfo/trip') - trip_info_req.raise_for_status() - trip_info = trip_info_req.json()['trip'] - - ice_status_req = get('https://iceportal.de/api1/rs/status') - ice_status_req.raise_for_status() - ice_status = ice_status_req.json() - - if LINK_MODE: - check_output(['xdg-open', 'https://{}/s/{}?train={}%20{}'.format( - LINK_TARGET, - trip_info['stopInfo']['actualLast'], - trip_info['trainType'], - trip_info['vzn'], - )]) - exit(0) - - next_stop_id = trip_info['stopInfo']['actualNext'] - for stop in trip_info['stops']: - if stop['station']['evaNr'] == next_stop_id: - - if stop['timetable']['departureDelay']: - delay = ' | {}'.format(stop['timetable']['departureDelay']) - else: - delay = '' - - if stop['timetable'].get('actualArrivalTime', 0): - arrival = datetime.fromtimestamp(stop['timetable']['actualArrivalTime']/1000) - arrival_in = arrival - now - elif stop['timetable'].get('scheduledArrivalTime', 0): - arrival = datetime.fromtimestamp(stop['timetable']['scheduledArrivalTime']/1000) - arrival_in = arrival - now - else: - arrival = datetime.now() - arrival_in = timedelta() - - next_stop = '{} [{}] {} ({}{})'.format( - stop['station']['name'], - stop['track']['actual'], - arrival.strftime('%H:%M'), - format_time(arrival_in.total_seconds()), - delay - ) - break - else: - next_stop = 'Endstation, bitte Aussteigen' - - net_current = ice_status['connectivity']['currentState'] - net_future = ice_status['connectivity']['nextState'] - - if net_current not in (None, 'NO_INFO') or net_future not in (None, 'NO_INFO'): - net = ' (Net: {} > [{}] {})'.format( - net_current, - format_time(ice_status['connectivity']['remainingTimeSeconds']), - net_future, - ) - else: - net = '' - - print('{}km/h > {}{}'.format( - ice_status['speed'], - next_stop, - net, - )) -except Exception as e: - print(repr(e)) - exit(0) diff --git a/.config/i3pystatus/screensaver-status.sh b/.config/i3pystatus/screensaver-status.sh index 9d4247a..bee0e4c 100755 --- a/.config/i3pystatus/screensaver-status.sh +++ b/.config/i3pystatus/screensaver-status.sh @@ -5,8 +5,6 @@ OUT="$(xset q | grep timeout | awk '{print $2}')" if [ "$OUT" = "0" ] then echo "OFF" - exit 1 else echo "${OUT}s" - exit 0 fi From 67b24fb663545c399950ad3c02785d4cdc5e7df8 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sun, 25 Sep 2022 18:29:51 +0200 Subject: [PATCH 51/74] alacritty: disable window decorations --- .config/alacritty/alacritty.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml index 139b482..1a377e7 100644 --- a/.config/alacritty/alacritty.yml +++ b/.config/alacritty/alacritty.yml @@ -31,4 +31,7 @@ colors: cursor: blinking: true +window: + decorations: None + live_config_reload: true From bfbdb70f4cbd10e393ac6e7f373a138b55e41f85 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sun, 25 Sep 2022 18:30:18 +0200 Subject: [PATCH 52/74] i3: switch terminal to alacritty, add second clock --- .config/i3/config | 4 ++-- .config/i3pystatus/config.py | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.config/i3/config b/.config/i3/config index 79672f7..d7a5518 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 kitty -bindsym $mod+Shift+Return exec kitty --class terminal-floating -e python +bindsym $mod+Return exec alacritty +bindsym $mod+Shift+Return exec alacritty --class terminal-floating -e python bindsym $mod+Shift+x kill diff --git a/.config/i3pystatus/config.py b/.config/i3pystatus/config.py index 9028661..7e6844f 100644 --- a/.config/i3pystatus/config.py +++ b/.config/i3pystatus/config.py @@ -36,7 +36,9 @@ status.register("shell", on_rightclick="xset s off") status.register("clock", - format="%a, %Y-%m-%d %H:%M:%S (W%V)",) + format=("%a, %Y-%m-%d %H:%M:%S (W%V)", "Europe/Berlin")) +status.register("clock", + format=("%Y-%m-%d %H:%M:%S UTC", "UTC")) status.register("battery", battery_ident="BAT0", @@ -112,7 +114,7 @@ status.register("network", detect_active=True, freq_divisor=1000000000, divisor=1024, - on_leftclick="kitty --class terminal-floating -e sudo wifi-menu", + on_leftclick="alacritty --class terminal-floating -e sudo wifi-menu", hints={"markup":"pango"}) #status.register("mpd", From 4434d2ab2beedfe430f5fb946c86054ebe144b4b Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sun, 25 Sep 2022 18:31:08 +0200 Subject: [PATCH 53/74] mutt: fix some options --- .mutt/ACCOUNT_TEMPLATE | 4 ++-- .muttrc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.mutt/ACCOUNT_TEMPLATE b/.mutt/ACCOUNT_TEMPLATE index 67a2181..ea4beda 100644 --- a/.mutt/ACCOUNT_TEMPLATE +++ b/.mutt/ACCOUNT_TEMPLATE @@ -7,8 +7,8 @@ set imap_pass="PASSWORD" set from="" -set folder="imaps://USERNAME@mx0.kunbox.net/" -set smtp_url="smtp://USERNAME:PASSWORD@mx0.kunbox.net:587/" +set folder="imaps://USERNAME@rx300.kunbox.net/" +set smtp_url="smtp://USERNAME:PASSWORD@rx300.kunbox.net:587/" set spoolfile="+INBOX" set record="+Sent" diff --git a/.muttrc b/.muttrc index 42812cf..8ff2fbf 100644 --- a/.muttrc +++ b/.muttrc @@ -34,11 +34,11 @@ set mailcap_path=~/.mutt/mailcap alternative_order text/plain text/html auto_view text/html -set index_format="%4C %Z %{%b %d} %-25.25L (%?l?%4l&%4c?) %s" +set index_format="%4C %Z %{%F %T %z} %-25.25L (%?l?%4l&%4c?) %s" set editor="vim -c 'set spell spelllang=de,en'" -source ~/.mutt/gpg.rc +source /usr/share/doc/neomutt/samples/gpg.rc set pgp_use_gpg_agent=yes set pgp_timeout=60 From fd005e4585c4e0c1fda73201a1193980af2be50a Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sun, 25 Sep 2022 18:31:35 +0200 Subject: [PATCH 54/74] feh: new background --- .fehbg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.fehbg b/.fehbg index 3db87c5..6ad3873 100755 --- a/.fehbg +++ b/.fehbg @@ -1,2 +1,2 @@ #!/bin/sh -feh --no-fehbg --bg-scale '/home/kunsi/Pictures/2022-02-17_4-studies_krita-speedpainting_cc-by_david_revoy_2.jpg' +feh --no-fehbg --bg-scale '/home/kunsi/Pictures/The-rendezvous_peppercarrot-wallpaper_by-David-Revoy.jpg' From 0083bc65b7bdc6fc79e71c2d092ea4d0748e22c8 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sun, 22 Jan 2023 15:58:06 +0100 Subject: [PATCH 55/74] pipewire stuff --- .config/i3/config | 12 ++++----- .config/i3pystatus/config.py | 27 +++++++++++-------- .../51-rename-sony-headphones.lua | 13 +++++++++ ...51-rename-laptop-headphones-microphone.lua | 13 +++++++++ .../51-rename-laptop-internal-microphone.lua | 13 +++++++++ .../main.lua.d/51-rename-laptop-output.lua | 13 +++++++++ 6 files changed, 74 insertions(+), 17 deletions(-) create mode 100644 .config/wireplumber/bluetooth.lua.d/51-rename-sony-headphones.lua create mode 100644 .config/wireplumber/main.lua.d/51-rename-laptop-headphones-microphone.lua create mode 100644 .config/wireplumber/main.lua.d/51-rename-laptop-internal-microphone.lua create mode 100644 .config/wireplumber/main.lua.d/51-rename-laptop-output.lua diff --git a/.config/i3/config b/.config/i3/config index d7a5518..919e477 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -125,14 +125,14 @@ 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 $mod+Prior exec pactl set-sink-volume @DEFAULT_SINK@ +2%; exec pactl set-sink-mute @DEFAULT_SINK@ 0 -bindsym $mod+Next exec pactl set-sink-volume @DEFAULT_SINK@ -2%; exec pactl set-sink-mute @DEFAULT_SINK@ 0 -bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +2%; exec pactl set-sink-mute @DEFAULT_SINK@ 0 -bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -2%; exec pactl set-sink-mute @DEFAULT_SINK@ 0 -bindsym XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle -bindsym XF86AudioMicMute exec pactl set-source-mute alsa_input.pci-0000_07_00.6.HiFi__hw_acp__source toggle +bindsym XF86AudioRaiseVolume exec wpctl set-volume @DEFAULT_AUDIO_SINK@ 2%+; exec wpctl set-mute @DEFAULT_AUDIO_SINK@ 0 +bindsym XF86AudioLowerVolume exec wpctl set-volume @DEFAULT_AUDIO_SINK@ 2%-; exec wpctl set-mute @DEFAULT_AUDIO_SINK@ 0 +bindsym XF86AudioMute exec wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle +bindsym XF86AudioMicMute exec wpctl set-mute laptop-internal-microphone toggle bindsym XF86MonBrightnessUp exec sudo light -A 5 bindsym XF86MonBrightnessDown exec sudo light -U 5 diff --git a/.config/i3pystatus/config.py b/.config/i3pystatus/config.py index 7e6844f..1f41249 100644 --- a/.config/i3pystatus/config.py +++ b/.config/i3pystatus/config.py @@ -1,19 +1,24 @@ from i3pystatus import Status status = Status( - logfile='/tmp/i3pystatus.log', + logfile='/dev/stderr', ) -status.register("pulseaudio", - format="♪I {volume}%", - format_muted="♪I -∞dB", - step="2", - sink="alsa_output.pci-0000_07_00.6.HiFi__hw_Generic_1__sink") -status.register("pulseaudio", - format="♪D {volume}%", - format_muted="♪D -∞dB", - step="2", - sink="@DEFAULT_SINK@") +#status.register("pulseaudio", +# format="♪I {volume}%", +# format_muted="♪I -∞dB", +# step="2", +# sink="alsa_output.pci-0000_07_00.6.HiFi__hw_Generic_1__sink") +#status.register("pulseaudio", +# format="♪D {volume}%", +# format_muted="♪D -∞dB", +# step="2", +# sink="@DEFAULT_SINK@") + +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"}, diff --git a/.config/wireplumber/bluetooth.lua.d/51-rename-sony-headphones.lua b/.config/wireplumber/bluetooth.lua.d/51-rename-sony-headphones.lua new file mode 100644 index 0000000..883d6d3 --- /dev/null +++ b/.config/wireplumber/bluetooth.lua.d/51-rename-sony-headphones.lua @@ -0,0 +1,13 @@ +rule = { + matches = { + { + { "node.name", "equals", "bluez_output.38_18_4C_BF_65_26.1" }, + }, + }, + apply_properties = { + ["node.description"] = "WH-1000XM3 (Franzi)", + ["node.nick"] = "bluetooth-WH-1000XM3", + }, +} + +table.insert(bluez_monitor.rules, rule) diff --git a/.config/wireplumber/main.lua.d/51-rename-laptop-headphones-microphone.lua b/.config/wireplumber/main.lua.d/51-rename-laptop-headphones-microphone.lua new file mode 100644 index 0000000..280192e --- /dev/null +++ b/.config/wireplumber/main.lua.d/51-rename-laptop-headphones-microphone.lua @@ -0,0 +1,13 @@ +rule = { + matches = { + { + { "node.name", "equals", "alsa_input.pci-0000_07_00.6.HiFi__hw_Generic_1__source" }, + }, + }, + apply_properties = { + ["node.description"] = "Laptop Headphones Microphone", + ["node.nick"] = "laptop-headphones-mic", + }, +} + +table.insert(alsa_monitor.rules, rule) diff --git a/.config/wireplumber/main.lua.d/51-rename-laptop-internal-microphone.lua b/.config/wireplumber/main.lua.d/51-rename-laptop-internal-microphone.lua new file mode 100644 index 0000000..92532cf --- /dev/null +++ b/.config/wireplumber/main.lua.d/51-rename-laptop-internal-microphone.lua @@ -0,0 +1,13 @@ +rule = { + matches = { + { + { "node.name", "equals", "alsa_input.pci-0000_07_00.6.HiFi__hw_acp__source" }, + }, + }, + apply_properties = { + ["node.description"] = "Laptop internal Microphone", + ["node.nick"] = "laptop-internal-mic", + }, +} + +table.insert(alsa_monitor.rules, rule) diff --git a/.config/wireplumber/main.lua.d/51-rename-laptop-output.lua b/.config/wireplumber/main.lua.d/51-rename-laptop-output.lua new file mode 100644 index 0000000..c7fda40 --- /dev/null +++ b/.config/wireplumber/main.lua.d/51-rename-laptop-output.lua @@ -0,0 +1,13 @@ +rule = { + matches = { + { + { "node.name", "equals", "alsa_output.pci-0000_07_00.6.HiFi__hw_Generic_1__sink" }, + }, + }, + apply_properties = { + ["node.description"] = "Laptop Speakers/Headphones", + ["node.nick"] = "laptop-internal-out", + }, +} + +table.insert(alsa_monitor.rules, rule) From e7371b3e83d30b1da1789bf701de0a5241748bca Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sun, 22 Jan 2023 15:58:23 +0100 Subject: [PATCH 56/74] stuff --- .bin/backup-and-update-system | 2 +- .config/alacritty/alacritty.yml | 3 --- .config/fish/config.fish | 28 ++++++++++++---------------- .config/grobi.conf | 13 +++++++++++++ .config/i3pystatus/config.py | 4 ++-- .ssh/config | 24 ++++++++++++++++++++---- 6 files changed, 48 insertions(+), 26 deletions(-) diff --git a/.bin/backup-and-update-system b/.bin/backup-and-update-system index 9804df7..d1b9d92 100755 --- a/.bin/backup-and-update-system +++ b/.bin/backup-and-update-system @@ -9,7 +9,7 @@ git --git-dir=$HOME/.cfg/ --work-tree=$HOME push # Fetch a fresh copy of all locally cloned git repos for dir in $(find /home/kunsi/git -mindepth 1 -maxdepth 1 -type d) do - git -C "$dir" fetch || true + git -C "$dir" fetch --all || true done # Do a backup. diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml index 1a377e7..139b482 100644 --- a/.config/alacritty/alacritty.yml +++ b/.config/alacritty/alacritty.yml @@ -31,7 +31,4 @@ colors: cursor: blinking: true -window: - decorations: None - live_config_reload: true diff --git a/.config/fish/config.fish b/.config/fish/config.fish index a9013be..235373a 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -3,17 +3,21 @@ set -U -x MPD_HOST 172.19.138.20 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 -alias weechat='mosh rx300 -- tmux attach-session -d -t weechat-tmux' -alias voc-ansible='/home/kunsi/.bin/voc-ansible' -alias share-via-ssh='/home/kunsi/git/share-via-ssh/share-via-ssh' - -alias tmp='cd (mktemp -d -p /home/kunsi --suffix=.(date +%F))' +set -U -x SSH_AUTH_SOCK $(gpgconf --list-dirs agent-ssh-socket) +gpgconf --launch gpg-agent alias bwr='cd ~/git/bundlewrap/' -alias v='vim -p' +alias cal='cal -v -m -3' +alias ipa='ip -brief --color=always addr show; echo; ip --color=always route show; ip -6 --color=always route show' alias l='ls -lAh' -alias please='sudo' - +alias p='python' +alias rm='rm --one-file-system' +alias share-via-ssh='/home/kunsi/git/share-via-ssh/share-via-ssh' +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 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"' @@ -31,16 +35,8 @@ alias gp='git push' alias gpu='git push -u origin HEAD' alias gs='git status --short' -alias rm='rm --one-file-system' -alias cal='cal -v -m -3' - -alias ipa='ip -brief --color=always addr show; echo; ip --color=always route show; ip -6 --color=always route show' - -alias voc2gui='cd /home/kunsi/git/voctomix/ && .venv/bin/python voctogui/voctogui.py' - set -x BW_ITEM_WORKERS 16 set -x BW_NODE_WORKERS 16 - set -x BW_KEEPASS_FILE /home/kunsi/git/passwords/voc.kdbx function fish_greeting diff --git a/.config/grobi.conf b/.config/grobi.conf index 882c57c..a3f219b 100644 --- a/.config/grobi.conf +++ b/.config/grobi.conf @@ -20,6 +20,19 @@ rules: - xset s off - systemctl --user stop redshift.service + - name: 'smedia' + outputs_connected: + - DisplayPort-0 + - DisplayPort-1 + configure_row: + - eDP + - DisplayPort-0 + - DisplayPort-1 + primary: DisplayPort-1 + execute_after: + - xset s off + - sudo light -S 100 + - name: 'DP0' outputs_connected: - DisplayPort-0 diff --git a/.config/i3pystatus/config.py b/.config/i3pystatus/config.py index 1f41249..5a2095e 100644 --- a/.config/i3pystatus/config.py +++ b/.config/i3pystatus/config.py @@ -96,10 +96,10 @@ status.register("shell", #status.register("wifionice", wifi_adapters=['wlp3s0']) status.register("wifionice", hints = {"markup": "pango"}, - travelynx_url='travelynx.franzi.business', + url_on_click='https://travelynx.franzi.business/s/{last_station_no}?train={train_type}%20{train_no}', wifi_adapters=['wlp3s0'], format_offtrain='Wann wieder Zug?', - format_ontrain='[{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}\] ' diff --git a/.ssh/config b/.ssh/config index fecea1b..1fad955 100755 --- a/.ssh/config +++ b/.ssh/config @@ -5,16 +5,32 @@ Host * Include ~/.ssh/bwnodes +Host akamai.lan.c3voc.de + User root + +Host cloudflare.lan.c3voc.de + User root + +Host fastly.lan.c3voc.de + User root + +Host *.lan.c3voc.de + SetEnv TERM=xterm-256color + +#Host 10.73.200.201 +# User voc + +Host 172.19.138.4 + PubkeyAcceptedKeyTypes +ssh-rsa + Host voc-servercase-switch - HostName 10.73.0.253 + HostName 10.73.200.200 KexAlgorithms diffie-hellman-group-exchange-sha1,diffie-hellman-group14-sha1,diffie-hellman-group1-sha1 HostKeyAlgorithms ssh-dss,ssh-rsa Ciphers aes128-cbc,3des-cbc + SetEnv TERM=xterm-256color User admin -Host 10.73.200.101 - User voc - Host r3spluto HostName r3spluto.ffdus.de Port 62969 From 6899ba8fd259d12168e14dc56d6c5a71a3d45a44 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sat, 11 Nov 2023 14:23:59 +0100 Subject: [PATCH 57/74] 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 From 393c9b31a4e2988a2a8dbdb9c9f30270ff7c110f Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Fri, 1 Mar 2024 20:34:59 +0100 Subject: [PATCH 58/74] Auto-commit kunsi-p14s.kunbox.net 2024-03-01 20:34:58 --- .bin/trackpoint-settings.sh | 3 +-- .config/fish/config.fish | 6 +++--- .config/i3pystatus/config.py | 32 ++++++++++++++++---------------- .ssh/config | 4 ++++ 4 files changed, 24 insertions(+), 21 deletions(-) diff --git a/.bin/trackpoint-settings.sh b/.bin/trackpoint-settings.sh index cd174f7..9955b56 100755 --- a/.bin/trackpoint-settings.sh +++ b/.bin/trackpoint-settings.sh @@ -1,4 +1,3 @@ #!/bin/sh -echo -n 255 > /sys/devices/platform/i8042/serio1/serio2/sensitivity -echo -n 200 > /sys/devices/platform/i8042/serio1/serio2/speed +xinput set-prop 'TPPS/2 Elan TrackPoint' 321 0.7 diff --git a/.config/fish/config.fish b/.config/fish/config.fish index ad4ea94..53345eb 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -15,9 +15,9 @@ alias share-via-ssh='/home/kunsi/git/share-via-ssh/share-via-ssh' 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 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 voc2gui='cd /home/kunsi/git/voctomix/ && voctogui/voctogui.py' +alias weechat='mosh carlene.kunbox.net -- 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; echo; echo; cat /etc/resolv.conf'" 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"' diff --git a/.config/i3pystatus/config.py b/.config/i3pystatus/config.py index 77b44ef..f866938 100644 --- a/.config/i3pystatus/config.py +++ b/.config/i3pystatus/config.py @@ -4,21 +4,21 @@ status = Status( logfile='/dev/stderr', ) -#status.register("pulseaudio", -# format="♪I {volume}%", -# format_muted="♪I -∞dB", -# step="2", -# sink="alsa_output.pci-0000_07_00.6.HiFi__hw_Generic_1__sink") -#status.register("pulseaudio", -# format="♪D {volume}%", -# format_muted="♪D -∞dB", -# step="2", -# sink="@DEFAULT_SINK@") +status.register("pulseaudio", + format="♪I {volume}%", + format_muted="♪I -∞dB", + step="2", + sink="alsa_output.pci-0000_06_00.6.HiFi__hw_Generic_1__sink") +status.register("pulseaudio", + format="♪D {volume}%", + format_muted="♪D -∞dB", + step="2", + sink="@DEFAULT_SINK@") -status.register("shell", - format="♪D {output}", - command="wpctl get-volume @DEFAULT_AUDIO_SINK@ | cut -d: -f2", - interval=1) +#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"}, @@ -93,11 +93,11 @@ status.register("shell", on_leftclick="xinput enable 'SynPS/2 Synaptics TouchPad'", on_rightclick="xinput disable 'SynPS/2 Synaptics TouchPad'") -#status.register("wifionice", wifi_adapters=['wlp3s0']) +#status.register("wifionice", wifi_adapters=['wlan0']) 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=['wlp2s0'], + wifi_adapters=['wlan0'], format_offtrain='Wann wieder Zug?', format_ontrain='{train_type} {train_no} [~ {speed}km/h ]> {next_station}[ ' '\[{next_platform}\] {arrival_time} ' diff --git a/.ssh/config b/.ssh/config index 3426cac..2581c06 100755 --- a/.ssh/config +++ b/.ssh/config @@ -5,6 +5,10 @@ Host * Include ~/.ssh/bwnodes +Host 172.19.138.95 + User of + + Host mixer191.lan.c3voc.de Hostname 10.73.191.1 Host encoder191.lan.c3voc.de From 0184d9e183cee6e95cc0f8960d763f1cafbf0663 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Fri, 1 Mar 2024 20:36:09 +0100 Subject: [PATCH 59/74] Auto-commit kunsi-p14s.kunbox.net 2024-03-01 20:36:09 --- .bin/backup-and-update-system | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.bin/backup-and-update-system b/.bin/backup-and-update-system index d1b9d92..0d318c6 100755 --- a/.bin/backup-and-update-system +++ b/.bin/backup-and-update-system @@ -4,6 +4,8 @@ set -xeuo pipefail # Push some git repos pass git push + +git --git-dir=$HOME/.cfg/ --work-tree=$HOME commit -am "Auto-commit $(hostnamectl --static) $(date '+%F %T')"u git --git-dir=$HOME/.cfg/ --work-tree=$HOME push # Fetch a fresh copy of all locally cloned git repos From ff1b8f2449fcda8130ed0b9b815457df5c10a197 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sat, 23 Mar 2024 12:52:13 +0100 Subject: [PATCH 60/74] Auto-commit kunsi-p14s.kunbox.net 2024-03-23 12:52:13 --- .config/kitty/kitty.conf | 4 ++++ .ssh/config | 3 +++ 2 files changed, 7 insertions(+) diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf index d11c634..5c7c5da 100644 --- a/.config/kitty/kitty.conf +++ b/.config/kitty/kitty.conf @@ -10,3 +10,7 @@ window_alert_on_bell yes remember_window_size no initial_window_width 100c initial_window_height 30c + +map ctrl+shift+0 change_font_size current 0 +map ctrl+shift+8 change_font_size current -2.0 +map ctrl+shift+9 change_font_size current +2.0 diff --git a/.ssh/config b/.ssh/config index 2581c06..797283b 100755 --- a/.ssh/config +++ b/.ssh/config @@ -5,6 +5,9 @@ Host * Include ~/.ssh/bwnodes +Host 172.19.138.10 + User root + Host 172.19.138.95 User of From 6fb300621b53e06ff5c4837508211d4e36f36c1a Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sat, 23 Mar 2024 12:52:38 +0100 Subject: [PATCH 61/74] Auto-commit kunsi-p14s.kunbox.net 2024-03-23 12:52:38 --- .bin/backup-and-update-system | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bin/backup-and-update-system b/.bin/backup-and-update-system index 0d318c6..42d87b1 100755 --- a/.bin/backup-and-update-system +++ b/.bin/backup-and-update-system @@ -5,7 +5,7 @@ set -xeuo pipefail # Push some git repos pass git push -git --git-dir=$HOME/.cfg/ --work-tree=$HOME commit -am "Auto-commit $(hostnamectl --static) $(date '+%F %T')"u +git --git-dir=$HOME/.cfg/ --work-tree=$HOME commit -am "Auto-commit $(hostnamectl --static) $(date '+%F %T')" git --git-dir=$HOME/.cfg/ --work-tree=$HOME push # Fetch a fresh copy of all locally cloned git repos From d513888648baa9aec69283c052e34eb49c386c8e Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sun, 28 Apr 2024 21:01:26 +0200 Subject: [PATCH 62/74] Auto-commit kunsi-p14s.kunbox.net 2024-04-28 21:01:26 --- .bin/backup-and-update-system | 3 +++ .config/fish/config.fish | 2 ++ .ssh/config | 3 +++ 3 files changed, 8 insertions(+) diff --git a/.bin/backup-and-update-system b/.bin/backup-and-update-system index 42d87b1..9f9211a 100755 --- a/.bin/backup-and-update-system +++ b/.bin/backup-and-update-system @@ -2,6 +2,9 @@ set -xeuo pipefail +export GIT_TERMINAL_PROMPT=0 +export GIT_SSH_COMMAND='ssh -oBatchMode=yes' + # Push some git repos pass git push diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 53345eb..3b1f624 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -46,6 +46,8 @@ set -x BW_ITEM_WORKERS 16 set -x BW_NODE_WORKERS 16 set -x BW_KEEPASS_FILE /home/kunsi/git/passwords/voc.kdbx +set -x LESS "-iRS -# 2" + # mollys mpd, see /etc/hosts set -x MPD_HOST mpd.local diff --git a/.ssh/config b/.ssh/config index 797283b..ee032df 100755 --- a/.ssh/config +++ b/.ssh/config @@ -11,6 +11,9 @@ Host 172.19.138.10 Host 172.19.138.95 User of +Host mixer96.lan.c3voc.de + User voc + Host mixer191.lan.c3voc.de Hostname 10.73.191.1 From 44fe9b57c807620177eed3eb50047941bac09d2e Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sat, 11 May 2024 18:13:49 +0200 Subject: [PATCH 63/74] Auto-commit kunsi-p14s.kunbox.net 2024-05-11 18:13:49 --- .config/i3pystatus/config.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.config/i3pystatus/config.py b/.config/i3pystatus/config.py index f866938..4d4fb4d 100644 --- a/.config/i3pystatus/config.py +++ b/.config/i3pystatus/config.py @@ -99,11 +99,11 @@ status.register("wifionice", url_on_click='https://travelynx.franzi.business/s/{last_station_no}?train={train_type}%20{train_no}', wifi_adapters=['wlan0'], format_offtrain='Wann wieder Zug?', - format_ontrain='{train_type} {train_no} [~ {speed}km/h ]> {next_station}[ ' - '\[{next_platform}\] {arrival_time} ' - '({arrival_in}[ | {delay}])][ ' - '(Net: {net_current} > \[{net_duration}\] ' - '{net_expected})]') + format_ontrain=r'{train_type} {train_no} [~ {speed}km/h ]> {next_station}[ ' + r'\[{next_platform}\] {arrival_time} ' + r'({arrival_in}[ | {delay}])][ ' + r'(Net: {net_current} > \[{net_duration}\] ' + r'{net_expected})]') #status.register("shell", # format="{output}", # hints = {"markup": "pango"}, From c1a1d6c2400a7a6b94e7a729559dace85e625359 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sun, 19 May 2024 11:40:02 +0200 Subject: [PATCH 64/74] Auto-commit kunsi-p14s.kunbox.net 2024-05-19 11:40:02 --- .ssh/config | 41 +++++++---------------------------------- 1 file changed, 7 insertions(+), 34 deletions(-) diff --git a/.ssh/config b/.ssh/config index ee032df..4f4abd2 100755 --- a/.ssh/config +++ b/.ssh/config @@ -11,27 +11,13 @@ Host 172.19.138.10 Host 172.19.138.95 User of -Host mixer96.lan.c3voc.de - User voc - - -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 ch-jump +# Hostname jump.chaos-at-home.org +# Port 2342 +# User c3voc +# +#Host 10.73.7.* +# ProxyJump ch-jump Host akamai.lan.c3voc.de User root @@ -61,18 +47,5 @@ Host proxmox-backupstorage HostName 2a01:4f9:6b:2d99::c0ff:ee User root -Host voellerei - HostName voellerei.club.entropia.de - Port 22 - User entropia - Host router-remote HostName franzi-home.kunbox.net - -Host afra-open - HostName 172.23.42.69 - User open - -Host afra-close - HostName 172.23.42.69 - User close From 1d15aa8a0e56ea6bbc63599104d0919779600427 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Thu, 23 May 2024 17:40:40 +0200 Subject: [PATCH 65/74] Auto-commit kunsi-p14s.kunbox.net 2024-05-23 17:40:40 --- .bin/voc-mount | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.bin/voc-mount b/.bin/voc-mount index 0c37e63..adad90c 100755 --- a/.bin/voc-mount +++ b/.bin/voc-mount @@ -20,5 +20,5 @@ then sudo mkdir -p "/video/fuse" fi -sudo mount -t cifs -o "uid=${uid},password=" "//${device}.lan.c3voc.de/video" "/video" -sudo mount -t cifs -o "uid=${uid},password=" "//${device}.lan.c3voc.de/fuse" "/video/fuse" +sudo mount -t cifs -o "uid=${uid},password=" "//${device}/video" "/video" +sudo mount -t cifs -o "uid=${uid},password=" "//${device}/fuse" "/video/fuse" From 7d25559833a17e9816805357ad229f81c3d786ff Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Tue, 18 Jun 2024 21:34:35 +0200 Subject: [PATCH 66/74] Auto-commit kunsi-p14s.kunbox.net 2024-06-18 21:34:35 --- .config/fish/config.fish | 4 ++++ .config/i3/config | 2 +- .config/i3pystatus/config.py | 10 +++++----- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 3b1f624..27e92aa 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -66,3 +66,7 @@ end function config --wraps=/usr/bin/git /usr/bin/git --git-dir=$HOME/.cfg/ --work-tree=$HOME $argv; end + +function cert + echo "" | openssl s_client -connect {$argv[1]}:443 +end diff --git a/.config/i3/config b/.config/i3/config index 0c72e9b..dba2bc5 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -122,7 +122,7 @@ exec_always sudo /home/kunsi/.bin/trackpoint-settings.sh exec xset s noblank && xset s 90 10 && xset -dpms 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 xinput disable 'SynPS/2 Synaptics TouchPad' bindsym XF86Favorites exec /home/kunsi/.bin/screenlock.sh diff --git a/.config/i3pystatus/config.py b/.config/i3pystatus/config.py index 4d4fb4d..76e8155 100644 --- a/.config/i3pystatus/config.py +++ b/.config/i3pystatus/config.py @@ -41,7 +41,7 @@ status.register("shell", on_rightclick="xset s off") status.register("clock", - format=("%a, %Y-%m-%d %H:%M:%S %z (W%V)", "Europe/Berlin")) + format="%a, %Y-%m-%d %H:%M:%S %z (W%V)") status.register("clock", format=("%Y-%m-%d %H:%M:%S UTC", "UTC")) @@ -57,13 +57,13 @@ status.register("battery", }) status.register("load", - format="{avg1}") -#status.register("amdgpu", -# format="G: {temp}°C {gpu_usage}%") + format="L: {avg1}") +status.register("amdgpu", + format="G: {temp}°C {gpu_usage}%", + card=1) status.register("temp", format="C: {temp:.0f}°C", hints={"markup": "pango"}, -# lm_sensors_enable=True, dynamic_color=True) status.register("shell", From 622675e77eec396003b0073f30f8905b5ef8182c Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Fri, 5 Jul 2024 21:42:55 +0200 Subject: [PATCH 67/74] Auto-commit kunsi-p14s.kunbox.net 2024-07-05 21:42:55 --- .ssh/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ssh/config b/.ssh/config index 4f4abd2..51fa78f 100755 --- a/.ssh/config +++ b/.ssh/config @@ -38,7 +38,7 @@ Host *.lan.c3voc.de 172.19.138.10 172.19.138.117 Host voc-servercase-switch HostName 10.73.200.200 KexAlgorithms diffie-hellman-group-exchange-sha1,diffie-hellman-group14-sha1,diffie-hellman-group1-sha1 - HostKeyAlgorithms ssh-dss,ssh-rsa + HostKeyAlgorithms ssh-rsa Ciphers aes128-cbc,3des-cbc SetEnv TERM=xterm-256color User admin From 7af7b3cbd6c4280785ded8291b3e3dd0287a5a43 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sun, 14 Jul 2024 11:27:57 +0200 Subject: [PATCH 68/74] Auto-commit kunsi-p14s.kunbox.net 2024-07-14 11:27:57 --- .bin/backup-and-update-system | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bin/backup-and-update-system b/.bin/backup-and-update-system index 9f9211a..5a0c1f0 100755 --- a/.bin/backup-and-update-system +++ b/.bin/backup-and-update-system @@ -8,7 +8,7 @@ export GIT_SSH_COMMAND='ssh -oBatchMode=yes' # Push some git repos pass git push -git --git-dir=$HOME/.cfg/ --work-tree=$HOME commit -am "Auto-commit $(hostnamectl --static) $(date '+%F %T')" +git --git-dir=$HOME/.cfg/ --work-tree=$HOME commit -am "Auto-commit $(hostnamectl --static) $(date '+%F %T')" || true git --git-dir=$HOME/.cfg/ --work-tree=$HOME push # Fetch a fresh copy of all locally cloned git repos From 764baad9b4151f8e6c3d5e94001c900c81453799 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Wed, 4 Sep 2024 20:03:57 +0200 Subject: [PATCH 69/74] Auto-commit kunsi-p14s.kunbox.net 2024-09-04 20:03:57 --- .config/fish/config.fish | 4 ++++ .config/systemd/user/default.target.wants/grobi.service | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 27e92aa..80c2bca 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -70,3 +70,7 @@ end function cert echo "" | openssl s_client -connect {$argv[1]}:443 end + +function tomp3 + ffmpeg -i "$argv[1]" -vn -f mp3 -q:a 0 "$(basename "$argv[1]").mp3" +end diff --git a/.config/systemd/user/default.target.wants/grobi.service b/.config/systemd/user/default.target.wants/grobi.service index aad545f..19647d3 120000 --- a/.config/systemd/user/default.target.wants/grobi.service +++ b/.config/systemd/user/default.target.wants/grobi.service @@ -1 +1 @@ -/home/kunsi/.config/systemd/user/grobi.service \ No newline at end of file +/usr/lib/systemd/user/grobi.service \ No newline at end of file From dcfa7e0ea5c855242c2c26f8ac592c97d7e03766 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sat, 7 Sep 2024 09:18:26 +0200 Subject: [PATCH 70/74] import scys yt-dlp config --- .config/yt-dlp/config | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .config/yt-dlp/config diff --git a/.config/yt-dlp/config b/.config/yt-dlp/config new file mode 100644 index 0000000..655338d --- /dev/null +++ b/.config/yt-dlp/config @@ -0,0 +1,26 @@ +# Remove problematic characters from file names. +--restrict-filenames +# Have service and author in the file name. +--output '%(title).120s [%(extractor)s %(id)s %(uploader_id)s].%(ext)s' + +# Try to download live streams from the start (use --no-live-from-start to disable). +--live-from-start +# Wait for scheduled streams to become available, retry after 10 seconds. +--wait-for-video 10 + +# Display progress in console title. +--console-title + +# Create SponsorBlock chapters. +--sponsorblock-mark all + +# The following options are basically presets for different use cases. + +# Create a new option `--archive` that will embed all video and audio streams +# and as much information as possible in the video as well as create a sidecar +# file with full metadata. +--alias archive '--embed-subs --embed-thumbnail --embed-metadata --embed-chapters --write-info-json --no-clean-info-json --video-multistreams --audio-multistreams --merge-output-format mkv' + +# Create a `--mp4` option that will optimize for getting an MP4 file, for +# sharing on the Fedi etc. `-S ext` does the heavy lifting here. +--alias mp4 '-S ext --merge-output-format mp4' From a4d50ac3988e7440582b447bfb9b4169ecd1002f Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sun, 15 Sep 2024 08:02:25 +0200 Subject: [PATCH 71/74] Auto-commit kunsi-p14s.kunbox.net 2024-09-15 08:02:24 --- .config/yt-dlp/config | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.config/yt-dlp/config b/.config/yt-dlp/config index 655338d..be81183 100644 --- a/.config/yt-dlp/config +++ b/.config/yt-dlp/config @@ -1,7 +1,5 @@ -# Remove problematic characters from file names. ---restrict-filenames # Have service and author in the file name. ---output '%(title).120s [%(extractor)s %(id)s %(uploader_id)s].%(ext)s' +--output '%(title)s [%(extractor)s %(id)s %(uploader_id)s].%(ext)s' # Try to download live streams from the start (use --no-live-from-start to disable). --live-from-start From 2794840240766c7b4b576f8214a96fbcf1b4125d Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Mon, 16 Sep 2024 20:11:12 +0200 Subject: [PATCH 72/74] Auto-commit kunsi-p14s.kunbox.net 2024-09-16T20:11:12+02:00 --- .bin/backup-and-update-system | 2 +- .config/yt-dlp/config | 8 +++++++- .ssh/config | 3 +++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.bin/backup-and-update-system b/.bin/backup-and-update-system index 5a0c1f0..f949551 100755 --- a/.bin/backup-and-update-system +++ b/.bin/backup-and-update-system @@ -8,7 +8,7 @@ export GIT_SSH_COMMAND='ssh -oBatchMode=yes' # Push some git repos pass git push -git --git-dir=$HOME/.cfg/ --work-tree=$HOME commit -am "Auto-commit $(hostnamectl --static) $(date '+%F %T')" || true +git --git-dir=$HOME/.cfg/ --work-tree=$HOME commit -am "Auto-commit $(hostnamectl --static) $(date --iso-8601=seconds)" || true git --git-dir=$HOME/.cfg/ --work-tree=$HOME push # Fetch a fresh copy of all locally cloned git repos diff --git a/.config/yt-dlp/config b/.config/yt-dlp/config index be81183..326a707 100644 --- a/.config/yt-dlp/config +++ b/.config/yt-dlp/config @@ -12,12 +12,18 @@ # Create SponsorBlock chapters. --sponsorblock-mark all +# embed some stuff +--embed-chapters +--embed-metadata +--embed-subs + # The following options are basically presets for different use cases. # Create a new option `--archive` that will embed all video and audio streams # and as much information as possible in the video as well as create a sidecar # file with full metadata. ---alias archive '--embed-subs --embed-thumbnail --embed-metadata --embed-chapters --write-info-json --no-clean-info-json --video-multistreams --audio-multistreams --merge-output-format mkv' +--alias archive '--embed-thumbnail --video-multistreams --audio-multistreams --merge-output-format mkv' +--alias archivejson '--embed-thumbnail --write-info-json --no-clean-info-json --video-multistreams --audio-multistreams --merge-output-format mkv' # Create a `--mp4` option that will optimize for getting an MP4 file, for # sharing on the Fedi etc. `-S ext` does the heavy lifting here. diff --git a/.ssh/config b/.ssh/config index 51fa78f..7d7584d 100755 --- a/.ssh/config +++ b/.ssh/config @@ -11,6 +11,9 @@ Host 172.19.138.10 Host 172.19.138.95 User of +Host 2a01:4f9:6b:2d99::c0ff:ee + User root + #Host ch-jump # Hostname jump.chaos-at-home.org # Port 2342 From 5b75d0d5e45c9fd900c187f4231d89c6273b7d78 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Fri, 27 Sep 2024 08:53:30 +0200 Subject: [PATCH 73/74] Auto-commit kunsi-p14s.kunbox.net 2024-09-27T08:53:30+02:00 --- .config/fish/config.fish | 1 + .config/i3/config | 5 +++-- .config/mpv/mpv.conf | 2 ++ .config/yt-dlp/config | 7 +++++-- .gitconfig | 1 + 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 80c2bca..a71edfe 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -6,6 +6,7 @@ set PATH $PATH /home/kunsi/.local/bin /home/kunsi/.gem/ruby/2.6.0/bin/ /home/kun set -U -x SSH_AUTH_SOCK $(gpgconf --list-dirs agent-ssh-socket) alias bwr='cd ~/git/bundlewrap/' +alias cm='cd ~/git/cm/bundlewrap/' alias cal='cal -v -m -3' alias ipa='ip -brief --color=always addr show; echo; ip --color=always route show; ip -6 --color=always route show' alias l='ls -lAh' diff --git a/.config/i3/config b/.config/i3/config index dba2bc5..01b5716 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -111,9 +111,10 @@ for_window [class="realvnc-vncviewer"] floating enable for_window [class="terminal-floating"] floating enable workspace $ws1 output DisplayPort-0 -workspace $ws2 output HDMI-A-0 +workspace $ws2 output DisplayPort-0 workspace $ws3 output DisplayPort-0 -workspace $ws10 output HDMI-A-0 +workspace $ws9 output HDMI-A-0 +workspace $ws10 output DisplayPort-0 exec_always setxkbmap -synch exec_always ~/.fehbg diff --git a/.config/mpv/mpv.conf b/.config/mpv/mpv.conf index faebfd2..0fc3f93 100644 --- a/.config/mpv/mpv.conf +++ b/.config/mpv/mpv.conf @@ -8,6 +8,8 @@ cursor-autohide=1000 msg-color +no-audio-display + no-osc osd-on-seek=bar diff --git a/.config/yt-dlp/config b/.config/yt-dlp/config index 326a707..f77646e 100644 --- a/.config/yt-dlp/config +++ b/.config/yt-dlp/config @@ -16,14 +16,17 @@ --embed-chapters --embed-metadata --embed-subs +--embed-thumbnail +--video-multistreams +--audio-multistreams +--merge-output-format mkv # The following options are basically presets for different use cases. # Create a new option `--archive` that will embed all video and audio streams # and as much information as possible in the video as well as create a sidecar # file with full metadata. ---alias archive '--embed-thumbnail --video-multistreams --audio-multistreams --merge-output-format mkv' ---alias archivejson '--embed-thumbnail --write-info-json --no-clean-info-json --video-multistreams --audio-multistreams --merge-output-format mkv' +--alias archive '--write-info-json --no-clean-info-json' # Create a `--mp4` option that will optimize for getting an MP4 file, for # sharing on the Fedi etc. `-S ext` does the heavy lifting here. diff --git a/.gitconfig b/.gitconfig index 1bec0e0..6997bfb 100755 --- a/.gitconfig +++ b/.gitconfig @@ -27,3 +27,4 @@ excludesFile = ~/.config/gitignore-global [push] autoSetupRemote = true + default = current From dbdb58ced66e4f3f676ea79681d853164d1ddbcf Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Tue, 10 Dec 2024 09:10:14 +0100 Subject: [PATCH 74/74] Auto-commit kunsi-p14s.kunbox.net 2024-12-10T09:10:14+01:00 --- .../systemd/user/default.target.wants/grobi.service | 1 - .../bluetooth.lua.d/51-rename-sony-headphones.lua | 13 ------------- .../51-rename-laptop-headphones-microphone.lua | 13 ------------- .../51-rename-laptop-internal-microphone.lua | 13 ------------- .../main.lua.d/51-rename-laptop-output.lua | 13 ------------- .gitconfig | 2 ++ 6 files changed, 2 insertions(+), 53 deletions(-) delete mode 120000 .config/systemd/user/default.target.wants/grobi.service delete mode 100644 .config/wireplumber/bluetooth.lua.d/51-rename-sony-headphones.lua delete mode 100644 .config/wireplumber/main.lua.d/51-rename-laptop-headphones-microphone.lua delete mode 100644 .config/wireplumber/main.lua.d/51-rename-laptop-internal-microphone.lua delete mode 100644 .config/wireplumber/main.lua.d/51-rename-laptop-output.lua diff --git a/.config/systemd/user/default.target.wants/grobi.service b/.config/systemd/user/default.target.wants/grobi.service deleted file mode 120000 index 19647d3..0000000 --- a/.config/systemd/user/default.target.wants/grobi.service +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/user/grobi.service \ No newline at end of file diff --git a/.config/wireplumber/bluetooth.lua.d/51-rename-sony-headphones.lua b/.config/wireplumber/bluetooth.lua.d/51-rename-sony-headphones.lua deleted file mode 100644 index 883d6d3..0000000 --- a/.config/wireplumber/bluetooth.lua.d/51-rename-sony-headphones.lua +++ /dev/null @@ -1,13 +0,0 @@ -rule = { - matches = { - { - { "node.name", "equals", "bluez_output.38_18_4C_BF_65_26.1" }, - }, - }, - apply_properties = { - ["node.description"] = "WH-1000XM3 (Franzi)", - ["node.nick"] = "bluetooth-WH-1000XM3", - }, -} - -table.insert(bluez_monitor.rules, rule) diff --git a/.config/wireplumber/main.lua.d/51-rename-laptop-headphones-microphone.lua b/.config/wireplumber/main.lua.d/51-rename-laptop-headphones-microphone.lua deleted file mode 100644 index 280192e..0000000 --- a/.config/wireplumber/main.lua.d/51-rename-laptop-headphones-microphone.lua +++ /dev/null @@ -1,13 +0,0 @@ -rule = { - matches = { - { - { "node.name", "equals", "alsa_input.pci-0000_07_00.6.HiFi__hw_Generic_1__source" }, - }, - }, - apply_properties = { - ["node.description"] = "Laptop Headphones Microphone", - ["node.nick"] = "laptop-headphones-mic", - }, -} - -table.insert(alsa_monitor.rules, rule) diff --git a/.config/wireplumber/main.lua.d/51-rename-laptop-internal-microphone.lua b/.config/wireplumber/main.lua.d/51-rename-laptop-internal-microphone.lua deleted file mode 100644 index 92532cf..0000000 --- a/.config/wireplumber/main.lua.d/51-rename-laptop-internal-microphone.lua +++ /dev/null @@ -1,13 +0,0 @@ -rule = { - matches = { - { - { "node.name", "equals", "alsa_input.pci-0000_07_00.6.HiFi__hw_acp__source" }, - }, - }, - apply_properties = { - ["node.description"] = "Laptop internal Microphone", - ["node.nick"] = "laptop-internal-mic", - }, -} - -table.insert(alsa_monitor.rules, rule) diff --git a/.config/wireplumber/main.lua.d/51-rename-laptop-output.lua b/.config/wireplumber/main.lua.d/51-rename-laptop-output.lua deleted file mode 100644 index c7fda40..0000000 --- a/.config/wireplumber/main.lua.d/51-rename-laptop-output.lua +++ /dev/null @@ -1,13 +0,0 @@ -rule = { - matches = { - { - { "node.name", "equals", "alsa_output.pci-0000_07_00.6.HiFi__hw_Generic_1__sink" }, - }, - }, - apply_properties = { - ["node.description"] = "Laptop Speakers/Headphones", - ["node.nick"] = "laptop-internal-out", - }, -} - -table.insert(alsa_monitor.rules, rule) diff --git a/.gitconfig b/.gitconfig index 6997bfb..4a69370 100755 --- a/.gitconfig +++ b/.gitconfig @@ -23,8 +23,10 @@ [init] defaultBranch = main + [core] excludesFile = ~/.config/gitignore-global + [push] autoSetupRemote = true default = current