From b6f92728fbd32521d5433e7b91310bee1cd59dc6 Mon Sep 17 00:00:00 2001
From: Kat Inskip <kat@inskip.me>
Date: Sat, 11 Oct 2025 03:17:18 -0700
Subject: [PATCH] fix: remove flatpak

---
 flake.lock                            | 17 -----------------
 flake.nix                             |  3 ---
 nixos/profiles/gaming/wine.nix        |  1 -
 nixos/profiles/graphical/flatpak.nix  | 23 -----------------------
 nixos/profiles/graphical/mounting.nix |  7 +++++--
 tree.nix                              |  2 --
 6 files changed, 5 insertions(+), 48 deletions(-)
 delete mode 100644 nixos/profiles/graphical/flatpak.nix

diff --git a/flake.lock b/flake.lock
index 90c571bf..bc05de72 100644
--- a/flake.lock
+++ b/flake.lock
@@ -988,22 +988,6 @@
         "type": "github"
       }
     },
-    "nix-flatpak": {
-      "locked": {
-        "lastModified": 1739444422,
-        "narHash": "sha256-iAVVHi7X3kWORftY+LVbRiStRnQEob2TULWyjMS6dWg=",
-        "owner": "gmodena",
-        "repo": "nix-flatpak",
-        "rev": "5e54c3ca05a7c7d968ae1ddeabe01d2a9bc1e177",
-        "type": "github"
-      },
-      "original": {
-        "owner": "gmodena",
-        "ref": "latest",
-        "repo": "nix-flatpak",
-        "type": "github"
-      }
-    },
     "nix-gaming": {
       "inputs": {
         "flake-parts": [
@@ -1404,7 +1388,6 @@
         "neorg-overlay": "neorg-overlay",
         "nh": "nh",
         "niri": "niri",
-        "nix-flatpak": "nix-flatpak",
         "nix-gaming": "nix-gaming",
         "nix-index-database": "nix-index-database",
         "nix-std": "nix-std_2",
diff --git a/flake.nix b/flake.nix
index 42df50b0..db766f13 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,9 +15,6 @@
         nixpkgs.follows = "nixpkgs";
       };
     };
-    nix-flatpak = {
-      url = "github:gmodena/nix-flatpak/?ref=latest";
-    };
     rust = {
       url = "github:arcnmx/nixexprs-rust";
       inputs = {
diff --git a/nixos/profiles/gaming/wine.nix b/nixos/profiles/gaming/wine.nix
index e2aa7225..8056490c 100644
--- a/nixos/profiles/gaming/wine.nix
+++ b/nixos/profiles/gaming/wine.nix
@@ -50,7 +50,6 @@ in {
     package = pkgs.gamescope;
   };
   environment.systemPackages = with pkgs; [
-    protonplus
     gamescope-wsi
     mangohud
     vkbasalt
diff --git a/nixos/profiles/graphical/flatpak.nix b/nixos/profiles/graphical/flatpak.nix
deleted file mode 100644
index a298998d..00000000
--- a/nixos/profiles/graphical/flatpak.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-_: {
-  home-manager.sharedModules = [
-    ({config, ...}: {
-      xdg.systemDirs.data = [
-        "/var/lib/flatpak/exports/share"
-        "/home/${config.home.username}/.local/share/flatpak/exports/share/"
-      ];
-    })
-  ];
-  services.flatpak = {
-    enable = true;
-    update.auto = {
-      enable = true;
-      onCalendar = "weekly";
-    };
-    remotes = [
-      {
-        name = "flathub";
-        location = "https://dl.flathub.org/repo/flathub.flatpakrepo";
-      }
-    ];
-  };
-}
diff --git a/nixos/profiles/graphical/mounting.nix b/nixos/profiles/graphical/mounting.nix
index 74af35ae..7a0d056c 100644
--- a/nixos/profiles/graphical/mounting.nix
+++ b/nixos/profiles/graphical/mounting.nix
@@ -1,6 +1,9 @@
-_: {
+{pkgs, ...}: {
   services = {
-    gvfs.enable = true;
+    gvfs = {
+      enable = true;
+      package = pkgs.gvfs;
+    };
     udisks2.enable = true;
     devmon.enable = true;
   };
diff --git a/tree.nix b/tree.nix
index 7a2064dc..04fea6e3 100644
--- a/tree.nix
+++ b/tree.nix
@@ -90,7 +90,6 @@
           clipboard-sync.nixosModules.default
           niri.nixosModules.niri
           nixos-cli.nixosModules.nixos-cli
-          nix-flatpak.nixosModules.nix-flatpak
           stylix.nixosModules.stylix
           microvm.nixosModules.host
         ];
@@ -113,7 +112,6 @@
             sops-nix.homeManagerModules.sops
             chaotic.homeManagerModules.default
             spicetify-nix.homeManagerModules.spicetify
-            nix-flatpak.homeManagerModules.nix-flatpak
             stylix.homeModules.stylix
           ]
           ++ (with (import (inputs.arcexprs + "/modules")).home-manager; [