diff --git a/hosts/nb/modules/desktop/default.nix b/hosts/nb/modules/desktop/default.nix index 31b0938..9403117 100644 --- a/hosts/nb/modules/desktop/default.nix +++ b/hosts/nb/modules/desktop/default.nix @@ -9,7 +9,6 @@ in { ./bitwarden.nix ./rustdesk.nix ./rustdesk-epicenter.nix - ./flatpak-packages.nix ]; environment.systemPackages = with pkgs; [ @@ -154,5 +153,14 @@ 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 deleted file mode 100644 index 8b657ea..0000000 --- a/hosts/nb/modules/desktop/flatpak-packages.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ pkgs, ... }: { - 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 - ''; - }; - - systemd.services.flatpak-install-packages = { - wants = [ "flatpak-repo.service" ]; - wantedBy = [ "multi-user.target" ]; - path = [ pkgs.flatpak ]; - script = '' - 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; - }) - ]; -}