diff --git a/utils/debian.sh b/utils/debian.sh index cc81e3e..ecfe53e 100755 --- a/utils/debian.sh +++ b/utils/debian.sh @@ -4,54 +4,16 @@ set -e USERNAME="fernando" DOTFILES_URL="https://git.schauenburg.me/fernando/dotfiles.git" -CUSTOM_APT_KEY_FILE="/etc/apt/keyrings/gitea-fernando.asc" -CUSTOM_APT_URL="https://git.schauenburg.me/api/packages/fernando/debian" -CUSTOM_APT_KEY="-----BEGIN PGP PUBLIC KEY BLOCK----- - -xsBNBGX4KGoBCADiysyeZjwKmgHQakDpeutLq6glS1dvijb3Bdf9RGfOHwoQUPix -uPHv3b0mxfHHa9yRfySCSHNSZmCvMDztMpDKjfUKzNwj0ufd+b8vqZ9IIhD323/2 -cCGpL76ARhGHaQrcfCyjU1bFnNmTRykjXvEPWiNLu9REYd18rPcwGOrITJYfevpj -NWdb+scpcMBIoob9NxkvN8V7tRvTsKnHfu6BqU22NobN2kRnqoqQ+IwDhchgrD8s -XDZCOiiL/cd3GAHyNsJ1Xu6M87Q/2YT1OHU26I2nWQuoxAHpO/wswD5lOhphUMUc -vMvzJNmwmGcHkhZdFZ/YdU0p/BNRQh+65bCNABEBAAHNEShEZWJpYW4gUmVnaXN0 -cnkpwsBiBBMBCAAWBQJl+ChqCRANOnSUcFcewAIbAwIZAQAA3MUIAIF5jt1LUjQz -Cs1ucVEYOTsXVkbHQUyzDX7ZxWYa3052Xd/ipEa4fuedIB2Fu8jlUdEcoWx76CDl -08Xr0Jhi+9GYEjOnjtD1/waNt4KdqyQGxbZ9MtFicAweIAyghmrYHnoB+pWZ5G12 -0CwQs1P+6yija4apeVFTx/RB/ByGXVx7IjQ7Fz5tAIc4EdRqK8VPGq8BYrCT9cct -mUFtMD9HaXvtcM9gAn6MVgyqLjql0VDg37knZGFZNWKfvNGHXyx6PsbcQtAIXE8N -ujiigmvEGY7tUqOYDB0Fn1nkL9loZfgWzzgluKoCZiRbdMk8DLVbvuoaCyDD1qXt -sw0tK5HujBLOwE0EZfgoagEIAL0tSBJlAuOF6VvkkHSI6tS9VZIE6TjnrYcnBv0q -hn0N6dA4wmwaioObVYqOdW4iIx/kuoS5kR+XwWTJ/wFf+RGMA1Rq13/HZKj1KgcG -TTGLn6tGAYU3NQ8sSSqV84IcKjvhvogIfUR9vZwmXE7FZTPLWfyVVAypFARoFLit -apVKj8wP+LdfC7UY9xsTXtDrD12iuPCNjeIZf7JIgGqQbi/PZV8kTL48/c94CK0d -vP/EXpEsTcChusy/7esh+71C44IECOw+BhJdWTF6SS3pGqUvwyExidh1XzHJOo6o -5xQRqLQin62wishsoM24BwA4LQtge36g6dTtsZ3FjrZLviEAEQEAAcLAXwQYAQgA -EwUCZfgoagkQDTp0lHBXHsACGwwAAIQ/CADFFk3+HLvN7fM1ylUfS6wa0OQfPtVf -9xF3FHoKu1ZTFVGDh53VuHqAEk0c7tBVrpfHHWWgb/bLZPfcIz96OKRtqmD2eIKl -JfHtHJLfv4Of9xa1YvBujgtCwc2h21DbMlNDQkrRZD44H1yIQOl+JR2XwjJyZ70/ -l2gZy6iLTHT866UlPgYpCkxYSuf2ZH1BQ9E7BUIu4Jv2jeQzOzOiMekJ8HBdAypH -aN1GalvZk/HY3MUqPHklGF03OAn5YT2mimB6tgMpSoxwaaaIfXmUE4seqhA1wmpc -GwM1x9G/T3ZMkaV4wgEZ80RoEFRMtq2l2su/yzrYoeBkNI1h6oU9lkvd -=aOC5 ------END PGP PUBLIC KEY BLOCK----- -" - if [ -t 1 ]; then sgr0="$(printf '\033[0m')" red="$(printf '\033[31m')" - # green="$(printf '\033[32m')" yellow="$(printf '\033[33m')" blue="$(printf '\033[34m')" - # magenta="$(printf '\033[35m')" - # cyan="$(printf '\033[36m')" else sgr0='' red='' - # green='' yellow='' blue='' - # magenta='' - # cyan='' fi usage() { @@ -73,42 +35,27 @@ skipped() { echo "${yellow}SKIPPED:${sgr0} ${1}" } -apt_custom_source() { - title "Set up custom APT source" - - echo "${CUSTOM_APT_KEY}" >"${CUSTOM_APT_KEY_FILE}" - sed \ - -i.original \ - -e "1i deb [signed-by=${CUSTOM_APT_KEY_FILE}] ${CUSTOM_APT_URL} stable main\n\n" \ - /etc/apt/sources.list -} - apt_install() { title "Install APT packages" apt update && apt install -y \ apt-file \ ascii \ - broot \ build-essential \ ca-certificates \ cmake \ cmake-doc \ curl \ exuberant-ctags \ - eza \ - fd-find \ g++ \ gcc \ git \ git-crypt \ - git-delta \ gnupg \ htop \ jq \ make \ man-db \ - neovim \ nodejs \ pkg-config \ psmisc \ @@ -126,16 +73,6 @@ apt_install() { apt-file update } -stow_custom_packages() { - title "Stow custom packages under /usr/local/stow" - ( - cd /usr/local/stow - for package in ./*; do - stow -v "${package##*/}" - done - ) -} - grub_disable_timeout() { title "Disable GRUB timeout" @@ -221,9 +158,7 @@ deploy_dotfiles() { } execute() { - apt_custom_source apt_install - stow_custom_packages grub_disable_timeout ensure_usr_bin_fd ensure_usr_local_man_manN