From a4ed475237d0d90fc6e9db23a533b509671d4ac3 Mon Sep 17 00:00:00 2001
From: Dominik Polakovics <dominik.polakovics@cloonar.com>
Date: Fri, 10 Oct 2025 12:23:51 +0200
Subject: [PATCH 1/2] feat: nb add flatpak iptv package

---
 hosts/nb/modules/desktop/default.nix          | 10 +------
 hosts/nb/modules/desktop/flatpak-packages.nix | 30 +++++++++++++++++++
 2 files changed, 31 insertions(+), 9 deletions(-)
 create mode 100644 hosts/nb/modules/desktop/flatpak-packages.nix

diff --git a/hosts/nb/modules/desktop/default.nix b/hosts/nb/modules/desktop/default.nix
index 9403117..31b0938 100644
--- a/hosts/nb/modules/desktop/default.nix
+++ b/hosts/nb/modules/desktop/default.nix
@@ -9,6 +9,7 @@ in {
     ./bitwarden.nix
     ./rustdesk.nix
     ./rustdesk-epicenter.nix
+    ./flatpak-packages.nix
   ];
 
   environment.systemPackages = with pkgs; [
@@ -153,14 +154,5 @@ in {
     };
   };
 
-  services.flatpak.enable = true;
-  systemd.services.flatpak-repo = {
-    wantedBy = [ "multi-user.target" ];
-    path = [ pkgs.flatpak ];
-    script = ''
-      flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-    '';
-  };
-
   environment.variables.TERMINAL_COMMAND = "alacritty";
 }
diff --git a/hosts/nb/modules/desktop/flatpak-packages.nix b/hosts/nb/modules/desktop/flatpak-packages.nix
new file mode 100644
index 0000000..4e50cf3
--- /dev/null
+++ b/hosts/nb/modules/desktop/flatpak-packages.nix
@@ -0,0 +1,30 @@
+{ pkgs, ... }: {
+  services.flatpak.enable = true;
+  systemd.services.flatpak-repo = {
+    wantedBy = [ "multi-user.target" ];
+    path = [ pkgs.flatpak ];
+    script = ''
+      ${pkgs.flatpak}/bin/flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+    '';
+  };
+
+  systemd.services.flatpak-install-packages = {
+    wants = [ "flatpak-repo.service" ];
+    wantedBy = [ "multi-user.target" ];
+    path = [ pkgs.flatpak ];
+    script = ''
+      ${pkgs.flatpak}/bin/flatpak install -y https://dl.flathub.org/repo/appstream/io.github.yuki_iptv.yuki-iptv.flatpakref
+    '';
+  };
+
+  environment.systemPackages = [
+    (pkgs.makeDesktopItem {
+      name = "yuki-iptv";
+      desktopName = "Yuki IPTV";
+      genericName  = "IPTV Player";
+      exec         = "${pkgs.flatpak}/bin/flatpak run io.github.yuki_iptv.yuki-iptv";
+      terminal     = false;
+      categories   = [ "Multimedia" ];
+    })
+  ];
+}

From 506c4f9357c6e7926d347ed2af1d440ba8224362 Mon Sep 17 00:00:00 2001
From: Dominik Polakovics <dominik.polakovics@cloonar.com>
Date: Fri, 10 Oct 2025 13:18:31 +0200
Subject: [PATCH 2/2] fix: nb flatpak installation

---
 hosts/nb/modules/desktop/flatpak-packages.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/hosts/nb/modules/desktop/flatpak-packages.nix b/hosts/nb/modules/desktop/flatpak-packages.nix
index 4e50cf3..8b657ea 100644
--- a/hosts/nb/modules/desktop/flatpak-packages.nix
+++ b/hosts/nb/modules/desktop/flatpak-packages.nix
@@ -4,7 +4,7 @@
     wantedBy = [ "multi-user.target" ];
     path = [ pkgs.flatpak ];
     script = ''
-      ${pkgs.flatpak}/bin/flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+      flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
     '';
   };
 
@@ -13,7 +13,7 @@
     wantedBy = [ "multi-user.target" ];
     path = [ pkgs.flatpak ];
     script = ''
-      ${pkgs.flatpak}/bin/flatpak install -y https://dl.flathub.org/repo/appstream/io.github.yuki_iptv.yuki-iptv.flatpakref
+      flatpak install -y https://dl.flathub.org/repo/appstream/io.github.yuki_iptv.yuki-iptv.flatpakref
     '';
   };
 
@@ -24,7 +24,6 @@
       genericName  = "IPTV Player";
       exec         = "${pkgs.flatpak}/bin/flatpak run io.github.yuki_iptv.yuki-iptv";
       terminal     = false;
-      categories   = [ "Multimedia" ];
     })
   ];
 }