From eb9b6b5ab30010551f715fb743aa8a5987d8dbb2 Mon Sep 17 00:00:00 2001
From: Pratik Tripathy <mail@pratik.live>
Date: Mon, 25 Aug 2025 18:46:42 +0530
Subject: [PATCH] feat(install-script): apt: use extrepo

- Instead of manually adding gpg files or using `add-apt-repository` for
  common applications use `extrepo`
- package-list-os: Add: foliate, ghostscript, imagemagick, kitty, xsel
- package-list-os: Remove: smplayer
- test-script: use `podman` instead of `docker`
- Dockerfile: Remove older OSes
---
 scripts/install-os-packages.sh | 11 ++---------
 scripts/package-list-os        | 13 ++++++++-----
 scripts/test/Dockerfile        |  8 +++-----
 scripts/test/run-test.sh       |  6 +++---
 4 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/scripts/install-os-packages.sh b/scripts/install-os-packages.sh
index 8530fd4..2c9b918 100755
--- a/scripts/install-os-packages.sh
+++ b/scripts/install-os-packages.sh
@@ -101,12 +101,8 @@ apt_setup() {
 
     sudo apt-get update && sudo apt-get upgrade -y
 
-    # Add VS-Code repo
-    sudo apt-get install -y wget gpg
-    wget -qO- https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor >packages.microsoft.gpg
-    sudo install -D -o root -g root -m 644 packages.microsoft.gpg /etc/apt/keyrings/packages.microsoft.gpg
-    echo "deb [arch=amd64,arm64,armhf signed-by=/etc/apt/keyrings/packages.microsoft.gpg] https://packages.microsoft.com/repos/code stable main" | sudo tee /etc/apt/sources.list.d/vscode.list >/dev/null
-    rm -f packages.microsoft.gpg
+    sudo apt-get install -y wget gpg extrepo
+    sudo extrepo enable dotnet docker-ce github-cli mattermost nvidia-cuda postgresql syncthing vscode winehq deb-multimedia-backports deb-multimedia-non-free
 
     if [ "$ID" = "debian" ]; then
         debian_setup
@@ -129,9 +125,6 @@ debian_setup() {
 ubuntu_setup() {
     # Add Ulauncher repo
     sudo add-apt-repository universe -y && sudo add-apt-repository ppa:agornostal/ulauncher -y
-
-    # Add dotnet ppa
-    sudo add-apt-repository ppa:dotnet/backports
 }
 
 input_file_check() {
diff --git a/scripts/package-list-os b/scripts/package-list-os
index d2fcae9..acdc281 100644
--- a/scripts/package-list-os
+++ b/scripts/package-list-os
@@ -7,9 +7,6 @@ clang
 cmake
 code
 codespell
-fd-find
-fzf
-git
 gitleaks
 hadolint
 html
@@ -68,16 +65,22 @@ fd-find
 ffmpeg
 flameshot
 flatpak
+foliate
 fzf
 gcc
 gdb
+ghostscript
+git
 gnupg
 gparted
 grub-customizer
+gzip
 htop
+ImageMagick
+imagemagick
 inxi
-kitty
 kde-spectacle
+kitty
 kitty-terminfo
 libreoffice
 nala
@@ -90,7 +93,6 @@ qbittorrent
 rclone
 ripgrep
 simplescreenrecorder
-smplayer
 solaar
 syncthing
 ufw
@@ -100,6 +102,7 @@ vlc
 vulkan-tools
 wget
 xclip
+xsel
 yt-dlp
 zsh
 
diff --git a/scripts/test/Dockerfile b/scripts/test/Dockerfile
index 74636d1..c6c7d3d 100644
--- a/scripts/test/Dockerfile
+++ b/scripts/test/Dockerfile
@@ -1,10 +1,8 @@
-#FROM kdeneon/plasma
-FROM debian:11-slim
 #FROM debian:12-slim
-#FROM ubuntu:20.04
-#FROM ubuntu:22.04
+#FROM debian:13-slim
 #FROM ubuntu:23.04
-#FROM fedora:40
+FROM ubuntu:24.04
+#FROM fedora:42
 WORKDIR /dotfiles
 RUN apt-get update && apt-get install sudo -y     # for debian distros
 #RUN dnf install sudo -y                           # for fedora and its derivatives
diff --git a/scripts/test/run-test.sh b/scripts/test/run-test.sh
index 788c904..fea2d2c 100755
--- a/scripts/test/run-test.sh
+++ b/scripts/test/run-test.sh
@@ -3,9 +3,9 @@
 # Prune, build and run docker
 main() {
     cd ../.. # change docker context to dotfile repo
-    docker container prune -f && echo "Removed old Docker containers"
-    docker build -t dotfile-setup:latest -f scripts/test/Dockerfile . && echo "Docker build success"
-    docker run -it dotfile-setup:latest
+    podman container prune -f && echo "Removed old Docker containers"
+    podman build -t dotfile-setup:latest -f scripts/test/Dockerfile . && echo "Docker build success"
+    podman run -it dotfile-setup:latest
 }
 
 main "$@"