Use alejandra formatter / fix warnings

This commit is contained in:
DashieTM 2025-02-15 16:23:22 +01:00
parent c5b1041bbb
commit 693d4e3c70
70 changed files with 1424 additions and 1547 deletions

View file

@ -3,10 +3,8 @@
lib,
options,
pkgs,
inputs,
...
}:
{
}: {
options.mods = {
basePackages = {
enable = lib.mkOption {
@ -18,8 +16,8 @@
'';
};
additionalPackages = lib.mkOption {
default = [ ];
example = [ pkgs.openssl ];
default = [];
example = [pkgs.openssl];
type = with lib.types; listOf package;
description = ''
Additional packages to install.
@ -27,16 +25,16 @@
'';
};
specialPrograms = lib.mkOption {
default = { };
example = { };
default = {};
example = {};
type = with lib.types; attrsOf anything;
description = ''
special program configuration to be added which require programs.something notation.
'';
};
specialServices = lib.mkOption {
default = { };
example = { };
default = {};
example = {};
type = with lib.types; attrsOf anything;
description = ''
special services configuration to be added which require an services.something notation.
@ -47,42 +45,43 @@
config = lib.optionalAttrs (options ? environment.systemPackages) {
environment.systemPackages =
if config.mods.basePackages.enable then
if config.mods.basePackages.enable
then
with pkgs;
[
adwaita-icon-theme
dbus
dconf
direnv
glib
gnome.nixos-gsettings-overrides
gsettings-desktop-schemas
gtk-layer-shell
gtk3
gtk4
gtk4-layer-shell
hicolor-icon-theme
icon-library
kdePackages.breeze-icons
kdePackages.breeze
libsForQt5.breeze-qt5
kdePackages.qtstyleplugin-kvantum
libsForQt5.qtstyleplugin-kvantum
libadwaita
libxkbcommon
nixfmt-rfc-style
openssl
seahorse
upower
xorg.xkbutils
]
++ config.mods.basePackages.additionalPackages
else
config.mods.basePackages.additionalPackages;
[
adwaita-icon-theme
dbus
dconf
direnv
glib
gnome.nixos-gsettings-overrides
gsettings-desktop-schemas
gtk-layer-shell
gtk3
gtk4
gtk4-layer-shell
hicolor-icon-theme
icon-library
kdePackages.breeze-icons
kdePackages.breeze
libsForQt5.breeze-qt5
kdePackages.qtstyleplugin-kvantum
libsForQt5.qtstyleplugin-kvantum
libadwaita
libxkbcommon
alejandra
openssl
seahorse
upower
xorg.xkbutils
]
++ config.mods.basePackages.additionalPackages
else config.mods.basePackages.additionalPackages;
gtk.iconCache.enable = false;
services =
if config.mods.basePackages.enable then
if config.mods.basePackages.enable
then
{
upower.enable = true;
dbus = {
@ -95,11 +94,11 @@
};
}
// config.mods.basePackages.specialServices
else
config.mods.basePackages.specialServices;
else config.mods.basePackages.specialServices;
programs =
if config.mods.basePackages.enable then
if config.mods.basePackages.enable
then
{
nix-ld = {
enable = true;
@ -121,8 +120,6 @@
gnupg.agent.enable = true;
}
// config.mods.basePackages.specialPrograms
else
config.mods.basePackages.specialPrograms;
else config.mods.basePackages.specialPrograms;
};
}