diff --git a/flake.lock b/flake.lock index 0bc4b45..a2ef612 100644 --- a/flake.lock +++ b/flake.lock @@ -481,6 +481,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-formatter-pack": { "inputs": { "nixpkgs": [ @@ -740,6 +756,7 @@ "home-manager": "home-manager", "iamb": "iamb", "nbfc-linux": "nbfc-linux", + "nix-flatpak": "nix-flatpak", "nix-index-database": "nix-index-database", "nix-on-droid": "nix-on-droid", "nixpkgs": "nixpkgs_2", diff --git a/flake.nix b/flake.nix index f5fd08f..53b812a 100644 --- a/flake.nix +++ b/flake.nix @@ -53,11 +53,15 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + # Support for android nix-on-droid = { url = "github:nix-community/nix-on-droid/release-24.05"; inputs.nixpkgs.follows = "nixpkgs"; inputs.home-manager.follows = "home-manager"; }; + + # Declare flatpak easilly + nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest"; }; outputs = { diff --git a/hosts/nixos/configuration.nix b/hosts/nixos/configuration.nix index cc75557..73807a6 100644 --- a/hosts/nixos/configuration.nix +++ b/hosts/nixos/configuration.nix @@ -70,6 +70,9 @@ # Enable seatd services.seatd.enable = true; + # Enable flatpak + services.flatpak.enable = true; + # Enable ratbagd to customize mouse options services.ratbagd.enable = true; diff --git a/hosts/nixos/home.nix b/hosts/nixos/home.nix index 7acabfa..54ec465 100644 --- a/hosts/nixos/home.nix +++ b/hosts/nixos/home.nix @@ -6,6 +6,7 @@ imports = [ inputs.nvf.homeManagerModules.default inputs.nix-index-database.hmModules.nix-index + inputs.nix-flatpak.homeManagerModules.nix-flatpak ]; # Some info diff --git a/modules/linux/home-manager/default.nix b/modules/linux/home-manager/default.nix index 58b396e..d0d89ea 100644 --- a/modules/linux/home-manager/default.nix +++ b/modules/linux/home-manager/default.nix @@ -11,6 +11,7 @@ ./obs-studio.nix ./restic.nix ./shell-additions.nix + ./flatpak.nix ]; crony.mangohud.enable = lib.mkDefault true; @@ -24,4 +25,5 @@ crony.desktop.enable = lib.mkDefault true; crony.gaming.enable = lib.mkDefault true; crony.shell-additions.enable = lib.mkDefault true; + crony.flatpak.enable = lib.mkDefault true; } diff --git a/modules/linux/home-manager/flatpak.nix b/modules/linux/home-manager/flatpak.nix new file mode 100644 index 0000000..ecedab5 --- /dev/null +++ b/modules/linux/home-manager/flatpak.nix @@ -0,0 +1,25 @@ +{ + config, + lib, + ... +}: { + options = { + crony.flatpak.enable = lib.mkEnableOption "Enable flatpak and install my packages"; + }; + + config = lib.mkIf config.crony.flatpak.enable { + services.flatpak = { + enable = true; + packages = [ + "com.albiononline.AlbionOnline" + "app.zen_browser.zen" + "com.usebottles.bottles" + ]; + + update.auto = { + enable = true; + onCalendar = "weekly"; + }; + }; + }; +}