christoph/flake-nixinator
1
Fork 0
Code Activity

flatpak module assert flatpak is enabled

Browse Source
This commit is contained in:
Christoph Urlacher
2022-08-09 16:40:41 +02:00
parent 577ea7d36d
commit 43e0bd9a62
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modules/flatpak.nix
View File

@ -1,4 +1,4 @@
{ config, lib, mylib, pkgs, ... }: { config, nixosConfig, lib, mylib, pkgs, ... }:
with lib; with lib;
with mylib.modules; with mylib.modules;
@ -16,8 +16,8 @@ in {
options.modules.flatpak = { options.modules.flatpak = {
enable = mkBoolOpt false "Enable flatpak support"; enable = mkBoolOpt false "Enable flatpak support";
fontFix = mkBoolOpt false "Link fonts to ~/.local/share/fonts so flatpak apps can find them"; fontFix = mkBoolOpt true "Link fonts to ~/.local/share/fonts so flatpak apps can find them";
iconFix = mkBoolOpt false "Link icons to ~/.local/share/icons so flatpak apps can find them"; iconFix = mkBoolOpt true "Link icons to ~/.local/share/icons so flatpak apps can find them";
autoUpdate = mkBoolOpt false "Update flatpak apps on nixos-rebuild"; autoUpdate = mkBoolOpt false "Update flatpak apps on nixos-rebuild";
autoPrune = mkBoolOpt false "Remove unused packages on nixos-rebuild"; autoPrune = mkBoolOpt false "Remove unused packages on nixos-rebuild";
@ -26,7 +26,7 @@ in {
# TODO: Do this for strings + packages # TODO: Do this for strings + packages
discord.enable = mkBoolOpt false "Enable Discord"; discord.enable = mkBoolOpt false "Enable Discord";
spotify.enable = mkBoolOpt false "Enable Spotify"; spotify.enable = mkBoolOpt false "Enable Spotify";
flatseal.enable = mkBoolOpt false "Enable Flatseal"; flatseal.enable = mkBoolOpt true "Enable Flatseal";
bottles.enable = mkBoolOpt false "Enable Bottles"; bottles.enable = mkBoolOpt false "Enable Bottles";
# This is mainly used by other modules to allow them to use flatpak packages # This is mainly used by other modules to allow them to use flatpak packages
@ -45,6 +45,12 @@ in {
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
assertions = [
(mkIf cfg.enable {
assertion = nixosConfig.services.flatpak.enable;
message = "Cannot use the flatpak module with flatpak disabled in nixos!";
})
];
# NOTE: Is already set by flatpak.enable in configuration.nix # NOTE: Is already set by flatpak.enable in configuration.nix
# xdg.systemDirs.data = [ # xdg.systemDirs.data = [