Secure boot and wsl (#10)

- Add secure boot via lanzaboote
- Add wsl flag
- Remove flatpak flake
This commit is contained in:
Dashie 2025-05-02 10:16:15 +02:00 committed by GitHub
parent 8cf9a40763
commit 32f0512ef5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 51 additions and 41 deletions

View file

@ -74,6 +74,7 @@
seahorse
upower
xorg.xkbutils
sbctl
]
++ config.mods.basePackages.additionalPackages
else config.mods.basePackages.additionalPackages;

View file

@ -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";}
];

View file

@ -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;
}
);
}

View file

@ -147,7 +147,7 @@ in {
"$mod SUPER,E,exec,nautilus -w"
"$mod SUPER,N,exec,neovide"
"$mod SUPER,M,exec,oxidash"
"$mod SUPER,R,exec,anyrun"
"$mod SUPER,R,exec,oxirun"
"$mod SUPER,G,exec,oxicalc"
"$mod SUPER,D,exec,oxishut"
"$mod SUPER,A,exec,oxipaste-iced"