From 4af26da42f167f5b1a5de2bca7c8cc5350859304 Mon Sep 17 00:00:00 2001
From: blake <me@blakedheld.xyz>
Date: Fri, 7 Nov 2025 18:38:37 -0600
Subject: [PATCH] add flatpaks with nix-flatpak, but like right this time

---
 flake.lock                                      | 17 +++++++++++++++++
 hosts/nixos/default.nix                         |  4 ++++
 users/blake/dots/programs/_flatpak/default.nix  | 15 +++++++++++----
 .../{devtoys => devtoolbox}/default.nix         |  3 ++-
 users/blake/dots/programs/default.nix           |  2 ++
 5 files changed, 36 insertions(+), 5 deletions(-)
 rename users/blake/dots/programs/_flatpak/{devtoys => devtoolbox}/default.nix (91%)

diff --git a/flake.lock b/flake.lock
index 301f1e4..984ba8f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -425,6 +425,22 @@
         "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-homebrew": {
       "inputs": {
         "brew-src": "brew-src"
@@ -546,6 +562,7 @@
         "home-manager": "home-manager",
         "home-manager-unstable": "home-manager-unstable",
         "nix-darwin": "nix-darwin",
+        "nix-flatpak": "nix-flatpak",
         "nix-homebrew": "nix-homebrew",
         "nixpkgs": "nixpkgs_2",
         "nixpkgs-unstable": "nixpkgs-unstable",
diff --git a/hosts/nixos/default.nix b/hosts/nixos/default.nix
index 349d122..1a6ee89 100644
--- a/hosts/nixos/default.nix
+++ b/hosts/nixos/default.nix
@@ -95,6 +95,10 @@
             command = "/etc/profiles/per-user/blake/bin/nom";
             options = ["NOPASSWD"];
           }
+          {
+            command = "/etc/profiles/per-user/blake/bin/nom-build";
+            options = ["NOPASSWD"];
+          }
         ];
       }
     ];
diff --git a/users/blake/dots/programs/_flatpak/default.nix b/users/blake/dots/programs/_flatpak/default.nix
index 5f57209..d4a04f3 100644
--- a/users/blake/dots/programs/_flatpak/default.nix
+++ b/users/blake/dots/programs/_flatpak/default.nix
@@ -8,8 +8,8 @@
   cfg = config.dots.flatpak;
 in {
   imports = [
-    inputs.homeManagerModules.nix-flatpak
-    ./devtoys
+    inputs.nix-flatpak.homeManagerModules.nix-flatpak
+    ./devtoolbox
   ];
 
   options.dots.flatpak = {
@@ -20,9 +20,16 @@ in {
   # https://github.com/gmodena/nix-flatpak?tab=readme-ov-file
 
   config = lib.mkIf cfg.enable {
-    #services.flatpak.remotes = {};
+
+    # install the cli
+    home.packages = with pkgs; [ flatpak ];
+
+    services.flatpak = {
+      #remotes = {};
+    };
+
     dots = {
-      devtoys.enable = lib.mkDefault true;
+      devtoolbox.enable = lib.mkDefault true;
     };
   };
 }
diff --git a/users/blake/dots/programs/_flatpak/devtoys/default.nix b/users/blake/dots/programs/_flatpak/devtoolbox/default.nix
similarity index 91%
rename from users/blake/dots/programs/_flatpak/devtoys/default.nix
rename to users/blake/dots/programs/_flatpak/devtoolbox/default.nix
index 015744d..c094d26 100644
--- a/users/blake/dots/programs/_flatpak/devtoys/default.nix
+++ b/users/blake/dots/programs/_flatpak/devtoolbox/default.nix
@@ -5,7 +5,7 @@
   config,
   ...
 }: let
-  program = "devtoys";
+  program = "devtoolbox";
   app_id = "me.iepure.devtoolbox";
   origin = "flathub";
   cfg = config.dots.${program};
@@ -19,6 +19,7 @@ in {
 
     services.flatpak.packages = [
       { appId = app_id; origin = origin;}
+      app_id
     ];
 
   };
diff --git a/users/blake/dots/programs/default.nix b/users/blake/dots/programs/default.nix
index 284889c..db585cb 100644
--- a/users/blake/dots/programs/default.nix
+++ b/users/blake/dots/programs/default.nix
@@ -10,6 +10,7 @@ in {
     ./_media-tools
     ./_browsers
     ./_gaming
+    ./_flatpak
 
     ./thunderbird
     ./libreoffice
@@ -30,6 +31,7 @@ in {
       media-tools.enable = lib.mkDefault true;
       browsers.enable = lib.mkDefault true;
       gaming.enable = lib.mkDefault true;
+      flatpak.enable = lib.mkDefault true;
 
       thunderbird.enable = lib.mkDefault true;
       libreoffice.enable = lib.mkDefault true;