From 2a8bb767ed0afdb631b7bf30afb235c1120116c6 Mon Sep 17 00:00:00 2001
From: Siraaj Khandkar <siraaj@khandkar.net>
Date: Wed, 13 Oct 2021 15:50:15 -0400
Subject: [PATCH] Replace flatpak-installed pkgs with those from xbps-src

---
 Makefile           | 3 ++-
 home/bin/discord   | 3 ---
 home/bin/spotify   | 3 ---
 pkgs-void-src.list | 3 +++
 pkgs-void.list     | 1 -
 5 files changed, 5 insertions(+), 8 deletions(-)
 delete mode 100755 home/bin/discord
 delete mode 100755 home/bin/spotify
 create mode 100644 pkgs-void-src.list

diff --git a/Makefile b/Makefile
index a56f6e7..7f3ef91 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
 MAKEFLAGS := --no-builtin-rules
+SHELL     := /bin/bash
 
 DEPS := $(wildcard deps/*)
 
@@ -69,7 +70,7 @@ pkgs_void:
 	sudo xbps-install $(shell ./list pkgs-void.list)
 
 pkgs_void_update:
-	xbps-query -m | awk -F - '{sub("-" $$NF "$$", ""); print}' | sort -u > pkgs-void.list
+	xbps-query -m | awk -F - '{sub("-" $$NF "$$", ""); print}' | sort -u | grep -vf <(./list -v sep='\n' -v end='\n' pkgs-void-src.list) > pkgs-void.list
 	(echo '#'; ./patch-comments pkgs-void.list.comments pkgs-void.list) | sponge pkgs-void.list
 
 #
diff --git a/home/bin/discord b/home/bin/discord
deleted file mode 100755
index 81b65bc..0000000
--- a/home/bin/discord
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh
-
-exec flatpak run --filesystem=~/arc/img/Screenshots --filesystem=~/dl com.discordapp.Discord
diff --git a/home/bin/spotify b/home/bin/spotify
deleted file mode 100755
index 7ea2034..0000000
--- a/home/bin/spotify
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh
-
-exec flatpak run com.spotify.Client
diff --git a/pkgs-void-src.list b/pkgs-void-src.list
new file mode 100644
index 0000000..74047fc
--- /dev/null
+++ b/pkgs-void-src.list
@@ -0,0 +1,3 @@
+discord
+spotify
+zoom
diff --git a/pkgs-void.list b/pkgs-void.list
index 5100d12..63d7a5e 100644
--- a/pkgs-void.list
+++ b/pkgs-void.list
@@ -57,7 +57,6 @@ extra-cmake-modules
 feh
 figlet
 firefox
-flatpak
 flex
 font-iosevka
 font-misc-misc
-- 
2.20.1