Add wsl
This commit is contained in:
parent
4a8e226066
commit
c57a9984c1
8 changed files with 28 additions and 42 deletions
|
|
@ -149,7 +149,7 @@
|
|||
|
||||
config = (
|
||||
lib.optionalAttrs (options ? fileSystems) {
|
||||
fileSystems = lib.mkIf (config.mods.drives.variant == "manual") (
|
||||
fileSystems = lib.mkIf (config.mods.drives.variant == "manual" && !config.conf.wsl) (
|
||||
builtins.listToAttrs (
|
||||
map (
|
||||
{
|
||||
|
|
@ -196,7 +196,7 @@
|
|||
}
|
||||
);
|
||||
|
||||
swapDevices = lib.mkIf (config.mods.drives.useSwap && config.mods.drives.variant == "manual") [
|
||||
swapDevices = lib.mkIf (config.mods.drives.useSwap && config.mods.drives.variant == "manual" && !config.conf.wsl) [
|
||||
{device = "/dev/disk/by-label/SWAP";}
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -7,37 +7,15 @@
|
|||
}: {
|
||||
options.mods.flatpak = {
|
||||
enable = lib.mkOption {
|
||||
default = true;
|
||||
example = false;
|
||||
default = false;
|
||||
example = true;
|
||||
type = lib.types.bool;
|
||||
description = "Enables the flatpak package manager";
|
||||
};
|
||||
additional_packages = lib.mkOption {
|
||||
default = [];
|
||||
example = [];
|
||||
type = with lib.types; listOf str;
|
||||
description = "Flatpak packages";
|
||||
};
|
||||
};
|
||||
config = lib.mkIf config.mods.flatpak.enable (
|
||||
lib.optionalAttrs (options ? services.flatpak.remote) {
|
||||
lib.optionalAttrs (options ? environment.systemPackages) {
|
||||
environment.systemPackages = [pkgs.flatpak];
|
||||
services.flatpak.remotes = lib.mkOptionDefault [
|
||||
{
|
||||
name = "flathub-stable";
|
||||
location = "https://dl.flathub.org/repo/flathub.flatpakrepo";
|
||||
}
|
||||
];
|
||||
services.flatpak.uninstallUnmanaged = true;
|
||||
}
|
||||
// lib.optionalAttrs (options ? services.flatpak.packages) {
|
||||
services.flatpak.packages =
|
||||
[
|
||||
# fallback if necessary, but generally avoided as nix is superior :)
|
||||
# default flatseal installation since flatpak permissions are totally not a broken idea
|
||||
"com.github.tchx84.Flatseal"
|
||||
]
|
||||
++ config.mods.flatpak.additional_packages;
|
||||
}
|
||||
);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue