From c66025b32cec04648001c916df6bade8ee851b12 Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Fri, 7 Jun 2024 21:58:33 +0200 Subject: [PATCH] cleanup of assets --- flake.nix | 2 +- nixos/assets/contact@ingolf-wagner.de.gpg | Bin 11555 -> 0 bytes nixos/assets/jack.sh | 108 -------- nixos/assets/mrvandalo.gpg | 245 ++++++++++++++++++ .../{ssh/palo_rsa.pub => mrvandalo_rsa.pub} | 0 nixos/assets/music-making.sh | 48 ---- nixos/assets/pgp.key | 89 ------- nixos/assets/shrink_exports | 57 ---- nixos/assets/sprueche-axel | 3 - nixos/assets/sprueche-siw | 18 -- nixos/assets/ssh/borg_access.pub | 1 - nixos/assets/ssh/jenkins.pub | 1 - nixos/components/network/sshd/default.nix | 4 +- nixos/homes/palo/ssh.nix | 2 +- nixos/legacy/borg.nix | 2 - nixos/legacy/robi/borg.nix | 2 - nixos/legacy/robi/nginx.nix | 9 - nixos/machines/cream/borg.nix | 44 ---- nixos/machines/cream/configuration.nix | 2 - .../machines/orbi/nginx-ingolf-wagner-de.nix | 14 +- 20 files changed, 256 insertions(+), 395 deletions(-) delete mode 100644 nixos/assets/contact@ingolf-wagner.de.gpg delete mode 100755 nixos/assets/jack.sh create mode 100644 nixos/assets/mrvandalo.gpg rename nixos/assets/{ssh/palo_rsa.pub => mrvandalo_rsa.pub} (100%) delete mode 100644 nixos/assets/music-making.sh delete mode 100644 nixos/assets/pgp.key delete mode 100755 nixos/assets/shrink_exports delete mode 100644 nixos/assets/sprueche-axel delete mode 100644 nixos/assets/sprueche-siw delete mode 100644 nixos/assets/ssh/borg_access.pub delete mode 100644 nixos/assets/ssh/jenkins.pub delete mode 100644 nixos/machines/cream/borg.nix diff --git a/flake.nix b/flake.nix index 7a30ddd..696a6e8 100644 --- a/flake.nix +++ b/flake.nix @@ -210,7 +210,7 @@ ({ config, ... }: { users.users.root.openssh.authorizedKeys.keyFiles = [ # master key - ./nixos/assets/ssh/palo_rsa.pub + ./nixos/assets/mrvandalo_rsa.pub # backup key "${config.clanCore.clanDir}/machines/chungus/facts/ssh.syncoid.id_ed25519.pub" "${config.clanCore.clanDir}/machines/chungus/facts/ssh.rbackup.id_ed25519.pub" diff --git a/nixos/assets/contact@ingolf-wagner.de.gpg b/nixos/assets/contact@ingolf-wagner.de.gpg deleted file mode 100644 index c7f2e33724df45aeefeb9afce153421b0c4523f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11555 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 diff --git a/nixos/assets/jack.sh b/nixos/assets/jack.sh deleted file mode 100755 index 2f87842..0000000 --- a/nixos/assets/jack.sh +++ /dev/null @@ -1,108 +0,0 @@ -#!/usr/bin/env bash - -set -e - -defaultDevice=PCH - -start_jack() { - - internal_device_number=-1 - komplete_device_number=$(aplay -l | grep Vestax | cut -d":" -f1 | cut -d" " -f2) - babyface_device_number=$(aplay -l | grep Babyface | cut -d":" -f1 | cut -d" " -f2) - cmedia_device_number=$(aplay -l | grep C-Media | cut -d":" -f1 | cut -d" " -f2) - h2n_device_number=$(aplay -l | grep H2n | cut -d":" -f1 | cut -d" " -f2) - - # this should be more readable some day - if [[ $babyface_device_number == "" ]]; then - if [[ $komplete_device_number == "" ]]; then - if [[ $cmedia_device_number == "" ]]; then - if [[ $h2n_device_number == "" ]]; then - echo "use : default device" - device_number=$internal_device_number - else - echo "use : h2n" - device_number=$h2n_device_number - fi - else - echo "use : c-media" - device_number=$cmedia_device_number - fi - else - echo "use : komplete" - device_number=$komplete_device_number - fi - else - echo "use : babyface" - device_number=$babyface_device_number - fi - - # device parameter configuration - # ============================== - # - # to find configuration options do - # jack_control dp - if [[ $device_number -eq -1 ]]; then - # we use alsa in reality, but pulse opens up all the pulse - # sink and source stuff - # jack_control ds pulse # not working for some reason - jack_control ds alsa - jack_control dps device hw:$defaultDevice - else - jack_control ds alsa - jack_control dps device "hw:$device_number" # use usb card - fi - - jack_control dps duplex True # record and playback ports - jack_control dps hwmon False # no hardware monitoring - jack_control dps rate 48000 # use cd sample rate - - # nperiods are the splitup of the - # sound-ring-buffer. 2 are ok for internal cards - # but for usb you should use 3 because - # you can have to write in junks to the card - # so there is one backup slice in the middle - if [[ $internal_device_number -ne -1 ]]; then - jack_control dps nperiods 3 - fi - - # engine parameter configuration - # ============================== - # - # to find configuration options do - # jack_control ep - jack_control eps sync True - - # realtime kernel - # set True for using a realtime kernel - jack_control eps realtime False - # set priority if realtime kernel is set True - # jack_control eps realtime-priority 10 - - jack_control start -} - -stop_jack() { - jack_control exit -} - -status_jack() { - jack_control dp - jack_control ep - jack_control status -} - -case $1 in -start) - start_jack - ;; -stop) - stop_jack - ;; -restart) - stop_jack - start_jack - ;; -*) - status_jack - ;; -esac diff --git a/nixos/assets/mrvandalo.gpg b/nixos/assets/mrvandalo.gpg new file mode 100644 index 0000000..26f8d78 --- /dev/null +++ b/nixos/assets/mrvandalo.gpg @@ -0,0 +1,245 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +=VuMF +-----END PGP PUBLIC KEY BLOCK----- diff --git a/nixos/assets/ssh/palo_rsa.pub b/nixos/assets/mrvandalo_rsa.pub similarity index 100% rename from nixos/assets/ssh/palo_rsa.pub rename to nixos/assets/mrvandalo_rsa.pub diff --git a/nixos/assets/music-making.sh b/nixos/assets/music-making.sh deleted file mode 100644 index ecb9c8b..0000000 --- a/nixos/assets/music-making.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/usr/bin/env bash - -function stop_program() { - echo "stop $1" - sudo systemctl stop "$1" -} - -function start_program() { - echo "start $1" - sudo systemctl stop "$1" -} - -function start() { - echo "starting programs again" - echo "-----------------------" - echo - start_program backup.on-porani.insecure.timer - start_program backup.on-workhorse.insecure.timer - start_program backup.on-workout.insecure.timer - start_program syncthing.service - start_program tlp.service - start_program tor.service -} - -function stop() { - echo "stopping programs" - echo "-----------------" - echo - stop_program backup.on-porani.insecure.timer - stop_program backup.on-workhorse.insecure.timer - stop_program backup.on-workout.insecure.timer - stop_program syncthing.service - stop_program tlp.service - stop_program tor.service -} - -# ---- -# main -# ---- - -stop - -echo -echo -n "wait to start again -> " -read -r -echo - -start diff --git a/nixos/assets/pgp.key b/nixos/assets/pgp.key deleted file mode 100644 index dcbf931..0000000 --- a/nixos/assets/pgp.key +++ /dev/null @@ -1,89 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -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 -kdlSKp65Lw== -=DWZj ------END PGP PUBLIC KEY BLOCK----- diff --git a/nixos/assets/shrink_exports b/nixos/assets/shrink_exports deleted file mode 100755 index 1aab9c1..0000000 --- a/nixos/assets/shrink_exports +++ /dev/null @@ -1,57 +0,0 @@ -#!/usr/bin/env bash - -set -e - -PROJECTS_FOLDER=~/music-projects/Rendered-Projects -GARBADGE_FOLDER=/share - -# file separator (needed to handle files with spaces) -IFS=" -" - -function info_log(){ - echo -n ">>> [ " - echo -n $@ - echo " ]" -} - -function run_ffmpeg(){ - local input=$1 - local output=$2 - - info_log "ffmpeg : ${output}" - ffmpeg \ - -i "${input}" \ - -f mp3 \ - -codec:a libmp3lame \ - -qscale:a 5 \ - -ar 44100 \ - -loglevel error \ - -af loudnorm \ - "${output}" -} - -function delete(){ - local input=$1 - - if [[ -e "${input}" ]] - then - info_log "move : ${input} to ${GARBADGE_FOLDER}" - mv "${input}" "${GARBADGE_FOLDER}/$(basename ${input})" - #info_log "delete : ${input}" - #rm "${input}" - fi -} - -for file in `ls ${PROJECTS_FOLDER} | grep wav$` -do - filename=`basename ${file} .wav` - mp3="${filename}.mp3" - - info_log ${filename} - - delete "${PROJECTS_FOLDER}/${mp3}" - run_ffmpeg "${PROJECTS_FOLDER}/${file}" "${PROJECTS_FOLDER}/${mp3}" - delete "${PROJECTS_FOLDER}/${file}" - -done diff --git a/nixos/assets/sprueche-axel b/nixos/assets/sprueche-axel deleted file mode 100644 index 8774106..0000000 --- a/nixos/assets/sprueche-axel +++ /dev/null @@ -1,3 +0,0 @@ -"Fernsehen ist für mich der Elektro-Jude" - Dr Axel Stoll -"Der Zellkern ist gleich pures Licht" - Dr Axel Stoll -"Die Sonne ist Kalt!" - Dr Axel Stoll diff --git a/nixos/assets/sprueche-siw b/nixos/assets/sprueche-siw deleted file mode 100644 index f8c4e6f..0000000 --- a/nixos/assets/sprueche-siw +++ /dev/null @@ -1,18 +0,0 @@ -"Also Attracktiv oder net, ich seh hier immer noch am Besten aus" - Reiker -"Hör mal auf dich selber zu bemitleiden, sonst baft das aber echt jetzt! Dummer Lutscher" - Käpten Pika -"Komm Junge is besser du gibs dat jetzt zu, dann haste wenigsten noch ein paar Jahre wat von deinen Zähnen" - Käpten Pika -"Ich sauf doch net mit euch Pennern, echt Ey" - Käpten Pika -"Ja toll dann hab ich ja schon wieder verloren" - Deiter -"Komisch! Mein Vater heißt auch Vater, aber sieht ganz anders aus!" - Reiker -"Sag noch einmal Junge, Junge!" - Käpten Pika -"Häää? Worte, was sind Worte?" - Reiker -"Ich hau dir gleich die Zähne aus deiner fiesen Schnauze!" - Käpten Pika -"Ihr glaubt wohl ich kann keine schlauen Sachen sagen, wa? Schlaue Sachen!!" - Reiker -"Jetzt... also ich raff das jetzt echt net. Ist das so kompliziert?" - Reiker -"Dat is hier die Molekularsymplexion über trivial-komplexive Plasmakonvergenzen, wie? Wat?" - Jordi -"Äh, äh, Junge? Ey, Junge, echt jetz! Weißte?" - Käpten Pika -"Deine Dummheit unterscheidet meinen Datentransfer" - Computer -"Ähh, komisch mein Vadder sieht ganz anders aus, obwohl der auch Vadder heißt." - Reiker -"Aaaaaah, ich kann nimmer" - Reiker -"Also ich hab keine Gummipuppe. Nur Gummibärchen." - Reiker -"Richtig heisser, kochend heisser Kaffee" - Käpten Pika \ No newline at end of file diff --git a/nixos/assets/ssh/borg_access.pub b/nixos/assets/ssh/borg_access.pub deleted file mode 100644 index dec17a2..0000000 --- a/nixos/assets/ssh/borg_access.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC/WCoJ9zSL85R1mNJHUGRofyigeg2+g4+bwWVysHxWroPMIpP2hJrMRPoP13SAOaLOjl6X112jjoQ2wpJ/qptjtojrsF8bpFgoMqCQFsQDD4zuG4V/AaIt0nAF4B5tDBGFN3Hj6vpbwVAidv+8Kr41r5JOG/8Z/UiJDGrIMab3kDwyOklrMPLWr7IBYC0O8Jwyz3lAl18ukMSEZvoPaJhPJyyqRhSagX59U7AQiNrnq18kzi7Pszy3e1d7x3vWSXemJGZaUJ+cFbl1LrvFHwUa55sSUVUVBRxgABc906YoiUcr31aw98zUX4W+2+AqDzIIquV5frIc/+nnfsmDrsnMl81cLglxuRxqib0AuSYqkNQimWrR61M7TaLvGZomMk8Vheew/QlxvHvhbHwnu7/tgNll2i+Zi1T7VZ5Hcy4quYDZQA7NDrvu0dEm+dTlOfuJJZdMLWws20ao8xtv8IxxCN31CBCbCSETpsSuvT7joHKGpJoOf3eilLLqOKjrbo5E6s6S1w1WRoZ6LuXQo2l5uvMVSzUZ+4CG+FX+Q73bpQ5SWUvz2o5HovX8RbcneuG7mfZMe80F5IyaqSmi0r+kFOqK4NKz/InHhSJjrFYJWl2PP+30MfsHx5NMOVhfKdRZje5oTds6L2o9+3vhiE7CmgZVR+RqMHMUtRrERODwPQ== diff --git a/nixos/assets/ssh/jenkins.pub b/nixos/assets/ssh/jenkins.pub deleted file mode 100644 index c18bcdf..0000000 --- a/nixos/assets/ssh/jenkins.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDIZ8ezpjX1nI/Im+krulJNaVd1DZeFvcgX3x197DIbBgCsBjAW8WuV2tzmcrWSjWJ6lfmLlzplOLzhTNG763sbNQ5amfhglYTmQhruGcSXNkdsjOyoxK8SX3wH6Kv/Q0CpoyAYOB9fiJnUyWB9BXSI8VYMMRFj6+cPiZc6NhnnlxU+6uH3VvzV5hsAaT4mpXJJEidMqE9DpGFguOekOUO7HCVcZeQQjazl1u+NhbqRI3CsJjXBqiqAFSMzKOXhTk36xd2WLEmCaPnWuWf7imvR+T3JVPFTNGec3wMbT5nnMiK0/hbowyDQCbtnUVWja9ftVsOH55tLRSY16GnXngUzw+trxWOvX0wOFOhfSZ2k1WtjTlNtOEhne/V0a3bocel/7JuXBX3RvWAEVl1sWS5R9MG8aDB8S2fx8qZirbg0NZticAxcHtg0RyJRzH6DYrkINE6cUgK7qsrUtaY1W6Qj6Jp33Li8KHY2JElDvJLhAx8v7l6BaZkog/Z0raR8RSRefiDQZJ8qiqPXUJG1pQm4Mp8IGL5PAmi0AZg6QL2pkXC0pyg1xE4TdRjOeuV/vdVDX15xCsgOJjK7PGNoNm2JpYA8vaWMHG8Ujk4UBHolooKeuL3g0CcgzfyRMp/Dxlk1BhgRQ17VxWBDuKt3bWuTJIvmrvDuPB3vd+WYNNqskQ== diff --git a/nixos/components/network/sshd/default.nix b/nixos/components/network/sshd/default.nix index b92a6d2..a4f9737 100644 --- a/nixos/components/network/sshd/default.nix +++ b/nixos/components/network/sshd/default.nix @@ -1,8 +1,8 @@ -{ pkgs, config, lib, ... }: +{ pkgs, config, lib, assets, ... }: with lib; with types; let - defaultRootKeyFiles = [ (toString ../../../assets/ssh/palo_rsa.pub) ]; + defaultRootKeyFiles = [ "${assets}/mrvandalo_rsa.pub" ]; cfg = config.components.network.sshd; # maybe ascii-image-converter is also nice here diff --git a/nixos/homes/palo/ssh.nix b/nixos/homes/palo/ssh.nix index 1294ccb..9a939f7 100644 --- a/nixos/homes/palo/ssh.nix +++ b/nixos/homes/palo/ssh.nix @@ -5,7 +5,7 @@ programs.ssh.enable = true; programs.ssh.matchBlocks = { "*" = { - identityFile = "~/.ssh/palo_rsa.pub"; + identityFile = "~/.ssh/mrvandalo_rsa.pub"; identitiesOnly = true; }; "lassul.us" = { diff --git a/nixos/legacy/borg.nix b/nixos/legacy/borg.nix index 324f6ca..dc8d19e 100644 --- a/nixos/legacy/borg.nix +++ b/nixos/legacy/borg.nix @@ -8,8 +8,6 @@ quota = "300G"; allowSubRepos = true; authorizedKeys = [ - (lib.fileContents ../../assets/ssh/borg_access.pub) - (lib.fileContents ../../assets/ssh/palo_rsa.pub) ]; }; }; diff --git a/nixos/legacy/robi/borg.nix b/nixos/legacy/robi/borg.nix index 324f6ca..dc8d19e 100644 --- a/nixos/legacy/robi/borg.nix +++ b/nixos/legacy/robi/borg.nix @@ -8,8 +8,6 @@ quota = "300G"; allowSubRepos = true; authorizedKeys = [ - (lib.fileContents ../../assets/ssh/borg_access.pub) - (lib.fileContents ../../assets/ssh/palo_rsa.pub) ]; }; }; diff --git a/nixos/legacy/robi/nginx.nix b/nixos/legacy/robi/nginx.nix index 328717f..346e618 100644 --- a/nixos/legacy/robi/nginx.nix +++ b/nixos/legacy/robi/nginx.nix @@ -99,15 +99,6 @@ in image-height = "200px"; }; }; - "= /palo.pgp" = { - root = pkgs.writeText "key" (lib.fileContents ../../assets/pgp.key); - }; - "= /palo.gpg" = { - root = pkgs.writeText "key" (lib.fileContents ../../assets/pgp.key); - }; - "= /palo_rsa.pub" = { - root = pkgs.writeText "key" (lib.fileContents ../../assets/ssh/palo_rsa.pub); - }; }; }; diff --git a/nixos/machines/cream/borg.nix b/nixos/machines/cream/borg.nix deleted file mode 100644 index 1327bd8..0000000 --- a/nixos/machines/cream/borg.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib, config, pkgs, ... }: { - - # backup repository - services.borgbackup.repos = { - default = { - quota = "100G"; - allowSubRepos = true; - authorizedKeys = [ - # todo rename - (lib.fileContents ../../assets/ssh/borg_access.pub) - (lib.fileContents ../../assets/ssh/palo_rsa.pub) - ]; - }; - removable = { - quota = "250G"; - allowSubRepos = true; - user = "removable"; - path = "/removable/borg"; - authorizedKeys = [ - # todo rename - (lib.fileContents ../../assets/ssh/borg_access.pub) - (lib.fileContents ../../assets/ssh/palo_rsa.pub) - ]; - }; - }; - - backup.enable = true; - backup.dirs = [ - "/home/palo/jobrad" - "/home/palo/.timewarrior" - "/home/palo/.ssh" - ]; - - backup.servers = { - robi.host = "144.76.13.147"; - pepe.host = "pepe.private"; - cream.host = "cream.private"; - cream-removable = { - user = "removable"; - host = "cream.private"; - }; - }; - -} diff --git a/nixos/machines/cream/configuration.nix b/nixos/machines/cream/configuration.nix index 6f21617..f2fb046 100644 --- a/nixos/machines/cream/configuration.nix +++ b/nixos/machines/cream/configuration.nix @@ -15,8 +15,6 @@ ./network-tinc_retiolum.nix ./network-wireguard.nix - #./borg.nix - ]; system.stateVersion = "22.11"; diff --git a/nixos/machines/orbi/nginx-ingolf-wagner-de.nix b/nixos/machines/orbi/nginx-ingolf-wagner-de.nix index 414ff7d..6f11473 100644 --- a/nixos/machines/orbi/nginx-ingolf-wagner-de.nix +++ b/nixos/machines/orbi/nginx-ingolf-wagner-de.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, private_assets, ... }: +{ config, lib, pkgs, private_assets, assets, ... }: let # todo create flake for this errorPages = pkgs.fetchFromGitHub { @@ -96,14 +96,14 @@ in image-height = "200px"; }; }; - "= /palo.pgp" = { - root = pkgs.writeText "key" (lib.fileContents ../../assets/pgp.key); + "= /mrvandalo.pgp" = { + root = pkgs.writeText "key" (lib.fileContents "${assets}/mrvandalo.gpg"); }; - "= /palo.gpg" = { - root = pkgs.writeText "key" (lib.fileContents ../../assets/pgp.key); + "= /mrvandalo.gpg" = { + root = pkgs.writeText "key" (lib.fileContents "${assets}/mrvandalo.gpg"); }; - "= /palo_rsa.pub" = { - root = pkgs.writeText "key" (lib.fileContents ../../assets/ssh/palo_rsa.pub); + "= /mrvandalo_rsa.pub" = { + root = pkgs.writeText "key" (lib.fileContents "${assets}/mrvandalo_rsa.pub"); }; }; };