From 36b1cc826316c59d14a4c51bd34e35a5e8c11184 Mon Sep 17 00:00:00 2001
From: Gabriella Bere <contact@gabbie.blue>
Date: Mon, 26 Aug 2024 02:05:57 +0100
Subject: [PATCH] enable declarative-flatpak in home-manager

---
 flake.lock               | 72 +++++++++++++++++++++++++++++++++++++++-
 flake.nix                | 10 +++++-
 home-manager/flatpak.nix |  4 +++
 home-manager/home.nix    |  1 +
 4 files changed, 85 insertions(+), 2 deletions(-)
 create mode 100644 home-manager/flatpak.nix

diff --git a/flake.lock b/flake.lock
index da9c4d0..3827c34 100644
--- a/flake.lock
+++ b/flake.lock
@@ -43,6 +43,26 @@
         "type": "github"
       }
     },
+    "flatpaks": {
+      "inputs": {
+        "nixpkgs": "nixpkgs",
+        "utils": "utils"
+      },
+      "locked": {
+        "lastModified": 1724545401,
+        "narHash": "sha256-Or7WArPVTP50UD47OIiVMP/MzsveHBpVLgZO2Y2X+N8=",
+        "owner": "GermanBread",
+        "repo": "declarative-flatpak",
+        "rev": "5ac7c5329b18fc22f92ac6f414732c40fbb22143",
+        "type": "github"
+      },
+      "original": {
+        "owner": "GermanBread",
+        "ref": "stable-v3",
+        "repo": "declarative-flatpak",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -64,6 +84,22 @@
       }
     },
     "nixpkgs": {
+      "locked": {
+        "lastModified": 1724316499,
+        "narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-24.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
       "locked": {
         "lastModified": 1724224976,
         "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=",
@@ -82,8 +118,9 @@
     "root": {
       "inputs": {
         "anyrun": "anyrun",
+        "flatpaks": "flatpaks",
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
         "stablepkgs": "stablepkgs"
       }
     },
@@ -117,6 +154,39 @@
         "repo": "default-linux",
         "type": "github"
       }
+    },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "utils": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 63dad48..46a66a7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,13 +11,18 @@
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    # Anyrun launcher
     anyrun = {
       url = "github:anyrun-org/anyrun";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    # Declarative flatpak management, documentation states overriding nixpkgs is not supported
+    flatpaks.url = "github:GermanBread/declarative-flatpak/stable-v3";
   };
 
-  outputs = { self, nixpkgs, stablepkgs, ... } @ inputs:
+  outputs = { self, nixpkgs, stablepkgs, home-manager, ... } @ inputs:
   let
     system = "x86_64-linux";
     pkgs = nixpkgs.legacyPackages.${system};
@@ -36,10 +41,13 @@
       ];
     };
     homeConfigurations.blue = home-manager.lib.homeManagerConfiguration {
+      inherit pkgs;
+      extraSpecialArgs = { inherit inputs; };
       # Import home-manager modules here
       modules = [
         ./home-manager/home.nix
         inputs.anyrun.homeManagerModules.default
+        inputs.flatpaks.homeManagerModules.default
       ];
     };
   };
diff --git a/home-manager/flatpak.nix b/home-manager/flatpak.nix
new file mode 100644
index 0000000..4404aba
--- /dev/null
+++ b/home-manager/flatpak.nix
@@ -0,0 +1,4 @@
+{ config, pkgs, ... }:
+{
+  services.flatpak.enableModule = true;
+}
diff --git a/home-manager/home.nix b/home-manager/home.nix
index 472bc28..2aa5f66 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -8,6 +8,7 @@
     ./hyprland.nix
     ./waybar.nix
     ./swaync.nix
+    ./flatpak.nix
   ];
 
   # States home manager version that config was originally compatible with, do not change without reading all patch notes since this version and altering as needed