From e7dfeef11e2f3287f10e5861290b4d5e07e27402 Mon Sep 17 00:00:00 2001
From: joachimschmidt557 <joachim.schmidt557@outlook.com>
Date: Sun, 13 Oct 2024 14:58:31 +0200
Subject: [PATCH] dustbowl: move some apps to flatpak

---
 fish/nix.fish      | 6 ++++++
 nixos/dustbowl.nix | 6 ++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/fish/nix.fish b/fish/nix.fish
index c8298dd..cfe6f68 100644
--- a/fish/nix.fish
+++ b/fish/nix.fish
@@ -27,6 +27,12 @@ if test -e /dev/tpmrm0
     set -gx TPM2_PKCS11_TCTI device:/dev/tpmrm0
 end
 
+# abbrs for flatpak apps
+abbr --add --position anywhere libreoffice flatpak run org.libreoffice.LibreOffice
+abbr --add --position anywhere xournalpp flatpak run com.github.xournalpp.xournalpp
+abbr --add --position anywhere plattenalbum flatpak run de.wagnermartin.Plattenalbum
+abbr --add --position anywhere pavucontrol flatpak run org.pulseaudio.pavucontrol
+
 function launch
     true && $argv & && disown && exit
 end
diff --git a/nixos/dustbowl.nix b/nixos/dustbowl.nix
index bd56ea4..7c08a50 100644
--- a/nixos/dustbowl.nix
+++ b/nixos/dustbowl.nix
@@ -238,9 +238,6 @@
     mpv
     zathura
     imv
-    pavucontrol
-    xournalpp
-    libreoffice
     okular
     ungoogled-chromium
     openrgb
@@ -249,7 +246,6 @@
     zotero-beta
     wpa_supplicant_gui
     keepassxc
-    plattenalbum
     spotify
     gnucash
     welle-io
@@ -270,6 +266,8 @@
     (callPackage ./posy-cursor-black.nix { })
   ];
 
+  services.flatpak.enable = true;
+
   services.gnome.gnome-keyring.enable = true;
 
   # Use doas instead of sudo