feat: move from flatpak to nix-software-center

Author: batonac

flake.nix

@@ -3,35 +3,20 @@
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    nix-flatpak.url = "github:gmodena/nix-flatpak";
     nix-software-center = {
       url = "github:batonac/nix-software-center";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
 
-  outputs = { self, nixpkgs, nix-flatpak, nix-software-center, ... }:
+  outputs = { self, nixpkgs, nix-software-center, ... }:
     let
       lib = nixpkgs.lib;
     in
     {
       nixosModules.microDesktop = { config, lib, pkgs, ... }:
         with lib;
-        let
-          cfg = config.microdesktop;
-          flatpakEnabled = cfg.variant == "flatpak";
-        in
         {
-          options.microdesktop = {
-            variant = mkOption {
-              type = types.enum [ "native" "flatpak" ];
-              default = "native";
-              description = "Select the variant: 'native' installs nix-software-center and disables flatpak while 'flatpak' enables flatpak with gnome-software.";
-            };
-          };
-
-          imports = optional flatpakEnabled nix-flatpak.nixosModules.nix-flatpak;
-
           config = {
             nixpkgs.overlays = [
               (self: super: {
@@ -388,59 +373,14 @@
                   gst_all_1.gstreamer
                   gtk3.out
                   nautilus
+                  nix-software-center.packages.${pkgs.system}.nix-software-center
                   podman-compose
                   sushi
                   uutils-coreutils-noprefix
                   wpa_supplicant
                   xdg-user-dirs
                 ]
-                (if flatpakEnabled
-                 then [ gnome-software ]
-                 else [ nix-software-center.packages.${pkgs.system}.nix-software-center ]
-                )
               ];
-
-            services.flatpak = mkMerge [
-              { enable = mkDefault false; }  # Default to disabled
-              (mkIf flatpakEnabled {
-                enable = true;
-                overrides = {
-                  global = {
-                    Context = {
-                      sockets = [
-                        "wayland"
-                        "!fallback-x11"
-                        "!x11"
-                      ];
-                      filesystems = [
-                        "/run/current-system/sw/share/X11/fonts:ro;/nix/store:ro;/run/dbus/system_bus_socket:rw"
-                      ];
-                    };
-                    Environment = {
-                      XCURSOR_PATH = "/run/host/user-share/icons:/run/host/share/icons";
-                    };
-                  };
-                  "com.synology.SynologyDrive".Context.sockets = [ "x11" ];
-                  "net.xmind.XMind".Context.sockets = [ "x11" ];
-                  "net.xmind.XMind8".Context.sockets = [ "x11" ];
-                  "org.onlyoffice.desktopeditors".Context.sockets = [ "x11" ];
-                  "com.logseq.Logseq".Context.sockets = [ "x11" ];
-                };
-                packages = mkDefault [
-                  "io.missioncenter.MissionCenter"
-                  "org.freedesktop.Platform.ffmpeg-full/x86_64/24.08"
-                  "org.freedesktop.Platform.GStreamer.gstreamer-vaapi/x86_64/23.08"
-                  "org.gnome.Loupe"
-                  "org.gnome.Papers"
-                  "org.gnome.Platform/x86_64/47"
-                  "org.gnome.Showtime"
-                  "org.gtk.Gtk3theme.adw-gtk3-dark"
-                  "org.gtk.Gtk3theme.adw-gtk3"
-                ];
-                update.auto.enable = mkDefault true;
-                update.auto.onCalendar = mkDefault "daily";
-              })
-            ];
           };
         };
     };

readme.md

@@ -8,49 +8,53 @@ If you really care about declarative systems, you probably want to use Nix direc
 
 ## Features
 
-- Latest kernel for optimal hardware support
-- GNOME desktop environment with essential applications
-- Network Manager with VPN support
-- Flatpak integration for easy application management
-- Optimized audio setup with PipeWire
-- Printer and scanner support out of the box
-- Automatic system maintenance (TRIM, BTRFS scrubbing)
-- And much more!
+* Latest kernel for optimal hardware support
+* GNOME desktop environment with essential applications
+* Network Manager with VPN support
+* ~~Flatpak integration for easy application management~~ Update: Moved to [nix-software-center](https://github.com/snowfallorg/nix-software-center)
+* Optimized audio setup with PipeWire
+* Printer and scanner support out of the box
+* Automatic system maintenance (TRIM, BTRFS scrubbing)
+* And much more!
 
 ## Installation
 
 Follow these steps to install NixOS Micro Desktop:
 
-1. **Install NixOS with BTRFS root**
-   - Download the latest NixOS ISO
-   - During installation, ensure you set up your root partition as BTRFS
 
+1. **Install NixOS with BTRFS root**
+   * Download the latest NixOS ISO
+   * During installation, ensure you set up your root partition as BTRFS
 2. **Download and customize the sample flake**
-   - Once your system is up and running, download the sample flake to `/etc/nixos/`:
+   * Once your system is up and running, download the sample flake to `/etc/nixos/`:
+
      ```
      sudo curl -o /etc/nixos/flake.nix https://raw.githubusercontent.com/Avunu/nixos-micro-desktop/main/local-flake.nix
      ```
-   - Customize the flake according to your needs:
+   * Customize the flake according to your needs:
+
      ```
      sudo nano /etc/nixos/flake.nix
      ```
-   - Update the flake:
+   * Update the flake:
+
      ```
      sudo nix flake update /etc/nixos --extra-experimental-features nix-command flakes
      ```
-
 3. **Delete the old configuration.nix**
-   - Remove the old configuration file:
+   * Remove the old configuration file:
+
      ```
      sudo rm /etc/nixos/configuration.nix
      ```
-
 4. **Rebuild and reboot**
-   - Rebuild your system using the new flake:
+   * Rebuild your system using the new flake:
+
      ```
      sudo nixos-rebuild switch --flake /etc/nixos#default
      ```
-   - Reboot your system to apply all changes:
+   * Reboot your system to apply all changes:
+
      ```
      sudo reboot
      ```
@@ -67,4 +71,4 @@ We welcome contributions! If you have improvements or bug fixes, please open a p
 
 If you need help or have questions, please open an issue on our GitHub repository or join our community chat.
 
-Enjoy your sleek, efficient, and customizable NixOS Micro Desktop!
+Enjoy your sleek, efficient, and customizable NixOS Micro Desktop!