Moving all flatpaks to nix-flatpak

generic/user/packages.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }:
+{ pkgs, lib, config, ... }:
 
 let
   tex = (pkgs.texlive.combine { inherit (pkgs.texlive)
@@ -15,32 +15,81 @@ let
     });
 in {
   users.users.lyes.packages = with pkgs; [
-    # Software
+    # Web
     firefox
+    fragments
+    dropbox
+    varia
+    filezilla
+    whatip
+
+    # Messaging
     thunderbird
     discord
     vesktop
+    whatsapp-for-linux
+    element-desktop
+    fractal
+    zoom-us
+
+    # Image
+    drawing
+    gimp
+    loupe
+    snapshot
+
+    # Video
     mpv
     vlc
     syncplay
-    gnome.gnome-tweaks
+    obs-studio
-    gnome-extension-manager
+    yt-dlp
-    protonmail-bridge-gui
+    handbrake
+    kooha
+    video-trimmer
 
-    # Games
+    # Audio
-    # citra-canary
+    shorwave
-    minecraft
+    gnome-podcasts
-    vvvvvv
+    helvum
+
+    # Reading
+    calibre
 
     # Utilities
+    impression
+    resources
+    gnome.file-roller
+    baobab
+
+    # Proton
+    protonmail-bridge-gui
+    protonvpn-gui
+
+    # Customization
+    gnome.gnome-tweaks
+    gnome-extension-manager
+
+    # Games
+    heroic
+    # citra-canary
+    cemu
+    minecraft
+    vvvvvv
+    ryujinx
+
+    # Nix
     home-manager
     nix-index
     direnv
+
+    # Commandline
     starship
-    dropbox
-    yt-dlp
     wl-clipboard
 
+    # System
+    gnome-firmware
+
     # Customization
     adw-gtk3
     paper-icon-theme
@@ -59,7 +108,16 @@ in {
     toolbox
     distrobox
 
+    # Office
+    libreoffice
+    onlyoffice-bin
+    hunspell
+    hunspellDicts.fr_FR
+    hunspellDicts.en_US
+    hunspellDicts.en_GB
+
     # Note taking
+    apostrophe
     setzer
     tex
     pandoc
@@ -71,17 +129,57 @@ in {
   ];
 
   # Flatpaks
-  services.flatpak.remotes = lib.mkOptionDefault [{
+  services.flatpak = lib.mkIf (config?services.flatpak.packages) {
-    name = "gnome-nightly";
+    remotes = lib.mkOptionDefault [{
-    location = "https://nightly.gnome.org/gnome-nightly.flatpakrepo";
+      name = "gnome-nightly";
-  }];
+      location = "https://nightly.gnome.org/gnome-nightly.flatpakrepo";
+    }];
 
-  services.flatpak.packages = [
+    packages = [
-    "com.github.muriloventuroso.pdftricks"
+      # Web
-    "app.drey.Damask"
+      "org.gnome.Epiphany"
-    "dev.tchx84.Gameeky"
+
-    "dev.tchx84.Gameeky.ThematicPack.FreedomValley"
+      # Video
-    "dev.tchx84.Gameeky.ThematicPack.Blasterman"
+      "org.nickvision.tubeconverter"
-    "dev.tchx84.Gameeky.ThematicPack.Wackman"
+
-  ];
+      # Reading
+      "com.github.johnfactotum.Foliate"
+   
+      # Science
+      "com.github.alexhuntley.Plots"
+
+      # Office
+      "com.belmoussaoui.Obfuscate"
+      "com.github.muriloventuroso.pdftricks"
+      "com.github.flxzt.rnote"
+      "com.github.jeromerobert.pdfarranger"
+
+      # Utilities
+      "com.belmoussaoui.Decoder"
+      "io.github.nokse22.minitext"
+      "org.gnome.World.PikaBackup"
+
+      # Customization
+      "ca.desrt.dconf-editor"
+      "app.drey.Damask"
+      "com.github.GradienceTeam.Gradience"
+      "com.github.tchx84.Flatseal"
+
+      # Games
+      "com.usebottles.bottles"
+      "dev.tchx84.Gameeky"
+      "dev.tchx84.Gameeky.ThematicPack.FreedomValley"
+      "dev.tchx84.Gameeky.ThematicPack.Blasterman"
+      "dev.tchx84.Gameeky.ThematicPack.Wackman"
+      { appId = "org.DolphinEmu.dolphin-emu"; commit = "187e367202f4ec0a50b94d700aa50c04142d13561e3054fcf1030380d3ae86a6"; }
+      "org.prismlauncher.PrismLauncher"
+
+      # Programming
+      "org.gnome.Builder.Devel"
+    ];
+
+    uninstallUnmanaged = true;
+    update.onActivation = true;
+    update.auto.enable = true;
+  };
 }