fix(lint): nixfmt the whole tree

This commit is contained in:
Antoine Viallon 2026-03-22 21:56:13 +01:00
parent 643b136863
commit bf219a30c2
Signed by: aviallon
GPG key ID: 186FC35EDEB25716
69 changed files with 2605 additions and 1726 deletions

View file

@ -1,4 +1,9 @@
{ config, pkgs, lib, ... }:
{
config,
pkgs,
lib,
...
}:
with lib;
{
options.aviallon.programs.bash = {

View file

@ -1,17 +1,27 @@
{config, pkgs, lib, ...}:
{
config,
pkgs,
lib,
...
}:
with lib;
let
genPrefList = {locked ? false}: prefs:
genPrefList =
{
locked ? false,
}:
prefs:
let
prefFuncName = if locked then "lockPref" else "defaultPref";
in
concatStringsSep "\n" (
mapAttrsToList
(key: value: ''${prefFuncName}(${builtins.toJSON key}, ${builtins.toJSON value});'' )
prefs
);
mapAttrsToList (
key: value: ''${prefFuncName}(${builtins.toJSON key}, ${builtins.toJSON value});''
) prefs
);
cfg = config.programs.firefox;
in {
in
{
config = mkIf cfg.enable {
programs.firefox.wrapperConfig = {
smartcardSupport = true;
@ -60,7 +70,7 @@ in {
Install = [
"uBlock0@raymondhill.net"
"magnolia@12.34"
];
];
};
ExtensionSettings = {
"uBlock0@raymondhill.net" = {
@ -126,8 +136,9 @@ in {
#"privacy.trackingprotection.origin_telemetry.enabled" = false;
} // {
"intl.accept_languages" = "fr-fr,en-us,en";
}
// {
"intl.accept_languages" = "fr-fr,en-us,en";
"intl.locale.requested" = "fr,en-US";
"media.eme.enabled" = true; # DRM
"general.autoScroll" = true; # Middleclick scrolling

View file

@ -1,4 +1,10 @@
{config, pkgs, lib, myLib, ...}:
{
config,
pkgs,
lib,
myLib,
...
}:
with lib;
{
programs.git = {

View file

@ -1,12 +1,17 @@
{config, pkgs, lib, ...}:
{
config,
pkgs,
lib,
...
}:
{
programs.htop.enable = true;
programs.htop.settings = {
# fields=0 48 17 18 38 39 40 2 46 47 49 1
# sort_key=46
# sort_direction=-1
# tree_sort_key=0
# tree_sort_direction=1
# fields=0 48 17 18 38 39 40 2 46 47 49 1
# sort_key=46
# sort_direction=-1
# tree_sort_key=0
# tree_sort_direction=1
hide_kernel_threads = true;
hide_userland_threads = true;
shadow_other_users = 0;
@ -38,9 +43,29 @@
delay = 10;
hide_function_bar = 0;
header_layout = "two_50_50";
column_meters_0 = [ "AllCPUs" "Memory" "Swap" ];
column_meter_modes_0 = [ 1 1 1 ];
column_meters_1 = [ "Tasks" "LoadAverage" "Uptime" "DiskIO" "NetworkIO" ];
column_meter_modes_1 = [ 2 2 2 2 2 ];
column_meters_0 = [
"AllCPUs"
"Memory"
"Swap"
];
column_meter_modes_0 = [
1
1
1
];
column_meters_1 = [
"Tasks"
"LoadAverage"
"Uptime"
"DiskIO"
"NetworkIO"
];
column_meter_modes_1 = [
2
2
2
2
2
];
};
}

View file

@ -1,14 +1,26 @@
{ config, pkgs, lib, myLib, ... }:
{
config,
pkgs,
lib,
myLib,
...
}:
with lib;
let
cfg = config.aviallon.programs.libreoffice;
applyOverrides = overrides: pkg: pipe pkg overrides;
in {
in
{
options.aviallon.programs.libreoffice = {
enable = mkEnableOption "LibreOffice";
variant = mkOption {
type = with types; types.enum [ "still" "fresh" ];
type =
with types;
types.enum [
"still"
"fresh"
];
default = "fresh";
description = "Which LibreOffice variant to use";
};
@ -35,18 +47,26 @@ in {
config = mkIf cfg.enable {
aviallon.programs.libreoffice.package =
let
overridesList = []
++ [(pkg: pkg.override {
variant = cfg.variant;
})]
++ optional cfg.opencl (pkg: pkg.overrideAttrs (old: {
overridesList =
[ ]
++ [
(
pkg:
pkg.override {
variant = cfg.variant;
}
)
]
++ optional cfg.opencl (
pkg:
pkg.overrideAttrs (old: {
buildInputs = old.buildInputs ++ [ pkgs.ocl-icd ];
}))
;
in pkgs.libreoffice.override {
unwrapped = applyOverrides overridesList cfg.package';
};
})
);
in
pkgs.libreoffice.override {
unwrapped = applyOverrides overridesList cfg.package';
};
environment.systemPackages = [
cfg.package

View file

@ -1,4 +1,4 @@
{config, pkgs, ...}:
{ config, pkgs, ... }:
{
environment.systemPackages = [ pkgs.nanorc ];
programs.nano.syntaxHighlight = false;

View file

@ -1,16 +1,32 @@
{ config, pkgs, lib, myLib, ... }:
{
config,
pkgs,
lib,
myLib,
...
}:
with lib;
let
cfg = config.aviallon.programs.nvtop;
in {
in
{
options.aviallon.programs.nvtop = {
enable = mkEnableOption "nvtop";
backend = mkOption {
description = "Which backend to enable";
type = with types; listOf (enum [ "nvidia" "amd" "intel" "panthor" "panfrost" "msm" ]);
type =
with types;
listOf (enum [
"nvidia"
"amd"
"intel"
"panthor"
"panfrost"
"msm"
]);
default = [ "amd" ];
};
nvidia = mkEnableOption "Nvidia GPU with proprietary drivers is used";
package = mkOption {
internal = true;
@ -25,7 +41,8 @@ in {
aviallon.programs.nvtop.package = mkDefault (
if (length cfg.backend > 1) then
pkgs.nvtopPackages.full
else pkgs.nvtopPackages.${elemAt cfg.backend 0}
else
pkgs.nvtopPackages.${elemAt cfg.backend 0}
);
environment.systemPackages = [