flatpak: refactor as home module to fix themes and fonts
Signed-off-by: Myned <dev@bjork.tech>
This commit is contained in:
parent
1d4a1b63bb
commit
fc82cd8d93
2 changed files with 45 additions and 26 deletions
|
@ -140,7 +140,6 @@
|
||||||
inputs.arion.nixosModules.arion
|
inputs.arion.nixosModules.arion
|
||||||
inputs.disko.nixosModules.disko
|
inputs.disko.nixosModules.disko
|
||||||
inputs.fw-fanctrl.nixosModules.default
|
inputs.fw-fanctrl.nixosModules.default
|
||||||
inputs.nix-flatpak.nixosModules.nix-flatpak
|
|
||||||
];
|
];
|
||||||
|
|
||||||
home-manager.users.${config.custom.username}.imports = [
|
home-manager.users.${config.custom.username}.imports = [
|
||||||
|
|
|
@ -11,32 +11,52 @@ in {
|
||||||
options.custom.services.flatpak.enable = mkOption {default = false;};
|
options.custom.services.flatpak.enable = mkOption {default = false;};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
# https://wiki.nixos.org/wiki/Flatpak
|
services.flatpak.enable = true;
|
||||||
# https://github.com/gmodena/nix-flatpak
|
|
||||||
services.flatpak = {
|
|
||||||
enable = true;
|
|
||||||
uninstallUnmanaged = true; # Immutable flatpaks
|
|
||||||
update.auto.enable = true; # Auto update flatpaks weekly
|
|
||||||
|
|
||||||
#!! Installation occurs in background as a oneshot service
|
#!! Only takes effect if /usr/* shares do not exist
|
||||||
#?? flatpak search NAME
|
# Nixpkgs workaround requires packages in the global environment
|
||||||
packages =
|
# https://github.com/NixOS/nixpkgs/pull/262462
|
||||||
optionals config.custom.default [
|
environment.systemPackages =
|
||||||
"com.github.tchx84.Flatseal"
|
config.fonts.packages
|
||||||
]
|
++ [
|
||||||
++ optionals config.custom.minimal [
|
config.home-manager.users.${config.custom.username}.gtk.cursorTheme.package
|
||||||
"net.retrodeck.retrodeck"
|
config.home-manager.users.${config.custom.username}.gtk.iconTheme.package
|
||||||
]
|
];
|
||||||
++ optionals config.custom.full [
|
|
||||||
"app.drey.Biblioteca"
|
home-manager.users.${config.custom.username} = {
|
||||||
];
|
imports = [inputs.nix-flatpak.homeManagerModules.nix-flatpak];
|
||||||
|
|
||||||
|
# https://wiki.nixos.org/wiki/Flatpak
|
||||||
|
# https://github.com/gmodena/nix-flatpak
|
||||||
|
services.flatpak = {
|
||||||
|
enable = true;
|
||||||
|
uninstallUnmanaged = true; # Immutable flatpaks
|
||||||
|
update.auto.enable = true; # Auto update flatpaks weekly
|
||||||
|
|
||||||
|
#!! Installation occurs during activation
|
||||||
|
#?? flatpak search NAME
|
||||||
|
packages =
|
||||||
|
optionals config.custom.default [
|
||||||
|
"com.github.tchx84.Flatseal"
|
||||||
|
]
|
||||||
|
++ optionals config.custom.minimal [
|
||||||
|
"net.retrodeck.retrodeck"
|
||||||
|
]
|
||||||
|
++ optionals config.custom.full [
|
||||||
|
"app.drey.Biblioteca"
|
||||||
|
];
|
||||||
|
|
||||||
|
# https://github.com/gmodena/nix-flatpak?tab=readme-ov-file#overrides
|
||||||
|
overrides.global = {
|
||||||
|
Context.filesystems = [
|
||||||
|
"xdg-config/gtk-3.0:ro"
|
||||||
|
"xdg-config/gtk-4.0:ro"
|
||||||
|
|
||||||
|
# HACK: Globally allow access to /nix/store for symlinked themes
|
||||||
|
"/nix/store:ro"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# Theme packages must be installed system-wide for flatpaks
|
|
||||||
environment.systemPackages = with pkgs; [
|
|
||||||
adw-gtk3
|
|
||||||
google-cursor
|
|
||||||
papirus-icon-theme
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue