christoph/flake-nixinator
1
Fork 0
Code Activity

Disable some old flatpak related options

Browse Source
This commit is contained in:
Christoph Urlacher
2023-04-17 18:54:30 +02:00
parent 04c7da1580
commit eabf6392dc
3 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,7 +25,7 @@ rec {
tenacity.enable = true; tenacity.enable = true;
faust.enable = true; faust.enable = true;
bottles.enable = true; bottles.enable = false;
yabridge.enable = true; yabridge.enable = true;
yabridge.autoSync = true; yabridge.autoSync = true;
@ -46,15 +46,16 @@ rec {
prism.enable = true; prism.enable = true;
bottles.enable = true; bottles.enable = true;
# TODO: Webcord # TODO: Webcord
discordChromium.enable = false; # discordChromium.enable = false;
discordElectron.enable = false; # This is the nixpkgs version, prefer the one from flatpak module # discordElectron.enable = false; # This is the nixpkgs version, prefer the one from flatpak module
dwarffortress.enable = false; # dwarffortress.enable = false;
steam = { steam = {
enable = true; enable = true;
protonGE = true; # TODO: Using protonup-qt now protonGE = true; # TODO: Using protonup-qt now
gamescope = true; gamescope = true;
adwaita = true; adwaita = true;
protonup = true;
}; };
}; };
}; };

7
home/modules/flatpak.nix
View File

@ -28,6 +28,9 @@ with mylib.modules;
spotify.enable = mkEnableOpt "Spotify"; spotify.enable = mkEnableOpt "Spotify";
flatseal.enable = mkEnableOpt "Flatseal"; flatseal.enable = mkEnableOpt "Flatseal";
bottles.enable = mkEnableOpt "Bottles"; bottles.enable = mkEnableOpt "Bottles";
obsidian.enable = mkEnableOpt "Obsidian";
jabref.enable = mkEnableOpt "Jabref";
# xwaylandvideobridge = mkEnableOpt "XWayland Video Bridge"; # TODO
# 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
extraInstall = mkOption { extraInstall = mkOption {
@ -149,6 +152,8 @@ with mylib.modules;
(optionals cfg.spotify.enable ["com.spotify.Client"]) (optionals cfg.spotify.enable ["com.spotify.Client"])
(optionals cfg.flatseal.enable ["com.github.tchx84.Flatseal"]) (optionals cfg.flatseal.enable ["com.github.tchx84.Flatseal"])
(optionals cfg.bottles.enable ["com.usebottles.bottles"]) (optionals cfg.bottles.enable ["com.usebottles.bottles"])
(optionals cfg.obsidian.enable ["md.obsidian.Obsidian"])
(optionals cfg.jabref.enable ["org.jabref.Jabref"])
cfg.extraInstall cfg.extraInstall
]; ];
@ -168,6 +173,8 @@ with mylib.modules;
(optionals (!cfg.spotify.enable) ["com.spotify.Client"]) (optionals (!cfg.spotify.enable) ["com.spotify.Client"])
(optionals (!cfg.flatseal.enable) ["com.github.tchx84.Flatseal"]) (optionals (!cfg.flatseal.enable) ["com.github.tchx84.Flatseal"])
(optionals (!cfg.bottles.enable) ["com.usebottles.bottles"]) (optionals (!cfg.bottles.enable) ["com.usebottles.bottles"])
(optionals (!cfg.obsidian.enable) ["md.obsidian.Obsidian"])
(optionals (!cfg.jabref.enable) ["org.jabref.Jabref"])
# Remove only the flatpaks that are not present in extraInstall # Remove only the flatpaks that are not present in extraInstall
(without cfg.extraRemove cfg.extraInstall) (without cfg.extraRemove cfg.extraInstall)
]; ];

34
home/modules/gaming.nix
View File

@ -22,17 +22,18 @@ in {
options.modules.gaming = { options.modules.gaming = {
enable = mkEnableOpt "Gaming module"; enable = mkEnableOpt "Gaming module";
discordElectron.enable = mkEnableOpt "Discord (Electron) (nixpkgs)"; # 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)";
dwarffortress.enable = mkEnableOpt "Dwarf Fortress"; # dwarffortress.enable = mkEnableOpt "Dwarf Fortress";
steam = { steam = {
enable = mkEnableOpt "Steam (flatpak)"; enable = mkEnableOpt "Steam (flatpak)";
protonGE = mkBoolOpt false "Enable Steam Proton GloriousEggroll runner (flatpak)"; protonGE = mkBoolOpt false "Enable Steam Proton GloriousEggroll runner (flatpak)";
gamescope = mkBoolOpt false "Enable the gamescope micro compositor (flatpak)"; gamescope = mkBoolOpt false "Enable the gamescope micro compositor (flatpak)";
adwaita = mkBoolOpt false "Enable the adwaita-for-steam skin"; adwaita = mkBoolOpt false "Enable the adwaita-for-steam skin";
protonup = mkBoolOpt false "Enable ProtonUP-QT";
}; };
}; };
@ -63,16 +64,16 @@ in {
] ]
# TODO: Extra config (extensions etc) in chromium module # TODO: Extra config (extensions etc) in chromium module
(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
# (optionals cfg.steam.enable [ protontricks ]) # (optionals cfg.steam.enable [ protontricks ])
(optionals cfg.dwarffortress.enable [dwarf-fortress-packages.dwarf-fortress-full]) # (optionals cfg.dwarffortress.enable [dwarf-fortress-packages.dwarf-fortress-full])
]; ];
# This doesn't work because steam doesn't detect symlinked skins, files have to be copied # This doesn't work because steam doesn't detect symlinked skins, files have to be copied
@ -110,17 +111,18 @@ in {
}) })
]; ];
xdg.desktopEntries.discordChromium = mkIf cfg.discordChromium.enable { # xdg.desktopEntries.discordChromium = mkIf cfg.discordChromium.enable {
name = "Discord (Chromium)"; # name = "Discord (Chromium)";
genericName = "Online voice chat"; # genericName = "Online voice chat";
icon = "discord"; # icon = "discord";
exec = "chromium --new-window discord.com/app"; # exec = "chromium --new-window discord.com/app";
terminal = false; # terminal = false;
categories = ["Network" "Chat"]; # categories = ["Network" "Chat"];
}; # };
# TODO: Remove the bottles option from the gaming module (move it to the flatpak module)
# NOTE: Important to not disable this option if another module enables it # NOTE: Important to not disable this option if another module enables it
modules.flatpak.bottles.enable = mkIf cfg.bottles.enable true; # modules.flatpak.bottles.enable = mkIf cfg.bottles.enable true;
modules.flatpak.extraOverride = [ modules.flatpak.extraOverride = [
# Allow Bottles to manage proton prefixes # Allow Bottles to manage proton prefixes
@ -157,6 +159,7 @@ in {
"net.davidotek.pupgui2" "net.davidotek.pupgui2"
]) ])
(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.steam.enable && cfg.steam.protonup) ["net.davidotek.pupgui2"])
(optionals cfg.prism.enable ["org.prismlauncher.PrismLauncher"]) (optionals cfg.prism.enable ["org.prismlauncher.PrismLauncher"])
]; ];
@ -173,6 +176,7 @@ in {
"net.davidotek.pupgui2" "net.davidotek.pupgui2"
]) ])
(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.steam.enable || !cfg.steam.protonup) ["net.davidotek.pupgui2"])
(optionals (!cfg.prism.enable) ["org.prismlauncher.PrismLauncher"]) (optionals (!cfg.prism.enable) ["org.prismlauncher.PrismLauncher"])
]; ];
}; };