diff --git a/checks/all-modules-have-maintainers.nix b/checks/all-modules-have-maintainers.nix index ac15daa0..11838565 100644 --- a/checks/all-modules-have-maintainers.nix +++ b/checks/all-modules-have-maintainers.nix @@ -1,7 +1,4 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let # Get all modules and check their maintainers diff --git a/checks/apply.nix b/checks/apply.nix index 6b30049d..595d965c 100644 --- a/checks/apply.nix +++ b/checks/apply.nix @@ -1,18 +1,10 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let # Create a simple wrapper module helloModule = self.lib.wrapModule ( - { config, lib, ... }: - { - options.test = lib.mkOption { - type = lib.types.submodule { - freeformType = lib.types.attrs; - }; - }; + { config, lib, ... }: { + options.test = lib.mkOption { type = lib.types.submodule { freeformType = lib.types.attrs; }; }; config.package = config.pkgs.hello; config.flags = { "--ff" = config.test.freeform; @@ -30,8 +22,7 @@ let # Extend the configuration extendedConfig = initialConfig.apply ( - { lib, ... }: - { + { lib, ... }: { test.freeform = "freeform2"; flags."--greeting" = "extended"; flags."--extra" = "flag"; @@ -40,8 +31,7 @@ let # Test mkForce to override a value forcedConfig = initialConfig.apply ( - { lib, ... }: - { + { lib, ... }: { flags."--greeting" = lib.mkForce "forced"; flags."--forced-flag" = true; } @@ -54,16 +44,14 @@ let # Test chaining apply multiple levels deep doubleApply = extendedConfig.apply ( - { lib, ... }: - { + { lib, ... }: { flags."--greeting" = lib.mkOverride 90 "double"; flags."--double" = "level2"; } ); tripleApply = doubleApply.apply ( - { lib, ... }: - { + { lib, ... }: { flags."--greeting" = lib.mkOverride 80 "triple"; flags."--triple" = "level3"; } diff --git a/checks/args-direct.nix b/checks/args-direct.nix index 35ecab32..d3e22ca0 100644 --- a/checks/args-direct.nix +++ b/checks/args-direct.nix @@ -1,7 +1,4 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let wrappedPackage = self.lib.wrapPackage { diff --git a/checks/escape-shell-arg-with-env.nix b/checks/escape-shell-arg-with-env.nix index 88ac0d2e..2b198f57 100644 --- a/checks/escape-shell-arg-with-env.nix +++ b/checks/escape-shell-arg-with-env.nix @@ -1,7 +1,4 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let lib = pkgs.lib; escape = self.lib.escapeShellArgWithEnv; diff --git a/checks/exe-path-bin-name.nix b/checks/exe-path-bin-name.nix index b1299e3c..49495de4 100644 --- a/checks/exe-path-bin-name.nix +++ b/checks/exe-path-bin-name.nix @@ -1,7 +1,4 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let lib = pkgs.lib; diff --git a/checks/extend.nix b/checks/extend.nix index b31cde07..77ca2025 100644 --- a/checks/extend.nix +++ b/checks/extend.nix @@ -1,15 +1,11 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let lib = pkgs.lib; # Create a wrapper module with a custom option customModule = self.lib.wrapModule ( - { config, ... }: - { + { config, ... }: { options = { customGreeting = lib.mkOption { type = lib.types.str; @@ -32,14 +28,11 @@ let }; # Test 1: extend returns a module with config, extendModules, etc. - extended1 = initialConfig.extend { - customGreeting = lib.mkForce "extended"; - }; + extended1 = initialConfig.extend { customGreeting = lib.mkForce "extended"; }; # Test 2: Add a new option via extend extended2 = initialConfig.extend ( - { config, ... }: - { + { config, ... }: { options = { verboseMode = lib.mkOption { type = lib.types.bool; @@ -53,16 +46,11 @@ let ); # Test 3: Use the new option - extended3 = extended2.extendModules { - modules = [ - { verboseMode = true; } - ]; - }; + extended3 = extended2.extendModules { modules = [ { verboseMode = true; } ]; }; # Test 4: Combine custom option changes with new options extended4 = initialConfig.extend ( - { config, ... }: - { + { config, ... }: { options = { extraFlag = lib.mkOption { type = lib.types.str; @@ -76,11 +64,7 @@ let ); # Test 5: Override the new option - extended5 = extended4.extendModules { - modules = [ - { extraFlag = "overridden"; } - ]; - }; + extended5 = extended4.extendModules { modules = [ { extraFlag = "overridden"; } ]; }; in pkgs.runCommand "extend-test" { } '' diff --git a/checks/filesToExclude-glob.nix b/checks/filesToExclude-glob.nix index c630230a..cab3c2d0 100644 --- a/checks/filesToExclude-glob.nix +++ b/checks/filesToExclude-glob.nix @@ -1,7 +1,4 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let # Create a dummy package with multiple binaries and other files diff --git a/checks/filesToExclude-module.nix b/checks/filesToExclude-module.nix index e0309596..5ab86155 100644 --- a/checks/filesToExclude-module.nix +++ b/checks/filesToExclude-module.nix @@ -1,7 +1,4 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let # Create a dummy package with multiple binaries and other files diff --git a/checks/filesToExclude.nix b/checks/filesToExclude.nix index ef6782fd..894a2edc 100644 --- a/checks/filesToExclude.nix +++ b/checks/filesToExclude.nix @@ -1,7 +1,4 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let # Create a dummy package with multiple binaries and other files diff --git a/checks/filesToPatch.nix b/checks/filesToPatch.nix index 6010a2ff..78eddb5a 100644 --- a/checks/filesToPatch.nix +++ b/checks/filesToPatch.nix @@ -1,7 +1,4 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let # Create a dummy package with a desktop file that references itself diff --git a/checks/flags-empty-list.nix b/checks/flags-empty-list.nix index 0a351b9d..0d7d4416 100644 --- a/checks/flags-empty-list.nix +++ b/checks/flags-empty-list.nix @@ -1,7 +1,4 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let wrappedPackage = self.lib.wrapPackage { diff --git a/checks/flags-equals-separator.nix b/checks/flags-equals-separator.nix index bd884e7a..a216ed9d 100644 --- a/checks/flags-equals-separator.nix +++ b/checks/flags-equals-separator.nix @@ -1,7 +1,4 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let wrappedPackage = self.lib.wrapPackage { diff --git a/checks/flags-false.nix b/checks/flags-false.nix index dcd0180e..198f2f39 100644 --- a/checks/flags-false.nix +++ b/checks/flags-false.nix @@ -1,7 +1,4 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let wrappedPackage = self.lib.wrapPackage { diff --git a/checks/flags-list.nix b/checks/flags-list.nix index 6092ecf6..3779d216 100644 --- a/checks/flags-list.nix +++ b/checks/flags-list.nix @@ -1,7 +1,4 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let wrappedWithSpaceSep = self.lib.wrapPackage { diff --git a/checks/flags-module.nix b/checks/flags-module.nix index 0352ba88..293eb915 100644 --- a/checks/flags-module.nix +++ b/checks/flags-module.nix @@ -1,12 +1,8 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let helloModule = self.lib.wrapModule ( - { config, ... }: - { + { config, ... }: { config.package = config.pkgs.hello; config.flags = { "--greeting" = "world"; diff --git a/checks/flags-order.nix b/checks/flags-order.nix index 64d79fe6..8ffad8dc 100644 --- a/checks/flags-order.nix +++ b/checks/flags-order.nix @@ -1,12 +1,8 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let helloModule = self.lib.wrapModule ( - { config, ... }: - { + { config, ... }: { config.package = config.pkgs.hello; config.flags = { # default order 1000: before "$@" (which is 1001) diff --git a/checks/flags-space-separator.nix b/checks/flags-space-separator.nix index 08c58fb4..ebe8b9ce 100644 --- a/checks/flags-space-separator.nix +++ b/checks/flags-space-separator.nix @@ -1,7 +1,4 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let wrappedPackage = self.lib.wrapPackage { diff --git a/checks/formatting.nix b/checks/formatting.nix index cdfb2bf2..e127f828 100644 --- a/checks/formatting.nix +++ b/checks/formatting.nix @@ -1,7 +1,4 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: pkgs.runCommand "formatting-check" { } '' cp -r ${../.}/ src diff --git a/checks/meta-maintainers.nix b/checks/meta-maintainers.nix index b85e29e5..cf2ae5fa 100644 --- a/checks/meta-maintainers.nix +++ b/checks/meta-maintainers.nix @@ -1,15 +1,11 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let # Test with a nixpkgs maintainer (lassulus) nixpkgsMaintainer = pkgs.lib.maintainers.lassulus; helloModule = self.lib.wrapModule ( - { config, ... }: - { + { config, ... }: { config.package = config.pkgs.hello; config.meta.maintainers = [ nixpkgsMaintainer ]; } diff --git a/checks/meta-platforms.nix b/checks/meta-platforms.nix index 39edc071..4b14abd8 100644 --- a/checks/meta-platforms.nix +++ b/checks/meta-platforms.nix @@ -1,23 +1,14 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let # Test 1: Default platforms (should be lib.platforms.all) - helloModuleDefault = self.lib.wrapModule ( - { config, ... }: - { - config.package = config.pkgs.hello; - } - ); + helloModuleDefault = self.lib.wrapModule ({ config, ... }: { config.package = config.pkgs.hello; }); moduleConfigDefault = helloModuleDefault.apply { inherit pkgs; }; # Test 2: Custom platforms (linux only) helloModuleLinux = self.lib.wrapModule ( - { config, ... }: - { + { config, ... }: { config.package = config.pkgs.hello; config.meta.platforms = pkgs.lib.platforms.linux; } @@ -27,8 +18,7 @@ let # Test 3: Specific platforms list helloModuleSpecific = self.lib.wrapModule ( - { config, ... }: - { + { config, ... }: { config.package = config.pkgs.hello; config.meta.platforms = [ "x86_64-linux" diff --git a/checks/no-module-prefix-in-checks.nix b/checks/no-module-prefix-in-checks.nix index 0f832abf..1283ec30 100644 --- a/checks/no-module-prefix-in-checks.nix +++ b/checks/no-module-prefix-in-checks.nix @@ -1,7 +1,4 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let # Get all check files in checks/ directory diff --git a/checks/patchHook.nix b/checks/patchHook.nix index 26ef8915..3faf8610 100644 --- a/checks/patchHook.nix +++ b/checks/patchHook.nix @@ -1,7 +1,4 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let # Create a dummy package with a desktop file that references itself @@ -24,19 +21,15 @@ let }; in -pkgs.runCommand "patchHook-test" - { - wrappedPath = "${wrappedPackage}"; - } - '' - echo "Testing patchHook functionality..." - echo "Wrapped package path: $wrappedPath" +pkgs.runCommand "patchHook-test" { wrappedPath = "${wrappedPackage}"; } '' + echo "Testing patchHook functionality..." + echo "Wrapped package path: $wrappedPath" - if [ ! -f "$wrappedPath/test" ]; then - echo "FAIL: file not created in patched package" - exit 1 - fi + if [ ! -f "$wrappedPath/test" ]; then + echo "FAIL: file not created in patched package" + exit 1 + fi - echo "SUCCESS: patchHook executed correctly" - touch $out - '' + echo "SUCCESS: patchHook executed correctly" + touch $out +'' diff --git a/checks/systemd.nix b/checks/systemd.nix index 9fc04dac..e03d8915 100644 --- a/checks/systemd.nix +++ b/checks/systemd.nix @@ -1,7 +1,4 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let lib = pkgs.lib; diff --git a/checks/types-file-env-var.nix b/checks/types-file-env-var.nix index 00b7f0c9..3e65c339 100644 --- a/checks/types-file-env-var.nix +++ b/checks/types-file-env-var.nix @@ -1,14 +1,10 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let lib = pkgs.lib; # Test wrapper module using environment variable path testModule = self.lib.wrapModule ( - { config, wlib, ... }: - { + { config, wlib, ... }: { options = { "config.txt" = lib.mkOption { type = wlib.types.file config.pkgs; diff --git a/checks/types-file.nix b/checks/types-file.nix index 1340b9ae..f78efcb5 100644 --- a/checks/types-file.nix +++ b/checks/types-file.nix @@ -1,7 +1,4 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let lib = pkgs.lib; module.options = { @@ -26,9 +23,7 @@ let module { fileWithContent.content = "test content2"; } { fileWithPathOverride.path = "/etc/hosts2"; } - { - fileWithStorePathOverride.path = pkgs.writeText "custom-file2" "custom content2"; - } + { fileWithStorePathOverride.path = pkgs.writeText "custom-file2" "custom content2"; } ]; }; evaledModuleWithForce = lib.evalModules { @@ -36,9 +31,7 @@ let module { fileWithContent.content = lib.mkForce "test content3"; } { fileWithPathOverride.path = lib.mkForce "/etc/hosts3"; } - { - fileWithStorePathOverride.path = lib.mkForce (pkgs.writeText "custom-file3" "custom content3"); - } + { fileWithStorePathOverride.path = lib.mkForce (pkgs.writeText "custom-file3" "custom content3"); } ]; }; evaledModuleWithDefault = lib.evalModules { diff --git a/checks/wrapper-module-exe-path-bin-name.nix b/checks/wrapper-module-exe-path-bin-name.nix index 9eae5518..aadd66d8 100644 --- a/checks/wrapper-module-exe-path-bin-name.nix +++ b/checks/wrapper-module-exe-path-bin-name.nix @@ -1,7 +1,4 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let lib = pkgs.lib; diff --git a/default.nix b/default.nix index d2274b4c..1a29c22f 100644 --- a/default.nix +++ b/default.nix @@ -7,7 +7,5 @@ let in { lib = wlib; - wrapperModules = import ./modules.nix { - inherit lib wlib; - }; + wrapperModules = import ./modules.nix { inherit lib wlib; }; } diff --git a/lib/modules/meta.nix b/lib/modules/meta.nix index 3b30312b..f7aafb77 100644 --- a/lib/modules/meta.nix +++ b/lib/modules/meta.nix @@ -1,12 +1,10 @@ -{ lib, ... }: -{ +{ lib, ... }: { _file = "lib/modules/meta.nix"; options.meta = { maintainers = lib.mkOption { type = lib.types.listOf ( lib.types.submodule ( - { name, ... }: - { + { name, ... }: { options = { name = lib.mkOption { type = lib.types.str; diff --git a/lib/modules/package.nix b/lib/modules/package.nix index 90807a18..2b2d53bc 100644 --- a/lib/modules/package.nix +++ b/lib/modules/package.nix @@ -1,5 +1,4 @@ -{ lib, ... }: -{ +{ lib, ... }: { _file = "lib/modules/package.nix"; options = { pkgs = lib.mkOption { diff --git a/lib/modules/systemd.nix b/lib/modules/systemd.nix index 2bd4a630..f1b77133 100644 --- a/lib/modules/systemd.nix +++ b/lib/modules/systemd.nix @@ -1,8 +1,4 @@ -{ - config, - lib, - ... -}: +{ config, lib, ... }: let cfg = config.systemd; pkgs = config.pkgs; diff --git a/modules/bat/check.nix b/modules/bat/check.nix index 93df2f97..b44abe03 100644 --- a/modules/bat/check.nix +++ b/modules/bat/check.nix @@ -1,7 +1,4 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let batWrapped = (self.wrapperModules.bat.apply { diff --git a/modules/beets/check.nix b/modules/beets/check.nix index e05ffd31..50e06bda 100644 --- a/modules/beets/check.nix +++ b/modules/beets/check.nix @@ -1,7 +1,4 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let beetsWrapped = diff --git a/modules/btop/check.nix b/modules/btop/check.nix index cfb61dc1..41b4ff5c 100644 --- a/modules/btop/check.nix +++ b/modules/btop/check.nix @@ -1,7 +1,4 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let btopWrapped = diff --git a/modules/gh/check.nix b/modules/gh/check.nix index bcbb3e8c..6e428b6a 100644 --- a/modules/gh/check.nix +++ b/modules/gh/check.nix @@ -1,7 +1,4 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let ghWrapped = (self.wrapperModules.gh.apply { diff --git a/modules/ghostty/check.nix b/modules/ghostty/check.nix index a4f6fb43..d4b84e37 100644 --- a/modules/ghostty/check.nix +++ b/modules/ghostty/check.nix @@ -1,7 +1,4 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let ghosttyWrapped = diff --git a/modules/ghostty/module.nix b/modules/ghostty/module.nix index c69104d8..e5304a5c 100644 --- a/modules/ghostty/module.nix +++ b/modules/ghostty/module.nix @@ -5,9 +5,7 @@ ... }: let - kvFmt = config.pkgs.formats.keyValue { - listsAsDuplicateKeys = true; - }; + kvFmt = config.pkgs.formats.keyValue { listsAsDuplicateKeys = true; }; in { _class = "wrapper"; diff --git a/modules/git-cliff/check.nix b/modules/git-cliff/check.nix index 8ba0d087..bf72d33f 100644 --- a/modules/git-cliff/check.nix +++ b/modules/git-cliff/check.nix @@ -1,7 +1,4 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let gitCliffWrapped = (self.wrapperModules.git-cliff.apply { diff --git a/modules/git/check.nix b/modules/git/check.nix index b9720680..7a9d363e 100644 --- a/modules/git/check.nix +++ b/modules/git/check.nix @@ -1,7 +1,4 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let gitWrapped = diff --git a/modules/helix/check.nix b/modules/helix/check.nix index a45d76d1..390ebf10 100644 --- a/modules/helix/check.nix +++ b/modules/helix/check.nix @@ -1,13 +1,7 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let - helixWrapped = - (self.wrapperModules.helix.apply { - inherit pkgs; - }).wrapper; + helixWrapped = (self.wrapperModules.helix.apply { inherit pkgs; }).wrapper; in pkgs.runCommand "helix-test" { } '' diff --git a/modules/helix/module.nix b/modules/helix/module.nix index 1446ff52..c94a80f4 100644 --- a/modules/helix/module.nix +++ b/modules/helix/module.nix @@ -84,9 +84,7 @@ in type = wlib.types.file config.pkgs; default.path = tomlFmt.generate "helix-languages.toml" config.languages; }; - ignoreFile = lib.mkOption { - type = wlib.types.file config.pkgs; - }; + ignoreFile = lib.mkOption { type = wlib.types.file config.pkgs; }; extraFiles = lib.mkOption { type = lib.types.listOf ( lib.types.submodule { diff --git a/modules/hypridle/check.nix b/modules/hypridle/check.nix index 69dc867a..f4c316ba 100644 --- a/modules/hypridle/check.nix +++ b/modules/hypridle/check.nix @@ -1,7 +1,4 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let hypridleWrapped = diff --git a/modules/hypridle/module.nix b/modules/hypridle/module.nix index 32d08470..471732c8 100644 --- a/modules/hypridle/module.nix +++ b/modules/hypridle/module.nix @@ -118,9 +118,7 @@ in importantPrefixes = lib.mkOption { type = with lib.types; listOf str; - default = [ - "$" - ]; + default = [ "$" ]; description = '' List of important prefixes to source at the top of the config. @@ -161,9 +159,7 @@ in }; config.package = config.pkgs.hypridle; - config.filesToPatch = [ - "share/systemd/user/hypridle.service" - ]; + config.filesToPatch = [ "share/systemd/user/hypridle.service" ]; config.meta.platforms = lib.platforms.linux; diff --git a/modules/hyprland/check.nix b/modules/hyprland/check.nix index a78d345e..dcee1007 100644 --- a/modules/hyprland/check.nix +++ b/modules/hyprland/check.nix @@ -1,7 +1,4 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let hyprlandWrapped = diff --git a/modules/hyprlock/check.nix b/modules/hyprlock/check.nix index f025ac7c..11b72d58 100644 --- a/modules/hyprlock/check.nix +++ b/modules/hyprlock/check.nix @@ -1,7 +1,4 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let hyprlockWrapped = diff --git a/modules/i3/check.nix b/modules/i3/check.nix index ba8b54c8..518ac39f 100644 --- a/modules/i3/check.nix +++ b/modules/i3/check.nix @@ -1,7 +1,4 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let i3Wrapped = diff --git a/modules/i3/module.nix b/modules/i3/module.nix index 92ad05fc..8d18ae28 100644 --- a/modules/i3/module.nix +++ b/modules/i3/module.nix @@ -21,8 +21,6 @@ }; config.package = config.pkgs.i3; - config.meta.maintainers = [ - lib.maintainers.randomdude - ]; + config.meta.maintainers = [ lib.maintainers.randomdude ]; config.meta.platforms = lib.platforms.linux; } diff --git a/modules/jujutsu/check.nix b/modules/jujutsu/check.nix index 7f397702..c3ddf643 100644 --- a/modules/jujutsu/check.nix +++ b/modules/jujutsu/check.nix @@ -1,7 +1,4 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let jujutsuWrapped = diff --git a/modules/jujutsu/module.nix b/modules/jujutsu/module.nix index 330b7048..9ae4fceb 100644 --- a/modules/jujutsu/module.nix +++ b/modules/jujutsu/module.nix @@ -1,8 +1,4 @@ -{ - config, - lib, - ... -}: +{ config, lib, ... }: let tomlFmt = config.pkgs.formats.toml { }; @@ -25,9 +21,7 @@ in }; meta = { - maintainers = [ - lib.maintainers.dav-wolff - ]; + maintainers = [ lib.maintainers.dav-wolff ]; }; }; } diff --git a/modules/kanshi/check.nix b/modules/kanshi/check.nix index c412aed9..15c062de 100644 --- a/modules/kanshi/check.nix +++ b/modules/kanshi/check.nix @@ -1,7 +1,4 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let kanshiConfig = pkgs.writeText "kanshi-test-config" '' diff --git a/modules/kitty/check.nix b/modules/kitty/check.nix index d5166899..d1098748 100644 --- a/modules/kitty/check.nix +++ b/modules/kitty/check.nix @@ -1,7 +1,4 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let kittyWrapped = diff --git a/modules/mpv/check.nix b/modules/mpv/check.nix index 1348d4b7..7e3a1c22 100644 --- a/modules/mpv/check.nix +++ b/modules/mpv/check.nix @@ -1,7 +1,4 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let mpvWrapped = diff --git a/modules/mpv/module.nix b/modules/mpv/module.nix index 17a3350c..a0a40055 100644 --- a/modules/mpv/module.nix +++ b/modules/mpv/module.nix @@ -26,10 +26,6 @@ "--input-conf" = config."input.conf".path; "--include" = config."mpv.conf".path; }; - config.package = ( - config.pkgs.mpv.override { - scripts = config.scripts; - } - ); + config.package = (config.pkgs.mpv.override { scripts = config.scripts; }); config.meta.maintainers = [ lib.maintainers.lassulus ]; } diff --git a/modules/niri/check.nix b/modules/niri/check.nix index afe46562..0c630b5a 100644 --- a/modules/niri/check.nix +++ b/modules/niri/check.nix @@ -1,7 +1,4 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let niriWrapped = @@ -27,9 +24,7 @@ let window-rules = [ { matches = [ { app-id = ".*"; } ]; - excludes = [ - { app-id = "org.keepassxc.KeePassXC"; } - ]; + excludes = [ { app-id = "org.keepassxc.KeePassXC"; } ]; open-focused = false; open-floating = false; } diff --git a/modules/niri/module.nix b/modules/niri/module.nix index 8508a44e..0b6d4d65 100644 --- a/modules/niri/module.nix +++ b/modules/niri/module.nix @@ -92,14 +92,7 @@ let map attrsToKdl ( lib.mapAttrsToList (n: v: { # use the attr name as attribute for the workspace node - workspace = - if v != null then - { - _attrs = n; - } - // v - else - n; + workspace = if v != null then { _attrs = n; } // v else n; }) w ); mkOutputs = @@ -182,9 +175,7 @@ in example = [ { matches = [ { app-id = ".*"; } ]; - excludes = [ - { app-id = "org.keepassxc.KeePassXC"; } - ]; + excludes = [ { app-id = "org.keepassxc.KeePassXC"; } ]; open-focused = false; open-floating = false; } diff --git a/modules/notmuch/check.nix b/modules/notmuch/check.nix index 836eb764..54df949b 100644 --- a/modules/notmuch/check.nix +++ b/modules/notmuch/check.nix @@ -1,7 +1,4 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let notmuchWrapped = diff --git a/modules/nushell/check.nix b/modules/nushell/check.nix index ce559c45..9dc9abfc 100644 --- a/modules/nushell/check.nix +++ b/modules/nushell/check.nix @@ -1,13 +1,7 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let - nushellWrapped = - (self.wrapperModules.nushell.apply { - inherit pkgs; - }).wrapper; + nushellWrapped = (self.wrapperModules.nushell.apply { inherit pkgs; }).wrapper; in pkgs.runCommand "nushell-test" { } '' diff --git a/modules/rofi/check.nix b/modules/rofi/check.nix index f8c452e3..56995fea 100644 --- a/modules/rofi/check.nix +++ b/modules/rofi/check.nix @@ -1,7 +1,4 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let rofiWrapped = diff --git a/modules/rofi/module.nix b/modules/rofi/module.nix index 49706b86..de82f4cf 100644 --- a/modules/rofi/module.nix +++ b/modules/rofi/module.nix @@ -112,9 +112,7 @@ in { _class = "wrapper"; options = { - "config.rasi" = lib.mkOption { - type = wlib.types.file config.pkgs; - }; + "config.rasi" = lib.mkOption { type = wlib.types.file config.pkgs; }; settings = lib.mkOption { type = configType; @@ -142,9 +140,7 @@ in }; }; config."config.rasi".content = - toRasi { - configuration = config.settings; - } + toRasi { configuration = config.settings; } + (lib.optionalString (theme != null) (toRasi { "@theme" = theme; })); diff --git a/modules/skim/module.nix b/modules/skim/module.nix index cba30acf..3719e49e 100644 --- a/modules/skim/module.nix +++ b/modules/skim/module.nix @@ -1,5 +1,4 @@ -{ config, lib, ... }: -{ +{ config, lib, ... }: { _class = "wrapper"; options = { diff --git a/modules/starship/check.nix b/modules/starship/check.nix index de498cbe..d389c77a 100644 --- a/modules/starship/check.nix +++ b/modules/starship/check.nix @@ -1,7 +1,4 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let starshipWrapped = diff --git a/modules/sway/check.nix b/modules/sway/check.nix index e1a51101..1bc7c627 100644 --- a/modules/sway/check.nix +++ b/modules/sway/check.nix @@ -1,7 +1,4 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let swayWrapped = diff --git a/modules/swayidle/check.nix b/modules/swayidle/check.nix index 9202e49c..2caaba77 100644 --- a/modules/swayidle/check.nix +++ b/modules/swayidle/check.nix @@ -1,9 +1,6 @@ { pkgs, self }: let - swayidleWrapped = - (self.wrapperModules.swayidle.apply { - inherit pkgs; - }).wrapper; + swayidleWrapped = (self.wrapperModules.swayidle.apply { inherit pkgs; }).wrapper; in pkgs.runCommand "swayidle-check" { nativeBuildInputs = [ swayidleWrapped ]; } '' (swayidle -h | grep "${swayidleWrapped.version}") || true diff --git a/modules/swaylock/check.nix b/modules/swaylock/check.nix index 59adb7c9..4015b056 100644 --- a/modules/swaylock/check.nix +++ b/modules/swaylock/check.nix @@ -1,7 +1,4 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let swaylockWrapped = diff --git a/modules/swaync/module.nix b/modules/swaync/module.nix index 05f1ee91..23568fd0 100644 --- a/modules/swaync/module.nix +++ b/modules/swaync/module.nix @@ -43,9 +43,7 @@ in "--style" = config."style.css".path; }; - config.meta.maintainers = [ - lib.maintainers.randomdude - ]; + config.meta.maintainers = [ lib.maintainers.randomdude ]; config.meta.platforms = lib.platforms.linux; config.systemd = { diff --git a/modules/swayosd/check.nix b/modules/swayosd/check.nix index 1b8b30ac..1bbac288 100644 --- a/modules/swayosd/check.nix +++ b/modules/swayosd/check.nix @@ -1,7 +1,4 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let swayosdWrapped = diff --git a/modules/tmux/check.nix b/modules/tmux/check.nix index f1ce3e9a..da0d2f31 100644 --- a/modules/tmux/check.nix +++ b/modules/tmux/check.nix @@ -1,7 +1,4 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let tmuxWrapped = diff --git a/modules/treefmt/check.nix b/modules/treefmt/check.nix index 9ca84d51..bb3e6384 100644 --- a/modules/treefmt/check.nix +++ b/modules/treefmt/check.nix @@ -1,7 +1,4 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let treefmtWrapped = (self.wrapperModules.treefmt.apply { diff --git a/modules/udiskie/check.nix b/modules/udiskie/check.nix index dbe39aeb..fc76cc46 100644 --- a/modules/udiskie/check.nix +++ b/modules/udiskie/check.nix @@ -1,7 +1,4 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let udiskieWrapped = diff --git a/modules/voxtype/check.nix b/modules/voxtype/check.nix index 8e5caee2..a5dafca7 100644 --- a/modules/voxtype/check.nix +++ b/modules/voxtype/check.nix @@ -1,13 +1,7 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let - voxtypeWrapped = - (self.wrapperModules.voxtype.apply { - inherit pkgs; - }).wrapper; + voxtypeWrapped = (self.wrapperModules.voxtype.apply { inherit pkgs; }).wrapper; in pkgs.runCommand "voxtype-test" { } '' # this will fail, if the default config is off diff --git a/modules/waybar/check.nix b/modules/waybar/check.nix index 41610f88..b74de73e 100644 --- a/modules/waybar/check.nix +++ b/modules/waybar/check.nix @@ -1,7 +1,4 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let waybarWrapped = (self.wrapperModules.waybar.apply { diff --git a/modules/waybar/module.nix b/modules/waybar/module.nix index 57cfce48..267b8c39 100644 --- a/modules/waybar/module.nix +++ b/modules/waybar/module.nix @@ -59,9 +59,7 @@ in "--config" = config.configFile.path; "--style" = config."style.css".path; }; - config.filesToPatch = [ - "share/systemd/user/waybar.service" - ]; + config.filesToPatch = [ "share/systemd/user/waybar.service" ]; config.meta.maintainers = [ { name = "turbio"; diff --git a/modules/yazi/check.nix b/modules/yazi/check.nix index 889cb61a..bb38ae52 100644 --- a/modules/yazi/check.nix +++ b/modules/yazi/check.nix @@ -1,12 +1,6 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let - yaziWrapped = - (self.wrapperModules.yazi.apply { - inherit pkgs; - }).wrapper; + yaziWrapped = (self.wrapperModules.yazi.apply { inherit pkgs; }).wrapper; in pkgs.runCommand "yazi-test" { } '' "${yaziWrapped}/bin/yazi" --version | grep -q "${yaziWrapped.version}" diff --git a/modules/zellij/check.nix b/modules/zellij/check.nix index 0caf8cf1..c94c1d33 100644 --- a/modules/zellij/check.nix +++ b/modules/zellij/check.nix @@ -1,7 +1,4 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let zellijWrapped = diff --git a/modules/zellij/module.nix b/modules/zellij/module.nix index 59b48061..22b822ef 100644 --- a/modules/zellij/module.nix +++ b/modules/zellij/module.nix @@ -23,9 +23,7 @@ }; meta = { - maintainers = [ - lib.maintainers.dav-wolff - ]; + maintainers = [ lib.maintainers.dav-wolff ]; }; }; } diff --git a/modules/zsh/check.nix b/modules/zsh/check.nix index 424efe55..eeca7f42 100644 --- a/modules/zsh/check.nix +++ b/modules/zsh/check.nix @@ -1,7 +1,4 @@ -{ - pkgs, - self, -}: +{ pkgs, self }: let zshWrapped = (self.wrapperModules.zsh.apply { diff --git a/modules/zsh/module.nix b/modules/zsh/module.nix index 9c9e7aa9..9be0debe 100644 --- a/modules/zsh/module.nix +++ b/modules/zsh/module.nix @@ -289,9 +289,7 @@ in ".zshenv" = lib.mkOption { type = wlib.types.file config.pkgs; default.content = - builtins.concatStringsSep "\n" [ - (lib.concatMapAttrsStringSep "\n" (k: v: "${k}=${v}") cfg.env) - ] + builtins.concatStringsSep "\n" [ (lib.concatMapAttrsStringSep "\n" (k: v: "${k}=${v}") cfg.env) ] + (lib.optionalString cfg.integrations.fzf.enable '' path+=(${config.pkgs.fzf-zsh-plugin}) '');