From e7371b3e83d30b1da1789bf701de0a5241748bca Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sun, 22 Jan 2023 15:58:23 +0100 Subject: [PATCH] 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