diff --git a/common/flake.lock b/common/flake.lock index fa5eb1b..f079961 100644 --- a/common/flake.lock +++ b/common/flake.lock @@ -121,7 +121,7 @@ "type": "github" } }, - "nix_flatpak": { + "nix-flatpak": { "locked": { "lastModified": 1739444422, "narHash": "sha256-iAVVHi7X3kWORftY+LVbRiStRnQEob2TULWyjMS6dWg=", @@ -194,7 +194,7 @@ "root": { "inputs": { "home-manager": "home-manager", - "nix_flatpak": "nix_flatpak", + "nix-flatpak": "nix-flatpak", "ragenix": "ragenix" } }, diff --git a/common/flake.nix b/common/flake.nix index a7d2079..38a570a 100644 --- a/common/flake.nix +++ b/common/flake.nix @@ -1,15 +1,16 @@ { inputs = { + # NOTE if you add any inputs here also add them in the TOP level repo's flake.nix home-manager.url = "github:rycee/home-manager/release-25.05"; ragenix.url = "github:yaxitech/ragenix"; - nix_flatpak.url = "github:gmodena/nix-flatpak/?ref=latest"; + nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest"; }; outputs = { home-manager, ragenix, - nix_flatpak, + nix-flatpak, ... }: { @@ -24,7 +25,7 @@ imports = [ home-manager.nixosModules.home-manager ragenix.nixosModules.age - nix_flatpak.nixosModules.nix-flatpak + nix-flatpak.nixosModules.nix-flatpak ./_home_manager ./options.nix ./general diff --git a/flake.nix b/flake.nix index 9f4d0e7..00b8145 100644 --- a/flake.nix +++ b/flake.nix @@ -6,9 +6,7 @@ # ===== home-manager.url = "github:rycee/home-manager/release-24.11"; ragenix.url = "github:yaxitech/ragenix"; - - # hyprland.url = "github:hyprwm/Hyprland"; - # cosmic.url = "github:lilyinstarlight/nixos-cosmic"; + nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest"; # ====== }; @@ -17,6 +15,7 @@ nixpkgs, home-manager, ragenix, + nix-flatpak, ... }@inputs: let