christoph/flake-nixinator
1
Fork 0
Code Activity

switch to flatpak discord

Browse Source
This commit is contained in:
Christoph Urlacher
2022-10-29 23:22:03 +02:00
parent 9d7144ce0d
commit 8acff7f4ab
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
home/christoph/nixinator/default.nix
View File

@ -35,7 +35,7 @@ rec {
prism.enable = true; prism.enable = true;
bottles.enable = true; bottles.enable = true;
discordChromium.enable = true; discordChromium.enable = true;
discordElectron.enable = true; discordElectron.enable = false; # This is the nixpkgs version, prefer the one from flatpak module
steam = { steam = {
enable = true; enable = true;

12
home/modules/gaming.nix
View File

@ -19,7 +19,7 @@ in {
options.modules.gaming = { options.modules.gaming = {
enable = mkEnableOpt "Gaming module"; enable = mkEnableOpt "Gaming module";
discordElectron.enable = mkEnableOpt "Discord (Electron) (flatpak)"; discordElectron.enable = mkEnableOpt "Discord (Electron) (nixpkgs)";
discordChromium.enable = mkEnableOpt "Discord (Chromium)"; discordChromium.enable = mkEnableOpt "Discord (Chromium)";
prism.enable = mkEnableOpt "PrismLauncher for Minecraft (flatpak)"; prism.enable = mkEnableOpt "PrismLauncher for Minecraft (flatpak)";
bottles.enable = mkEnableOpt "Bottles (flatpak)"; bottles.enable = mkEnableOpt "Bottles (flatpak)";
@ -47,10 +47,6 @@ in {
assertion = cfgfp.enable; assertion = cfgfp.enable;
message = "Cannot enable Bottles without the flatpak module!"; message = "Cannot enable Bottles without the flatpak module!";
}) })
(mkIf cfg.discordElectron.enable {
assertion = cfgfp.enable;
message = "Cannot enable Discord (Electron) without the flatpak module!";
})
]; ];
home.packages = with pkgs; builtins.concatLists [ home.packages = with pkgs; builtins.concatLists [
@ -65,7 +61,7 @@ in {
(optionals cfg.discordChromium.enable [ chromium ]) (optionals cfg.discordChromium.enable [ chromium ])
# Prefer flatpak version as nixpkgs version isn't always updated in time # Prefer flatpak version as nixpkgs version isn't always updated in time
# (optionals cfg.discordElectron.enable [ discord ]) (optionals cfg.discordElectron.enable [ discord ])
(optionals cfg.steam.adwaita [ adwaita-for-steam ]) (optionals cfg.steam.adwaita [ adwaita-for-steam ])
# Prefer flatpak version as this one doesn't find the STEAM_DIR automatically # Prefer flatpak version as this one doesn't find the STEAM_DIR automatically
@ -141,8 +137,7 @@ in {
(optionals cfg.steam.enable [ "com.valvesoftware.Steam" "com.github.Matoking.protontricks" "com.valvesoftware.Steam.Utility.steamtinkerlaunch" "com.steamgriddb.steam-rom-manager" "org.DolphinEmu.dolphin-emu" ]) (optionals cfg.steam.enable [ "com.valvesoftware.Steam" "com.github.Matoking.protontricks" "com.valvesoftware.Steam.Utility.steamtinkerlaunch" "com.steamgriddb.steam-rom-manager" "org.DolphinEmu.dolphin-emu" ])
(optionals (cfg.steam.enable && cfg.steam.protonGE) [ "com.valvesoftware.Steam.CompatibilityTool.Proton-GE" ]) (optionals (cfg.steam.enable && cfg.steam.protonGE) [ "com.valvesoftware.Steam.CompatibilityTool.Proton-GE" ])
(optionals (cfg.steam.enable && cfg.steam.gamescope) [ "com.valvesoftware.Steam.Utility.gamescope" ]) (optionals (cfg.steam.enable && cfg.steam.gamescope) [ "com.valvesoftware.Steam.Utility.gamescope" ])
(optionals (cfg.prism.enable) [ "org.prismlauncher.PrismLauncher" ]) (optionals cfg.prism.enable [ "org.prismlauncher.PrismLauncher" ])
(optionals (cfg.discordElectron.enable) [ "com.discordapp.Discord" ])
]; ];
modules.flatpak.extraRemove = builtins.concatLists [ modules.flatpak.extraRemove = builtins.concatLists [
@ -150,7 +145,6 @@ in {
(optionals (!cfg.steam.enable || !cfg.steam.protonGE) [ "com.valvesoftware.Steam.CompatibilityTool.Proton-GE" ]) (optionals (!cfg.steam.enable || !cfg.steam.protonGE) [ "com.valvesoftware.Steam.CompatibilityTool.Proton-GE" ])
(optionals (!cfg.steam.enable || !cfg.steam.gamescope) [ "com.valvesoftware.Steam.Utility.gamescope" ]) (optionals (!cfg.steam.enable || !cfg.steam.gamescope) [ "com.valvesoftware.Steam.Utility.gamescope" ])
(optionals (!cfg.prism.enable) [ "org.prismlauncher.PrismLauncher" ]) (optionals (!cfg.prism.enable) [ "org.prismlauncher.PrismLauncher" ])
(optionals (!cfg.discordElectron.enable) [ "com.discordapp.Discord" ])
]; ];
}; };
} }