feat(flatpak): other settings

common/configuration.nix

@@ -37,21 +37,7 @@
 
   services.udisks2.enable = true;
   services.libinput.enable = true;
-
-  services.flatpak = {
-    enable = true;
-    packages = [ "dev.aunetx.deezer" "im.riot.Riot" ];
-    update.onActivation = true;
-    overrides = {
-      global = {
-        Context.sockets = [ "wayland" "!x11" "!fallback-x11" ];
-        Environment = {
-          XCURSOR_PATH = "/run/host/user-share/icons:/run/host/share/icons";
-          GTK_THEME = "Adwaita:dark";
-        };
-      };
-    };
-  };
+  services.flatpak.enable = true;
 
   programs.hyprland.enable = true;
   programs.zsh.enable = true;

common/home.nix

@@ -48,6 +48,18 @@
 
   services.ssh-agent.enable = true;
 
+  services.flatpak.packages = [ "im.riot.Riot" ];
+  services.flatpak.update.onActivation = true;
+  services.flatpak.overrides = {
+    global = {
+      Context.sockets = [ "wayland" "!x11" "!fallback-x11" ];
+      Environment = {
+        XCURSOR_PATH = "/run/host/user-share/icons:/run/host/share/icons";
+        GTK_THEME = "Adwaita:dark";
+      };
+    };
+  };
+
   programs.home-manager.enable = true;
   programs.firefox.enable = true;
   programs.kitty.enable = true;

flake.lock

@@ -1,5 +1,21 @@
 {
   "nodes": {
+    "flatpaks": {
+      "locked": {
+        "lastModified": 1721549352,
+        "narHash": "sha256-nlXJa8RSOX0kykrIYW33ukoHYq+FOSNztHLLgqKwOp8=",
+        "owner": "gmodena",
+        "repo": "nix-flatpak",
+        "rev": "dbce39ea8664820ba9037caaf1e2fad365ed6b4b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "gmodena",
+        "ref": "main",
+        "repo": "nix-flatpak",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -21,21 +37,6 @@
         "type": "github"
       }
     },
-    "nix-flatpak": {
-      "locked": {
-        "lastModified": 1721549352,
-        "narHash": "sha256-nlXJa8RSOX0kykrIYW33ukoHYq+FOSNztHLLgqKwOp8=",
-        "owner": "gmodena",
-        "repo": "nix-flatpak",
-        "rev": "dbce39ea8664820ba9037caaf1e2fad365ed6b4b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "gmodena",
-        "repo": "nix-flatpak",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1727348695,
@@ -54,8 +55,8 @@
     },
     "root": {
       "inputs": {
+        "flatpaks": "flatpaks",
         "home-manager": "home-manager",
-        "nix-flatpak": "nix-flatpak",
         "nixpkgs": "nixpkgs"
       }
     }

flake.nix

@@ -5,20 +5,21 @@
       url = "github:nix-community/home-manager/master";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    nix-flatpak.url = "github:gmodena/nix-flatpak";
+    flatpaks.url = "github:gmodena/nix-flatpak/main";
   };
 
-  outputs = { self, nixpkgs, home-manager, nix-flatpak, ... }: {
+  outputs = { self, nixpkgs, home-manager, flatpaks, ... }@inputs: {
     nixosConfigurations.ahrc-pc = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       modules = [
-        nix-flatpak.nixosModules.nix-flatpak
         ./ahrc-pc/configuration.nix
         home-manager.nixosModules.home-manager
         {
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
-          home-manager.users.ahurac = import ./ahrc-pc/home.nix;
+          home-manager.extraSpecialArgs.flake-inputs = inputs;
+          home-manager.users.ahurac.imports =
+            [ flatpaks.homeManagerModules.nix-flatpak ./ahrc-pc/home.nix ];
         }
       ];
     };
@@ -26,13 +27,14 @@
     nixosConfigurations.ahrc-laptop = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       modules = [
-        nix-flatpak.nixosModules.nix-flatpak
         ./ahrc-laptop/configuration.nix
         home-manager.nixosModules.home-manager
         {
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
-          home-manager.users.ahurac = import ./ahrc-laptop/home.nix;
+          home-manager.extraSpecialArgs.flake-inputs = inputs;
+          home-manager.users.ahurac.imports =
+            [ flatpaks.homeManagerModules.nix-flatpak ./ahrc-laptop/home.nix ];
         }
       ];
     };