flake: inherit explicitly from parts of lib

Instead of doing `inherit (lib) <something>``, all inherits now use
`inherit (lib.<subsystem>) <something>`, which is much nicer.
This commit is contained in:
Bloxx12 2025-04-09 15:31:18 +02:00
commit 53aaa26fa1
29 changed files with 67 additions and 45 deletions

View file

@ -1,5 +1,6 @@
{lib, ...}: let
inherit (lib) mkEnableOption mkOption types;
inherit (lib.types) str enum;
inherit (lib.options) mkEnableOption mkOption;
in {
options.modules.system.programs = {
editors = {
@ -19,30 +20,30 @@ in {
git = {
signingKey = mkOption {
type = types.str;
type = str;
default = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILPiRe9OH/VtWFWyy5QbAVcN7CLxr4zUtRCwmxD6aeN6";
description = "The default gpg key used for signing commits";
};
};
default = {
terminal = mkOption {
type = types.enum ["foot" "kitty"];
type = enum ["foot" "kitty"];
default = "foot";
};
fileManager = mkOption {
type = types.enum ["thunar" "dolphin" "nemo"];
type = enum ["thunar" "dolphin" "nemo"];
default = "thunar";
};
browser = mkOption {
type = types.enum ["firefox" "librewolf" "chromium"];
type = enum ["firefox" "librewolf" "chromium"];
default = "firefox";
};
editor = mkOption {
type = types.enum ["neovim" "helix" "emacs"];
type = enum ["neovim" "helix" "emacs"];
default = "emacs";
};
launcher = mkOption {
type = types.enum ["anyrun" "rofi" "wofi"];
type = enum ["anyrun" "rofi" "wofi"];
default = "anyrun";
};
};