From 1a224231f33fcbde49bd4f4c3b32c5a04fb09d5f Mon Sep 17 00:00:00 2001 From: Ahurac Date: Tue, 1 Oct 2024 11:13:54 +0200 Subject: [PATCH] feat(flatpak): add flake input `flatpaks` --- common/configuration.nix | 1 + flake.lock | 17 +++++++++++++++++ flake.nix | 7 +++++-- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/common/configuration.nix b/common/configuration.nix index 2f87d1e..19334a9 100644 --- a/common/configuration.nix +++ b/common/configuration.nix @@ -37,6 +37,7 @@ services.udisks2.enable = true; services.libinput.enable = true; + services.flatpak.enable = true; programs.hyprland.enable = true; programs.zsh.enable = true; diff --git a/flake.lock b/flake.lock index 4600595..8928624 100644 --- a/flake.lock +++ b/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": [ @@ -39,6 +55,7 @@ }, "root": { "inputs": { + "flatpaks": "flatpaks", "home-manager": "home-manager", "nixpkgs": "nixpkgs" } diff --git a/flake.nix b/flake.nix index 3829ba9..db11640 100644 --- a/flake.nix +++ b/flake.nix @@ -5,9 +5,10 @@ url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "nixpkgs"; }; + flatpaks.url = "github:gmodena/nix-flatpak/main"; }; - outputs = { self, nixpkgs, home-manager, ... }@inputs: { + outputs = { self, nixpkgs, home-manager, flatpaks, ... }@inputs: { nixosConfigurations.ahrc-pc = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ @@ -29,7 +30,9 @@ { 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 ]; } ]; };