added formatter + reformat existing codebase (#175)

This commit is contained in:
Gaétan Lepage 2023-02-20 11:42:13 +01:00 committed by GitHub
parent 0bf4313f22
commit 264de8cefb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
96 changed files with 3727 additions and 3341 deletions

View file

@ -1,9 +1,10 @@
{ lib, pkgs, ... }:
let
inherit (lib) mkEnableOption mkOption mkOptionType mkForce mkMerge mkIf types;
in
{
lib,
pkgs,
...
}: let
inherit (lib) mkEnableOption mkOption mkOptionType mkForce mkMerge mkIf types;
in {
helpers = mkOption {
type = mkOptionType {
name = "helpers";
@ -11,6 +12,6 @@ in
check = builtins.isAttrs;
};
description = "Use this option to access the helpers";
default = import ../plugins/helpers.nix { inherit (pkgs) lib; };
default = import ../plugins/helpers.nix {inherit (pkgs) lib;};
};
}

View file

@ -1,25 +1,29 @@
modules:
{ pkgs, config, lib, ... }@args:
let
modules: {
pkgs,
config,
lib,
...
} @ args: let
inherit (lib) mkEnableOption mkOption mkOptionType mkForce mkMerge mkIf types;
shared = import ./_shared.nix args;
cfg = config.programs.nixvim;
in
{
in {
options = {
programs.nixvim = mkOption {
type = types.submodule ((modules pkgs) ++ [{
options.enable = mkEnableOption "nixvim";
config.wrapRc = mkForce true;
}]);
type = types.submodule ((modules pkgs)
++ [
{
options.enable = mkEnableOption "nixvim";
config.wrapRc = mkForce true;
}
]);
};
nixvim.helpers = shared.helpers;
};
config = mkIf cfg.enable mkMerge [
{
environment.systemPackages = [ cfg.finalPackage ];
environment.systemPackages = [cfg.finalPackage];
}
{
warnings = cfg.warnings;

View file

@ -1,30 +1,35 @@
modules:
{ pkgs, config, lib, ... }@args:
let
modules: {
pkgs,
config,
lib,
...
} @ args: let
inherit (lib) mkEnableOption mkOption mkOptionType mkMerge mkIf types;
shared = import ./_shared.nix args;
cfg = config.programs.nixvim;
in
{
in {
options = {
programs.nixvim = mkOption {
type = types.submodule ((modules pkgs) ++ [{
options.enable = mkEnableOption "nixvim";
}]);
type = types.submodule ((modules pkgs)
++ [
{
options.enable = mkEnableOption "nixvim";
}
]);
};
nixvim.helpers = shared.helpers;
};
config = mkIf cfg.enable
config =
mkIf cfg.enable
(mkMerge [
{ home.packages = [ cfg.finalPackage ]; }
{home.packages = [cfg.finalPackage];}
(mkIf (!cfg.wrapRc) {
xdg.configFile."nvim/init.lua".text = cfg.initContent;
})
({
{
warnings = cfg.warnings;
assertions = cfg.assertions;
})
}
]);
}

View file

@ -1,31 +1,36 @@
modules:
{ pkgs, config, lib, ... }@args:
let
modules: {
pkgs,
config,
lib,
...
} @ args: let
inherit (lib) mkEnableOption mkOption mkOptionType mkMerge mkIf types;
shared = import ./_shared.nix args;
cfg = config.programs.nixvim;
in
{
in {
options = {
programs.nixvim = mkOption {
type = types.submodule ((modules pkgs) ++ [{
options.enable = mkEnableOption "nixvim";
}]);
type = types.submodule ((modules pkgs)
++ [
{
options.enable = mkEnableOption "nixvim";
}
]);
};
nixvim.helpers = shared.helpers;
};
config = mkIf cfg.enable
config =
mkIf cfg.enable
(mkMerge [
{ environment.systemPackages = [ cfg.finalPackage ]; }
{environment.systemPackages = [cfg.finalPackage];}
(mkIf (!cfg.wrapRc) {
environment.etc."nvim/sysinit.lua".text = cfg.initContent;
environment.variables."VIM" = "/etc/nvim";
})
({
{
warnings = cfg.warnings;
assertions = cfg.assertions;
})
}
]);
}

View file

@ -1,13 +1,13 @@
default_pkgs: modules: {pkgs ? default_pkgs, module}:
let
default_pkgs: modules: {
pkgs ? default_pkgs,
module,
}: let
inherit (pkgs) lib;
wrap = { wrapRc = true; };
wrap = {wrapRc = true;};
eval = lib.evalModules {
modules = (modules pkgs) ++ [ module wrap ];
modules = (modules pkgs) ++ [module wrap];
};
in eval.config.finalPackage
in
eval.config.finalPackage