From 01ea51d7065e0ab06a09df9db4d1c17f6eb2675f Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 7 Apr 2026 22:46:12 -0500 Subject: [PATCH] treewide: use inherit for attribute assignments This change converts redundant attribute assignments of the form `a = a;` or `a = someSet.a;` into cleaner `inherit` statements. This reduces verbosity and follows common Nix style for bringing attributes into scope. Statix Codes: W03 (manual_inherit), W04 (manual_inherit_from) Also include statix and the rule in our configuration. --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- docs/default.nix | 14 ++++++++----- docs/flake.nix | 3 +-- flake.nix | 2 +- home-manager/build-news.nix | 2 +- home-manager/devShell.nix | 1 + home-manager/formatter.nix | 13 ++++++++++++ home-manager/home-manager.nix | 3 +-- lib/default.nix | 2 +- modules/accounts/calendar.nix | 2 +- modules/accounts/contacts.nix | 2 +- modules/accounts/email.nix | 2 +- modules/default.nix | 2 +- modules/files.nix | 16 ++++++++------- modules/lib/dag.nix | 2 +- modules/lib/types-dag.nix | 2 +- modules/lib/types.nix | 2 +- modules/misc/editorconfig.nix | 2 +- modules/misc/fontconfig.nix | 2 +- modules/misc/qt.nix | 2 +- modules/misc/xdg.nix | 14 ++++++++----- modules/programs/aerospace.nix | 2 +- modules/programs/alacritty.nix | 2 +- modules/programs/alot/default.nix | 2 +- modules/programs/aria2.nix | 2 +- modules/programs/aria2p.nix | 2 +- modules/programs/astroid/default.nix | 2 +- modules/programs/autorandr.nix | 2 +- modules/programs/bacon.nix | 2 +- modules/programs/beets.nix | 5 ++--- modules/programs/bluetuith.nix | 2 +- modules/programs/borgmatic.nix | 7 +++---- modules/programs/bottom.nix | 2 +- modules/programs/boxxy.nix | 2 +- modules/programs/bun.nix | 2 +- modules/programs/cava.nix | 2 +- modules/programs/cavalier.nix | 4 ++-- modules/programs/chromium.nix | 2 +- modules/programs/clock-rs.nix | 2 +- modules/programs/docker-cli.nix | 2 +- modules/programs/earthly.nix | 2 +- modules/programs/eclipse.nix | 2 +- modules/programs/element-desktop.nix | 2 +- modules/programs/emacs.nix | 2 +- modules/programs/eza.nix | 2 +- modules/programs/fastfetch.nix | 2 +- modules/programs/firefox/mkFirefoxModule.nix | 11 ++++------ .../programs/firefox/profiles/handlers.nix | 2 +- modules/programs/firefoxpwa.nix | 14 ++++++------- modules/programs/foot.nix | 2 +- modules/programs/fuzzel.nix | 2 +- modules/programs/gallery-dl.nix | 2 +- modules/programs/gh-dash.nix | 2 +- modules/programs/git-cliff.nix | 2 +- modules/programs/gnome-terminal.nix | 4 ++-- modules/programs/havoc.nix | 2 +- modules/programs/helix.nix | 2 +- modules/programs/himalaya.nix | 10 +++++----- modules/programs/hyfetch.nix | 2 +- modules/programs/hyprpanel/default.nix | 2 +- modules/programs/i3bar-river.nix | 2 +- modules/programs/i3status-rust.nix | 8 ++++---- modules/programs/iamb.nix | 2 +- modules/programs/infat.nix | 2 +- modules/programs/inori.nix | 2 +- modules/programs/joshuto.nix | 8 ++++---- modules/programs/jqp.nix | 2 +- modules/programs/jujutsu.nix | 2 +- modules/programs/k9s.nix | 10 +++++----- modules/programs/kakoune.nix | 2 +- modules/programs/keepassxc.nix | 2 +- modules/programs/khal/default.nix | 2 +- modules/programs/kickoff.nix | 2 +- modules/programs/kraftkit.nix | 2 +- modules/programs/kubecolor.nix | 2 +- modules/programs/kubeswitch.nix | 2 +- modules/programs/lapce.nix | 6 +++--- modules/programs/lazydocker.nix | 2 +- modules/programs/lazygit.nix | 2 +- modules/programs/lazysql.nix | 2 +- modules/programs/looking-glass-client.nix | 2 +- modules/programs/lsd.nix | 2 +- modules/programs/mc.nix | 2 +- modules/programs/mcfly.nix | 2 +- modules/programs/meli.nix | 2 +- modules/programs/mercurial.nix | 2 +- modules/programs/micro.nix | 2 +- modules/programs/mistral-vibe.nix | 2 +- modules/programs/mods.nix | 2 +- modules/programs/mr.nix | 2 +- modules/programs/msmtp/default.nix | 2 +- modules/programs/mypy.nix | 2 +- modules/programs/navi.nix | 2 +- modules/programs/ncspot.nix | 2 +- modules/programs/neomutt/default.nix | 2 +- modules/programs/neovide.nix | 2 +- modules/programs/nheko.nix | 2 +- modules/programs/nix-init.nix | 2 +- modules/programs/nix-search-tv.nix | 2 +- modules/programs/notmuch/default.nix | 3 +-- modules/programs/numbat.nix | 2 +- modules/programs/obs-studio.nix | 2 +- modules/programs/offlineimap/default.nix | 2 +- modules/programs/oh-my-posh.nix | 2 +- modules/programs/onlyoffice.nix | 2 +- modules/programs/opencode.nix | 6 +++--- modules/programs/openstackclient.nix | 2 +- modules/programs/pandoc.nix | 2 +- modules/programs/pet.nix | 4 ++-- modules/programs/pgcli.nix | 2 +- modules/programs/piston-cli.nix | 2 +- modules/programs/poetry.nix | 2 +- modules/programs/pqiv.nix | 2 +- modules/programs/pylint.nix | 2 +- modules/programs/radio-cli.nix | 2 +- modules/programs/rbenv.nix | 2 +- modules/programs/rio.nix | 2 +- modules/programs/rofi.nix | 12 ++++++----- modules/programs/ruff.nix | 2 +- modules/programs/sapling.nix | 2 +- modules/programs/satty.nix | 2 +- modules/programs/sketchybar.nix | 2 +- modules/programs/smug.nix | 6 +++--- modules/programs/sqls.nix | 2 +- modules/programs/superfile.nix | 4 ++-- modules/programs/sway-easyfocus.nix | 2 +- modules/programs/swayimg.nix | 2 +- modules/programs/tealdeer.nix | 2 +- modules/programs/television.nix | 2 +- modules/programs/tex-fmt.nix | 2 +- modules/programs/thunderbird.nix | 13 ++++++------ modules/programs/tiny.nix | 2 +- modules/programs/tirith.nix | 2 +- modules/programs/topgrade.nix | 2 +- modules/programs/tray-tui.nix | 2 +- modules/programs/trippy.nix | 2 +- modules/programs/ttyper.nix | 2 +- modules/programs/twitch-tui.nix | 2 +- modules/programs/ty.nix | 2 +- modules/programs/uv.nix | 2 +- modules/programs/vdirsyncer/default.nix | 2 +- modules/programs/vesktop.nix | 4 ++-- modules/programs/vim-vint.nix | 2 +- modules/programs/vscode/default.nix | 6 +++--- modules/programs/wallust.nix | 2 +- modules/programs/watson.nix | 2 +- modules/programs/waveterm.nix | 6 +++--- modules/programs/waybar.nix | 2 +- modules/programs/xplr.nix | 2 +- modules/programs/yambar.nix | 2 +- modules/programs/yarn/default.nix | 2 +- modules/programs/yazi.nix | 6 +++--- modules/programs/zed-editor.nix | 8 ++++---- modules/programs/zellij.nix | 2 +- modules/programs/zk.nix | 2 +- modules/services/activitywatch.nix | 4 ++-- modules/services/avizo.nix | 2 +- modules/services/betterlockscreen.nix | 2 +- modules/services/clipcat.nix | 6 +++--- modules/services/clipse.nix | 8 +++----- modules/services/davmail.nix | 2 +- modules/services/dunst.nix | 2 +- modules/services/dwm-status.nix | 2 +- modules/services/espanso.nix | 4 ++-- modules/services/fnott.nix | 2 +- modules/services/fusuma.nix | 2 +- modules/services/glance.nix | 2 +- modules/services/grobi.nix | 2 +- modules/services/hyprshell.nix | 2 +- modules/services/imapnotify/default.nix | 2 +- modules/services/jellyfin-mpv-shim.nix | 2 +- modules/services/listenbrainz-mpd.nix | 2 +- modules/services/ludusavi.nix | 2 +- modules/services/mopidy.nix | 2 +- modules/services/mpd-discord-rpc.nix | 2 +- modules/services/mpd.nix | 2 +- modules/services/mpdris2-rs.nix | 2 +- modules/services/mpdris2.nix | 5 ++--- modules/services/pantalaimon.nix | 2 +- modules/services/picom.nix | 7 ++----- modules/services/plex-mpv-shim.nix | 2 +- modules/services/podman/default.nix | 4 ++-- modules/services/podman/linux/containers.nix | 2 +- modules/services/pueue.nix | 2 +- modules/services/recoll.nix | 2 +- modules/services/shikane.nix | 2 +- modules/services/shpool.nix | 2 +- modules/services/spotifyd.nix | 2 +- modules/services/swaync.nix | 2 +- modules/services/syncthing.nix | 2 +- modules/services/twmn.nix | 4 ++-- modules/services/udiskie.nix | 6 +++--- .../services/window-managers/i3-sway/sway.nix | 3 +-- .../window-managers/labwc/function.nix | 4 ++-- modules/services/window-managers/wayfire.nix | 4 ++-- modules/services/window-managers/xmonad.nix | 2 +- modules/services/wluma.nix | 2 +- modules/services/wob.nix | 2 +- modules/services/wpaperd.nix | 2 +- modules/services/xsuspender.nix | 2 +- modules/targets/generic-linux.nix | 2 +- modules/targets/generic-linux/gpu/default.nix | 2 +- modules/targets/generic-linux/nixgl.nix | 2 +- statix.toml | 20 +++++++++++++++++++ tests/default.nix | 4 ++-- tests/lib/generators/tohyprconf.nix | 2 +- tests/lib/types/dag-merge.nix | 2 +- tests/lib/types/dag-submodule.nix | 2 +- .../borgmatic/basic-configuration.nix | 2 +- .../borgmatic/patterns-configuration.nix | 2 +- tests/modules/programs/sbt/credentials.nix | 2 +- tests/modules/programs/sbt/plugins.nix | 4 ++-- tests/modules/programs/sbt/repositories.nix | 2 +- .../modules/programs/sbt/user-config-path.nix | 6 +++--- .../thunderbird-native-messaging-host.nix | 2 +- .../programs/thunderbird/thunderbird.nix | 2 +- tests/modules/services/i3/i3-keybindings.nix | 2 +- treefmt.toml | 4 ++++ 218 files changed, 351 insertions(+), 317 deletions(-) create mode 100644 statix.toml diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 44c00b75e..528b8aa42 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -22,7 +22,7 @@ Also make sure to read the guidelines found at - [ ] Change is backwards compatible. - [ ] Code formatted with `nix fmt` or - `nix-shell -p treefmt nixfmt deadnix keep-sorted nixf-diagnose --run treefmt`. + `nix-shell -A dev --run treefmt`. - [ ] Code tested through `nix run .#tests -- test-all` or `nix-shell --pure tests -A run.all`. diff --git a/docs/default.nix b/docs/default.nix index 4098bcc0e..9c75ca6a2 100644 --- a/docs/default.nix +++ b/docs/default.nix @@ -153,11 +153,15 @@ let config = lib.listToAttrs (map poisonAttr (lib.filter (n: n != "_module") (lib.attrNames options))); }; - options = - (docsLib.evalModules { - modules = modules ++ [ poisonModule ]; - class = "homeManager"; - }).options; + inherit + ( + (docsLib.evalModules { + modules = modules ++ [ poisonModule ]; + class = "homeManager"; + }) + ) + options + ; in pkgs.buildPackages.nixosOptionsDoc ( { diff --git a/docs/flake.nix b/docs/flake.nix index 76baf6c26..469ce8672 100644 --- a/docs/flake.nix +++ b/docs/flake.nix @@ -75,8 +75,7 @@ pkgs = nixpkgs.legacyPackages.${system}; docs = import ./default.nix { inherit pkgs lib; - release = releaseInfo.release; - isReleaseBranch = releaseInfo.isReleaseBranch; + inherit (releaseInfo) isReleaseBranch release; }; in { diff --git a/flake.nix b/flake.nix index e4ec68cde..5317b569c 100644 --- a/flake.nix +++ b/flake.nix @@ -210,7 +210,7 @@ legacyPackages = forAllPkgs ( pkgs: let - system = pkgs.stdenv.hostPlatform.system; + inherit (pkgs.stdenv.hostPlatform) system; in (buildTests system) // (integrationTestPackages system) diff --git a/home-manager/build-news.nix b/home-manager/build-news.nix index 1cb41d764..09f37333f 100644 --- a/home-manager/build-news.nix +++ b/home-manager/build-news.nix @@ -68,7 +68,7 @@ in { meta = { numUnread = length newsUnread; - display = newsJson.display; + inherit (newsJson) display; ids = concatStringsSep "\n" (map (e: e.id) newsJson.entries); }; news = { diff --git a/home-manager/devShell.nix b/home-manager/devShell.nix index 4274535c3..92544cd35 100644 --- a/home-manager/devShell.nix +++ b/home-manager/devShell.nix @@ -6,6 +6,7 @@ mkShell { name = "devShell"; packages = [ pkgs.coreutils + pkgs.statix formatter ]; } diff --git a/home-manager/formatter.nix b/home-manager/formatter.nix index 3e4c219b5..dda5ed59e 100644 --- a/home-manager/formatter.nix +++ b/home-manager/formatter.nix @@ -1,7 +1,20 @@ { pkgs }: +let + statixFormatter = pkgs.writeShellApplication { + name = "treefmt-statix"; + text = '' + set -eu + + for file in "$@"; do + ${pkgs.statix}/bin/statix fix --config ${../statix.toml} -- "$file" + done + ''; + }; +in pkgs.treefmt.withConfig { runtimeInputs = with pkgs; [ nixfmt + statixFormatter deadnix keep-sorted nixf-diagnose diff --git a/home-manager/home-manager.nix b/home-manager/home-manager.nix index 084fbd2f2..2fc6a0f20 100644 --- a/home-manager/home-manager.nix +++ b/home-manager/home-manager.nix @@ -10,8 +10,7 @@ let env = import ../modules { configuration = if confAttr == "" || confAttr == null then confPath else (import confPath).${confAttr}; - pkgs = pkgs; - check = check; + inherit check pkgs; }; in diff --git a/lib/default.nix b/lib/default.nix index aefff4f26..887a40401 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -1,6 +1,6 @@ { lib }: { - hm = (import ../modules/lib/stdlib-extended.nix lib).hm; + inherit ((import ../modules/lib/stdlib-extended.nix lib)) hm; homeManagerConfiguration = { diff --git a/modules/accounts/calendar.nix b/modules/accounts/calendar.nix index 94d8d38f3..de41184b0 100644 --- a/modules/accounts/calendar.nix +++ b/modules/accounts/calendar.nix @@ -127,7 +127,7 @@ let }; config = { - name = name; + inherit name; }; }; diff --git a/modules/accounts/contacts.nix b/modules/accounts/contacts.nix index 506b66a13..96f8fc089 100644 --- a/modules/accounts/contacts.nix +++ b/modules/accounts/contacts.nix @@ -119,7 +119,7 @@ let }; config = { - name = name; + inherit name; }; }; diff --git a/modules/accounts/email.nix b/modules/accounts/email.nix index 52cbd8b63..bf3dcb291 100644 --- a/modules/accounts/email.nix +++ b/modules/accounts/email.nix @@ -535,7 +535,7 @@ let config = lib.mkMerge [ { - name = name; + inherit name; maildir = lib.mkOptionDefault { path = "${name}"; }; } diff --git a/modules/default.nix b/modules/default.nix index 637d142aa..1336d1729 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -59,7 +59,7 @@ let in module // { - activationPackage = module.config.home.activationPackage; + inherit (module.config.home) activationPackage; # For backwards compatibility. Please use activationPackage instead. activation-script = module.config.home.activationPackage; diff --git a/modules/files.nix b/modules/files.nix index 2be13010f..a43dbfca0 100644 --- a/modules/files.nix +++ b/modules/files.nix @@ -30,14 +30,16 @@ let in sortedFiles; - fileOverlapResolution = config.home.fileOverlapResolution; + inherit (config.home) fileOverlapResolution homeDirectory; - homeDirectory = config.home.homeDirectory; - - fileType = - (import lib/file-type.nix { - inherit homeDirectory lib pkgs; - }).fileType; + inherit + ( + (import lib/file-type.nix { + inherit homeDirectory lib pkgs; + }) + ) + fileType + ; sourceStorePath = file: diff --git a/modules/lib/dag.nix b/modules/lib/dag.nix index c70919566..a4c40b707 100644 --- a/modules/lib/dag.nix +++ b/modules/lib/dag.nix @@ -89,7 +89,7 @@ in dagBefore = dag: name: builtins.attrNames (filterAttrs (n: v: builtins.elem name v.before) dag); normalizedDag = mapAttrs (n: v: { name = n; - data = v.data; + inherit (v) data; after = v.after ++ dagBefore dag n; }) dag; before = a: b: builtins.elem a.name b.after; diff --git a/modules/lib/types-dag.nix b/modules/lib/types-dag.nix index 9f17dc6ac..3b420f95e 100644 --- a/modules/lib/types-dag.nix +++ b/modules/lib/types-dag.nix @@ -67,7 +67,7 @@ rec { description = "DAG of ${elemType.description}"; inherit (attrEquivalent) check merge emptyValue; getSubOptions = prefix: elemType.getSubOptions (prefix ++ [ "" ]); - getSubModules = elemType.getSubModules; + inherit (elemType) getSubModules; substSubModules = m: dagOf (elemType.substSubModules m); functor = (defaultFunctor name) // { wrapped = elemType; diff --git a/modules/lib/types.nix b/modules/lib/types.nix index a0b53c8fa..4724029c5 100644 --- a/modules/lib/types.nix +++ b/modules/lib/types.nix @@ -116,7 +116,7 @@ rec { + " ${showFiles (getFiles defs)}." ) else if gvar.isArray sharedDefType && allChecked then - gvar.mkValue ((types.listOf gvariant).merge loc (map (d: d // { value = d.value.value; }) vdefs)) + gvar.mkValue ((types.listOf gvariant).merge loc (map (d: d // { inherit (d.value) value; }) vdefs)) // { type = sharedDefType; } diff --git a/modules/misc/editorconfig.nix b/modules/misc/editorconfig.nix index c6a52f150..3e3a80d52 100644 --- a/modules/misc/editorconfig.nix +++ b/modules/misc/editorconfig.nix @@ -19,7 +19,7 @@ in enable = lib.mkEnableOption "EditorConfig home configuration file"; settings = lib.mkOption { - type = iniFormat.type; + inherit (iniFormat) type; default = { }; description = '' Configuration written to {file}`$HOME/.editorconfig`. diff --git a/modules/misc/fontconfig.nix b/modules/misc/fontconfig.nix index 929f117ab..716b6f4d3 100644 --- a/modules/misc/fontconfig.nix +++ b/modules/misc/fontconfig.nix @@ -13,7 +13,7 @@ let cfg = config.fonts.fontconfig; - profileDirectory = config.home.profileDirectory; + inherit (config.home) profileDirectory; fontConfigFileType = lib.types.submodule ( { name, ... }: diff --git a/modules/misc/qt.nix b/modules/misc/qt.nix index 71e728d8e..514ada6a6 100644 --- a/modules/misc/qt.nix +++ b/modules/misc/qt.nix @@ -349,7 +349,7 @@ in { option = "qt.platformTheme.name"; name = deprecateKde6 cfg.platformTheme.name "qt.platformTheme.name"; - package = cfg.platformTheme.package; + inherit (cfg.platformTheme) package; }; # Necessary because home.sessionVariables doesn't support mkIf diff --git a/modules/misc/xdg.nix b/modules/misc/xdg.nix index ba00b8a57..218abc9ab 100644 --- a/modules/misc/xdg.nix +++ b/modules/misc/xdg.nix @@ -15,11 +15,15 @@ let cfg = config.xdg; - fileType = - (import ../lib/file-type.nix { - inherit (config.home) homeDirectory; - inherit lib pkgs; - }).fileType; + inherit + ( + (import ../lib/file-type.nix { + inherit (config.home) homeDirectory; + inherit lib pkgs; + }) + ) + fileType + ; defaultCacheHome = "${config.home.homeDirectory}/.cache"; defaultConfigHome = "${config.home.homeDirectory}/.config"; diff --git a/modules/programs/aerospace.nix b/modules/programs/aerospace.nix index 178f9057f..ff1279312 100644 --- a/modules/programs/aerospace.nix +++ b/modules/programs/aerospace.nix @@ -216,7 +216,7 @@ in }; launchd.agents.aerospace = { - enable = cfg.launchd.enable; + inherit (cfg.launchd) enable; config = { Program = "${cfg.package}/Applications/AeroSpace.app/Contents/MacOS/AeroSpace"; KeepAlive = cfg.launchd.keepAlive; diff --git a/modules/programs/alacritty.nix b/modules/programs/alacritty.nix index ef3bcabaa..714ddc97a 100644 --- a/modules/programs/alacritty.nix +++ b/modules/programs/alacritty.nix @@ -34,7 +34,7 @@ in }; settings = lib.mkOption { - type = tomlFormat.type; + inherit (tomlFormat) type; default = { }; example = lib.literalExpression '' { diff --git a/modules/programs/alot/default.nix b/modules/programs/alot/default.nix index f4673a7ef..57456e2b5 100644 --- a/modules/programs/alot/default.nix +++ b/modules/programs/alot/default.nix @@ -93,7 +93,7 @@ let [ "[[${name}]]" ] ++ mapAttrsToList (n: v: n + "=" + v) ( { - address = address; + inherit address; realname = realName; sendmail_command = optionalString (alot.sendMailCommand != null) alot.sendMailCommand; } diff --git a/modules/programs/aria2.nix b/modules/programs/aria2.nix index f28259d48..15f427ec4 100644 --- a/modules/programs/aria2.nix +++ b/modules/programs/aria2.nix @@ -26,7 +26,7 @@ in package = lib.mkPackageOption pkgs "aria2" { nullable = true; }; settings = lib.mkOption { - type = keyValueFormat.type; + inherit (keyValueFormat) type; default = { }; description = '' Options to add to {file}`aria2.conf` file. diff --git a/modules/programs/aria2p.nix b/modules/programs/aria2p.nix index 2ed17fbc3..4d1f0f96c 100644 --- a/modules/programs/aria2p.nix +++ b/modules/programs/aria2p.nix @@ -18,7 +18,7 @@ in package = lib.mkPackageOption pkgs [ "python3Packages" "aria2p" ] { nullable = true; }; settings = lib.mkOption { - type = tomlFormat.type; + inherit (tomlFormat) type; default = { }; example = { key_bindings = { diff --git a/modules/programs/astroid/default.nix b/modules/programs/astroid/default.nix index 7a3c98ec7..ccda5628d 100644 --- a/modules/programs/astroid/default.nix +++ b/modules/programs/astroid/default.nix @@ -108,7 +108,7 @@ in }; extraConfig = mkOption { - type = jsonFormat.type; + inherit (jsonFormat) type; default = { }; example = lib.literalExpression '' { diff --git a/modules/programs/autorandr.nix b/modules/programs/autorandr.nix index 41a2ed8ab..2c1353c10 100644 --- a/modules/programs/autorandr.nix +++ b/modules/programs/autorandr.nix @@ -39,7 +39,7 @@ let "*" ] ); - getSubModules = elemType.getSubModules; + inherit (elemType) getSubModules; substSubModules = mod: matrixOf n m (elemType.substSubModules mod); functor = (lib.defaultFunctor name) // { wrapped = elemType; diff --git a/modules/programs/bacon.nix b/modules/programs/bacon.nix index 6551242bc..c9092421c 100644 --- a/modules/programs/bacon.nix +++ b/modules/programs/bacon.nix @@ -26,7 +26,7 @@ in package = lib.mkPackageOption pkgs "bacon" { nullable = true; }; settings = lib.mkOption { - type = settingsFormat.type; + inherit (settingsFormat) type; default = { }; example = { jobs.default = { diff --git a/modules/programs/beets.nix b/modules/programs/beets.nix index f2875bb8a..b9fc3b591 100644 --- a/modules/programs/beets.nix +++ b/modules/programs/beets.nix @@ -61,7 +61,7 @@ in }; settings = mkOption { - type = yamlFormat.type; + inherit (yamlFormat) type; default = { }; description = '' Configuration written to @@ -101,8 +101,7 @@ in (mkIf (cfg.mpdIntegration.enableStats || cfg.mpdIntegration.enableUpdate) { programs.beets.settings.mpd = { - host = cfg.mpdIntegration.host; - port = cfg.mpdIntegration.port; + inherit (cfg.mpdIntegration) host port; }; }) diff --git a/modules/programs/bluetuith.nix b/modules/programs/bluetuith.nix index 849ff5513..1d36d64b1 100644 --- a/modules/programs/bluetuith.nix +++ b/modules/programs/bluetuith.nix @@ -21,7 +21,7 @@ in package = lib.mkPackageOption pkgs "bluetuith" { nullable = true; }; settings = lib.mkOption { - type = jsonFormat.type; + inherit (jsonFormat) type; default = { }; example = lib.literalExpression '' { diff --git a/modules/programs/borgmatic.nix b/modules/programs/borgmatic.nix index 776e59340..d8c4f7e09 100644 --- a/modules/programs/borgmatic.nix +++ b/modules/programs/borgmatic.nix @@ -42,7 +42,7 @@ let }; extraConfigOption = mkOption { - type = yamlFormat.type; + inherit (yamlFormat) type; default = { }; description = "Extra settings."; }; @@ -248,8 +248,8 @@ let removeNullValues ( { source_directories = config.location.sourceDirectories; - patterns = config.location.patterns; - repositories = config.location.repositories; + inherit (config.location) patterns repositories; + inherit (config.consistency) checks; encryption_passcommand = config.storage.encryptionPasscommand; keep_within = config.retention.keepWithin; keep_secondly = config.retention.keepSecondly; @@ -259,7 +259,6 @@ let keep_weekly = config.retention.keepWeekly; keep_monthly = config.retention.keepMonthly; keep_yearly = config.retention.keepYearly; - checks = config.consistency.checks; } // config.location.extraConfig // config.storage.extraConfig diff --git a/modules/programs/bottom.nix b/modules/programs/bottom.nix index c90610f60..ae160cc3f 100644 --- a/modules/programs/bottom.nix +++ b/modules/programs/bottom.nix @@ -23,7 +23,7 @@ in package = lib.mkPackageOption pkgs "bottom" { nullable = true; }; settings = lib.mkOption { - type = tomlFormat.type; + inherit (tomlFormat) type; default = { }; description = '' Configuration written to diff --git a/modules/programs/boxxy.nix b/modules/programs/boxxy.nix index ee0fe2dff..9f49da93b 100644 --- a/modules/programs/boxxy.nix +++ b/modules/programs/boxxy.nix @@ -111,7 +111,7 @@ in ]; home.file = lib.mkIf (cfg.rules != [ ]) { - "${configPath}".source = settingsFormat.generate "boxxy-config.yaml" { rules = cfg.rules; }; + "${configPath}".source = settingsFormat.generate "boxxy-config.yaml" { inherit (cfg) rules; }; }; home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; diff --git a/modules/programs/bun.nix b/modules/programs/bun.nix index e9d45baa3..2d295bee9 100644 --- a/modules/programs/bun.nix +++ b/modules/programs/bun.nix @@ -18,7 +18,7 @@ in package = lib.mkPackageOption pkgs "bun" { nullable = true; }; settings = lib.mkOption { - type = tomlFormat.type; + inherit (tomlFormat) type; default = { }; example = lib.literalExpression '' { diff --git a/modules/programs/cava.nix b/modules/programs/cava.nix index 0a3333cbb..38000639e 100644 --- a/modules/programs/cava.nix +++ b/modules/programs/cava.nix @@ -18,7 +18,7 @@ in package = lib.mkPackageOption pkgs "cava" { nullable = true; }; settings = lib.mkOption { - type = iniFmt.type; + inherit (iniFmt) type; default = { }; example = lib.literalExpression '' { diff --git a/modules/programs/cavalier.nix b/modules/programs/cavalier.nix index 745630f3b..414d39576 100644 --- a/modules/programs/cavalier.nix +++ b/modules/programs/cavalier.nix @@ -24,7 +24,7 @@ in settings = { general = mkOption { - type = jsonFmt.type; + inherit (jsonFmt) type; default = { }; example = lib.literalExpression '' { @@ -57,7 +57,7 @@ in }; cava = mkOption { - type = iniFmt.type; + inherit (iniFmt) type; default = { }; example = lib.literalExpression '' { diff --git a/modules/programs/chromium.nix b/modules/programs/chromium.nix index 038b0888f..96d8c88d9 100644 --- a/modules/programs/chromium.nix +++ b/modules/programs/chromium.nix @@ -253,7 +253,7 @@ let } // lib.optionalAttrs (cfg.plasmaSupport or false) { plasmaSupport = true; - kdePackages = pkgs.kdePackages; + inherit (pkgs) kdePackages; } ) else diff --git a/modules/programs/clock-rs.nix b/modules/programs/clock-rs.nix index 1030422c2..ae45759af 100644 --- a/modules/programs/clock-rs.nix +++ b/modules/programs/clock-rs.nix @@ -18,7 +18,7 @@ in package = lib.mkPackageOption pkgs "clock-rs" { nullable = true; }; settings = lib.mkOption { - type = tomlFormat.type; + inherit (tomlFormat) type; default = { }; description = "The configuration file to be used for clock-rs"; example = lib.literalExpression '' diff --git a/modules/programs/docker-cli.nix b/modules/programs/docker-cli.nix index c99bce172..e16edc7dd 100644 --- a/modules/programs/docker-cli.nix +++ b/modules/programs/docker-cli.nix @@ -75,7 +75,7 @@ in }; settings = mkOption { - type = jsonFormat.type; + inherit (jsonFormat) type; default = { }; example = lib.literalExpression '' { diff --git a/modules/programs/earthly.nix b/modules/programs/earthly.nix index eaf7e63ea..804eefd95 100644 --- a/modules/programs/earthly.nix +++ b/modules/programs/earthly.nix @@ -21,7 +21,7 @@ in package = lib.mkPackageOption pkgs "earthly" { nullable = true; }; settings = lib.mkOption { - type = yamlFormat.type; + inherit (yamlFormat) type; default = { }; description = '' Configuration written to ~/.earthly/config.yml file. diff --git a/modules/programs/eclipse.nix b/modules/programs/eclipse.nix index c65c800cf..6b51646f6 100644 --- a/modules/programs/eclipse.nix +++ b/modules/programs/eclipse.nix @@ -54,7 +54,7 @@ in eclipse = cfg.package; jvmArgs = cfg.jvmArgs ++ lib.optional cfg.enableLombok "-javaagent:${pkgs.lombok}/share/java/lombok.jar"; - plugins = cfg.plugins; + inherit (cfg) plugins; }) ]; }; diff --git a/modules/programs/element-desktop.nix b/modules/programs/element-desktop.nix index ab7a4c16d..62ba5621d 100644 --- a/modules/programs/element-desktop.nix +++ b/modules/programs/element-desktop.nix @@ -27,7 +27,7 @@ in enable = mkEnableOption "element-desktop"; package = mkPackageOption pkgs "element-desktop" { nullable = true; }; settings = mkOption { - type = formatter.type; + inherit (formatter) type; default = { }; example = '' { diff --git a/modules/programs/emacs.nix b/modules/programs/emacs.nix index a4de9c4fc..3dc2c8fd6 100644 --- a/modules/programs/emacs.nix +++ b/modules/programs/emacs.nix @@ -22,7 +22,7 @@ let in epkgs.overrideScope cfg.overrides; - emacsWithPackages = emacsPackages.emacsWithPackages; + inherit (emacsPackages) emacsWithPackages; extraPackages = epkgs: diff --git a/modules/programs/eza.nix b/modules/programs/eza.nix index b1c7273dc..872b09d2f 100644 --- a/modules/programs/eza.nix +++ b/modules/programs/eza.nix @@ -107,7 +107,7 @@ in package = lib.mkPackageOption pkgs "eza" { nullable = true; }; theme = mkOption { - type = yamlFormat.type; + inherit (yamlFormat) type; default = { }; description = '' Written to {file}`$XDG_CONFIG_HOME/eza/theme.yml` diff --git a/modules/programs/fastfetch.nix b/modules/programs/fastfetch.nix index 8f94b8374..360f9fb27 100644 --- a/modules/programs/fastfetch.nix +++ b/modules/programs/fastfetch.nix @@ -30,7 +30,7 @@ in package = mkPackageOption pkgs "fastfetch" { nullable = true; }; settings = mkOption { - type = jsonFormat.type; + inherit (jsonFormat) type; default = { }; example = literalExpression '' { diff --git a/modules/programs/firefox/mkFirefoxModule.nix b/modules/programs/firefox/mkFirefoxModule.nix index d5291e72c..4ad2006c9 100644 --- a/modules/programs/firefox/mkFirefoxModule.nix +++ b/modules/programs/firefox/mkFirefoxModule.nix @@ -113,9 +113,7 @@ let let containerToIdentity = _: container: { userContextId = container.id; - name = container.name; - icon = container.icon; - color = container.color; + inherit (container) color icon name; public = true; }; in @@ -178,7 +176,7 @@ let let # The configuration expected by the Firefox wrapper. fcfg = { - enableGnomeExtensions = cfg.enableGnomeExtensions; + inherit (cfg) enableGnomeExtensions; }; # A bit of hackery to force a config into the wrapper. @@ -1062,14 +1060,13 @@ in }; "${cfg.profilesPath}/${profile.path}/search.json.mozlz4" = mkIf (profile.search.enable) { - enable = profile.search.enable; - force = profile.search.force; + inherit (profile.search) enable force; source = profile.search.file; }; "${cfg.profilesPath}/${profile.path}/handlers.json" = mkIf (profile.handlers.enable) { source = profile.handlers.configFile; - force = profile.handlers.force; + inherit (profile.handlers) force; }; "${cfg.profilesPath}/${profile.path}/extensions" = mkIf (profile.extensions.packages != [ ]) { diff --git a/modules/programs/firefox/profiles/handlers.nix b/modules/programs/firefox/profiles/handlers.nix index 9bd139858..c366087ee 100644 --- a/modules/programs/firefox/profiles/handlers.nix +++ b/modules/programs/firefox/profiles/handlers.nix @@ -182,7 +182,7 @@ in }; finalSettings = lib.mkOption { - type = jsonFormat.type; + inherit (jsonFormat) type; internal = true; readOnly = true; default = { diff --git a/modules/programs/firefoxpwa.nix b/modules/programs/firefoxpwa.nix index ec12848f1..e56d9f544 100644 --- a/modules/programs/firefoxpwa.nix +++ b/modules/programs/firefoxpwa.nix @@ -49,7 +49,7 @@ in package = lib.mkPackageOption pkgs "firefoxpwa" { nullable = true; }; settings = lib.mkOption { - type = jsonFmt.type; + inherit (jsonFmt) type; default = { }; description = '' Settings to be written to the configuration file. See @@ -147,7 +147,7 @@ in }; }; settings = lib.mkOption { - type = jsonFmt.type; + inherit (jsonFmt) type; default = { }; description = '' Settings for this site. See @@ -166,12 +166,12 @@ in ulid = name; profile = profile.name; config = { - name = config.name; + inherit (config) name; document_url = config.url; manifest_url = config.manifestUrl; }; manifest = { - name = config.name; + inherit (config) name; start_url = config.url; }; }; @@ -181,7 +181,7 @@ in ); }; settings = lib.mkOption { - type = jsonFmt.type; + inherit (jsonFmt) type; default = { }; description = '' Settings for this profile. See @@ -193,7 +193,7 @@ in config.settings = { ulid = name; - name = config.name; + inherit (config) name; sites = builtins.attrNames config.sites; }; } @@ -239,7 +239,7 @@ in lib.mapAttrsToList (name: site: { "FFPWA-${name}" = lib.mkIf site.desktopEntry.enable { inherit (site.desktopEntry) icon categories; - name = site.settings.manifest.name; + inherit (site.settings.manifest) name; exec = "firefoxpwa site launch ${name} --protocol %u"; terminal = false; }; diff --git a/modules/programs/foot.nix b/modules/programs/foot.nix index 2d4341921..7eeeaa21e 100644 --- a/modules/programs/foot.nix +++ b/modules/programs/foot.nix @@ -19,7 +19,7 @@ in server.enable = lib.mkEnableOption "Foot terminal server"; settings = lib.mkOption { - type = iniFormat.type; + inherit (iniFormat) type; default = { }; description = '' Configuration written to diff --git a/modules/programs/fuzzel.nix b/modules/programs/fuzzel.nix index 511afb450..a5febea70 100644 --- a/modules/programs/fuzzel.nix +++ b/modules/programs/fuzzel.nix @@ -29,7 +29,7 @@ in package = mkPackageOption pkgs "fuzzel" { nullable = true; }; settings = mkOption { - type = iniFormat.type; + inherit (iniFormat) type; default = { }; example = literalExpression '' { diff --git a/modules/programs/gallery-dl.nix b/modules/programs/gallery-dl.nix index bdd74d6a9..b8ba1cbcf 100644 --- a/modules/programs/gallery-dl.nix +++ b/modules/programs/gallery-dl.nix @@ -18,7 +18,7 @@ in package = lib.mkPackageOption pkgs "gallery-dl" { nullable = true; }; settings = lib.mkOption { - type = jsonFormat.type; + inherit (jsonFormat) type; default = { }; example = lib.literalExpression '' { diff --git a/modules/programs/gh-dash.nix b/modules/programs/gh-dash.nix index e8cc7f959..465c7da24 100644 --- a/modules/programs/gh-dash.nix +++ b/modules/programs/gh-dash.nix @@ -21,7 +21,7 @@ in package = lib.mkPackageOption pkgs "gh-dash" { nullable = true; }; settings = lib.mkOption { - type = yamlFormat.type; + inherit (yamlFormat) type; default = { }; example = lib.literalExpression '' { diff --git a/modules/programs/git-cliff.nix b/modules/programs/git-cliff.nix index 84f61a497..3de2959c4 100644 --- a/modules/programs/git-cliff.nix +++ b/modules/programs/git-cliff.nix @@ -17,7 +17,7 @@ in package = lib.mkPackageOption pkgs "git-cliff" { nullable = true; }; settings = lib.mkOption { - type = tomlFormat.type; + inherit (tomlFormat) type; default = { }; example = lib.literalExpression '' { diff --git a/modules/programs/gnome-terminal.nix b/modules/programs/gnome-terminal.nix index 80f0846e0..d67e1c215 100644 --- a/modules/programs/gnome-terminal.nix +++ b/modules/programs/gnome-terminal.nix @@ -257,7 +257,7 @@ let else { use-system-font = false; - font = pcfg.font; + inherit (pcfg) font; } ) // ( @@ -271,7 +271,7 @@ let use-theme-colors = false; foreground-color = pcfg.colors.foregroundColor; background-color = pcfg.colors.backgroundColor; - palette = pcfg.colors.palette; + inherit (pcfg.colors) palette; } // lib.optionalAttrs (pcfg.allowBold != null) { allow-bold = pcfg.allowBold; diff --git a/modules/programs/havoc.nix b/modules/programs/havoc.nix index b808fe1b6..ed35b2d42 100644 --- a/modules/programs/havoc.nix +++ b/modules/programs/havoc.nix @@ -17,7 +17,7 @@ in package = lib.mkPackageOption pkgs "havoc" { nullable = true; }; settings = lib.mkOption { - type = iniFormat.type; + inherit (iniFormat) type; default = { }; description = '' Configuration written to diff --git a/modules/programs/helix.nix b/modules/programs/helix.nix index 74b029c05..25d46bcc4 100644 --- a/modules/programs/helix.nix +++ b/modules/programs/helix.nix @@ -55,7 +55,7 @@ in }; settings = mkOption { - type = tomlFormat.type; + inherit (tomlFormat) type; default = { }; example = literalExpression '' { diff --git a/modules/programs/himalaya.nix b/modules/programs/himalaya.nix index 2c4c8cff8..8c859fb9c 100644 --- a/modules/programs/himalaya.nix +++ b/modules/programs/himalaya.nix @@ -16,7 +16,7 @@ let # Needed for notmuch config, because the DB is here, and not in each # account's dir - maildirBasePath = config.accounts.email.maildirBasePath; + inherit (config.accounts.email) maildirBasePath; # make encryption config based on the given home-manager email # account TLS config @@ -43,10 +43,10 @@ let display-name = account.realName; default = account.primary; folder.aliases = { - inbox = account.folders.inbox; - sent = account.folders.sent; - drafts = account.folders.drafts; - trash = account.folders.trash; + inherit (account.folders) inbox; + inherit (account.folders) sent; + inherit (account.folders) drafts; + inherit (account.folders) trash; }; }; diff --git a/modules/programs/hyfetch.nix b/modules/programs/hyfetch.nix index e6b3e80a6..b00355e69 100644 --- a/modules/programs/hyfetch.nix +++ b/modules/programs/hyfetch.nix @@ -18,7 +18,7 @@ in package = lib.mkPackageOption pkgs "hyfetch" { }; settings = lib.mkOption { - type = jsonFormat.type; + inherit (jsonFormat) type; default = { }; example = lib.literalExpression '' { diff --git a/modules/programs/hyprpanel/default.nix b/modules/programs/hyprpanel/default.nix index 7fc6e9ec8..2b4acb968 100644 --- a/modules/programs/hyprpanel/default.nix +++ b/modules/programs/hyprpanel/default.nix @@ -24,7 +24,7 @@ in package = lib.mkPackageOption pkgs "hyprpanel" { }; settings = lib.mkOption { - type = jsonFormat.type; + inherit (jsonFormat) type; default = { }; example = lib.literalExpression '' bar.battery.label = true; diff --git a/modules/programs/i3bar-river.nix b/modules/programs/i3bar-river.nix index c9d1c395f..1609857a0 100644 --- a/modules/programs/i3bar-river.nix +++ b/modules/programs/i3bar-river.nix @@ -22,7 +22,7 @@ in enable = mkEnableOption "i3bar-river"; package = mkPackageOption pkgs "i3bar-river" { nullable = true; }; settings = mkOption { - type = formatter.type; + inherit (formatter) type; default = { }; example = { background = "#282828ff"; diff --git a/modules/programs/i3status-rust.nix b/modules/programs/i3status-rust.nix index 93e2ab9fc..a080041a3 100644 --- a/modules/programs/i3status-rust.nix +++ b/modules/programs/i3status-rust.nix @@ -26,7 +26,7 @@ in options = { blocks = mkOption { - type = settingsFormat.type; + inherit (settingsFormat) type; default = [ { block = "cpu"; } { @@ -93,7 +93,7 @@ in }; settings = mkOption { - type = settingsFormat.type; + inherit (settingsFormat) type; default = { }; description = '' Any extra options to add to i3status-rust @@ -259,14 +259,14 @@ in theme = if lib.versionAtLeast cfg.package.version "0.30.0" then { - theme = cfgBar.theme; + inherit (cfgBar) theme; } else cfgBar.theme; icons = if lib.versionAtLeast cfg.package.version "0.30.0" then { - icons = cfgBar.icons; + inherit (cfgBar) icons; } else cfgBar.icons; diff --git a/modules/programs/iamb.nix b/modules/programs/iamb.nix index 61ccba7a1..fe16a1664 100644 --- a/modules/programs/iamb.nix +++ b/modules/programs/iamb.nix @@ -20,7 +20,7 @@ in package = lib.mkPackageOption pkgs "iamb" { nullable = true; }; settings = lib.mkOption { - type = tomlFormat.type; + inherit (tomlFormat) type; default = { }; example = lib.literalExpression '' { diff --git a/modules/programs/infat.nix b/modules/programs/infat.nix index 8ec05a677..6b69c6f97 100644 --- a/modules/programs/infat.nix +++ b/modules/programs/infat.nix @@ -26,7 +26,7 @@ in enable = lib.mkEnableOption "infat"; package = lib.mkPackageOption pkgs "infat" { nullable = true; }; settings = lib.mkOption { - type = tomlFormat.type; + inherit (tomlFormat) type; default = { }; example = lib.literalExpression '' { diff --git a/modules/programs/inori.nix b/modules/programs/inori.nix index fe94a8a2f..0ffe8090e 100644 --- a/modules/programs/inori.nix +++ b/modules/programs/inori.nix @@ -32,7 +32,7 @@ in package = mkPackageOption pkgs "inori" { nullable = true; }; settings = mkOption { - type = tomlFormat.type; + inherit (tomlFormat) type; default = { }; example = literalExpression '' { diff --git a/modules/programs/joshuto.nix b/modules/programs/joshuto.nix index 58c116fed..8cfd7bb44 100644 --- a/modules/programs/joshuto.nix +++ b/modules/programs/joshuto.nix @@ -19,7 +19,7 @@ in package = lib.mkPackageOption pkgs "joshuto" { }; settings = mkOption { - type = tomlFormat.type; + inherit (tomlFormat) type; default = { }; description = '' Configuration written to @@ -31,7 +31,7 @@ in }; keymap = mkOption { - type = tomlFormat.type; + inherit (tomlFormat) type; default = { }; description = '' Configuration written to @@ -43,7 +43,7 @@ in }; mimetype = mkOption { - type = tomlFormat.type; + inherit (tomlFormat) type; default = { }; description = '' Configuration written to @@ -55,7 +55,7 @@ in }; theme = mkOption { - type = tomlFormat.type; + inherit (tomlFormat) type; default = { }; description = '' Configuration written to diff --git a/modules/programs/jqp.nix b/modules/programs/jqp.nix index 6238ad1b8..cd6944e02 100644 --- a/modules/programs/jqp.nix +++ b/modules/programs/jqp.nix @@ -16,7 +16,7 @@ in package = lib.mkPackageOption pkgs "jqp" { nullable = true; }; settings = lib.mkOption { - type = yamlFormat.type; + inherit (yamlFormat) type; default = { }; example = { theme = { diff --git a/modules/programs/jujutsu.nix b/modules/programs/jujutsu.nix index 7a4a9af3a..527d0e4cb 100644 --- a/modules/programs/jujutsu.nix +++ b/modules/programs/jujutsu.nix @@ -52,7 +52,7 @@ in }; settings = mkOption { - type = tomlFormat.type; + inherit (tomlFormat) type; default = { }; example = { user = { diff --git a/modules/programs/k9s.nix b/modules/programs/k9s.nix index 42c25ac4e..b79f7b509 100644 --- a/modules/programs/k9s.nix +++ b/modules/programs/k9s.nix @@ -43,7 +43,7 @@ in package = lib.mkPackageOption pkgs "k9s" { nullable = true; }; settings = mkOption { - type = yamlFormat.type; + inherit (yamlFormat) type; default = { }; description = '' Configuration written to {file}`$XDG_CONFIG_HOME/k9s/config.yaml` (linux) @@ -80,7 +80,7 @@ in }; aliases = mkOption { - type = yamlFormat.type; + inherit (yamlFormat) type; default = { }; description = '' Aliases written to {file}`$XDG_CONFIG_HOME/k9s/aliases.yaml` (linux) @@ -96,7 +96,7 @@ in }; hotKeys = mkOption { - type = yamlFormat.type; + inherit (yamlFormat) type; default = { }; description = '' Hotkeys written to {file}`$XDG_CONFIG_HOME/k9s/hotkeys.yaml` (linux) @@ -115,7 +115,7 @@ in }; plugins = mkOption { - type = yamlFormat.type; + inherit (yamlFormat) type; default = { }; description = '' Plugins written to {file}`$XDG_CONFIG_HOME/k9s/plugins.yaml (linux)` @@ -147,7 +147,7 @@ in }; views = mkOption { - type = yamlFormat.type; + inherit (yamlFormat) type; default = { }; description = '' Resource column views written to diff --git a/modules/programs/kakoune.nix b/modules/programs/kakoune.nix index ca8e8a580..d22f4c5ff 100644 --- a/modules/programs/kakoune.nix +++ b/modules/programs/kakoune.nix @@ -543,7 +543,7 @@ let kakouneWithPlugins = pkgs.wrapKakoune cfg.package { configure = { - plugins = cfg.plugins; + inherit (cfg) plugins; }; }; diff --git a/modules/programs/keepassxc.nix b/modules/programs/keepassxc.nix index dabb80083..e3ee18c83 100644 --- a/modules/programs/keepassxc.nix +++ b/modules/programs/keepassxc.nix @@ -42,7 +42,7 @@ in package = lib.mkPackageOption pkgs "keepassxc" { nullable = true; }; settings = lib.mkOption { - type = iniFormat.type; + inherit (iniFormat) type; default = { }; example = lib.literalExpression '' { diff --git a/modules/programs/khal/default.nix b/modules/programs/khal/default.nix index b0cdc7575..8c397752c 100644 --- a/modules/programs/khal/default.nix +++ b/modules/programs/khal/default.nix @@ -213,7 +213,7 @@ in }; settings = mkOption { - type = iniFormat.type; + inherit (iniFormat) type; default = { }; example = lib.literalExpression '' { diff --git a/modules/programs/kickoff.nix b/modules/programs/kickoff.nix index 9660acbe2..f57db83f2 100644 --- a/modules/programs/kickoff.nix +++ b/modules/programs/kickoff.nix @@ -23,7 +23,7 @@ in enable = mkEnableOption "kickoff"; package = mkPackageOption pkgs "kickoff" { nullable = true; }; settings = mkOption { - type = formatter.type; + inherit (formatter) type; default = { }; example = '' padding = 100; diff --git a/modules/programs/kraftkit.nix b/modules/programs/kraftkit.nix index 3596bb988..3a88d6ffe 100644 --- a/modules/programs/kraftkit.nix +++ b/modules/programs/kraftkit.nix @@ -25,7 +25,7 @@ in package = mkPackageOption pkgs "kraft" { nullable = true; }; settings = mkOption { - type = yamlFormat.type; + inherit (yamlFormat) type; default = { }; description = '' Configuration written to {file}`$XDG_CONFIG_HOME/kraftkit/config.yaml`. diff --git a/modules/programs/kubecolor.nix b/modules/programs/kubecolor.nix index 832802607..785bff4cd 100644 --- a/modules/programs/kubecolor.nix +++ b/modules/programs/kubecolor.nix @@ -31,7 +31,7 @@ in enableZshIntegration = lib.hm.shell.mkZshIntegrationOption { inherit config; }; settings = mkOption { - type = yamlFormat.type; + inherit (yamlFormat) type; default = { }; example = lib.literalExpression '' kubectl = lib.getExe pkgs.kubectl diff --git a/modules/programs/kubeswitch.nix b/modules/programs/kubeswitch.nix index 3e8f01acb..0bf623194 100644 --- a/modules/programs/kubeswitch.nix +++ b/modules/programs/kubeswitch.nix @@ -30,7 +30,7 @@ in enableZshIntegration = lib.hm.shell.mkZshIntegrationOption { inherit config; }; settings = lib.mkOption { - type = yamlFormat.type; + inherit (yamlFormat) type; default = { }; example = { kind = "SwitchConfig"; diff --git a/modules/programs/lapce.nix b/modules/programs/lapce.nix index 18c5b05bf..65c3f68df 100644 --- a/modules/programs/lapce.nix +++ b/modules/programs/lapce.nix @@ -30,7 +30,7 @@ let ''; }; settings = mkOption { - type = settingsFormat.type; + inherit (settingsFormat) type; default = { }; description = '' Configuration written to {file}`$XDG_CONFIG_HOME/lapce/settings.toml`. @@ -115,7 +115,7 @@ let ''; }; keymaps = mkOption { - type = settingsFormat.type; + inherit (settingsFormat) type; default = [ ]; description = '' Keymaps written to {file}`$XDG_CONFIG_HOME/lapce/keymaps.toml`. @@ -231,7 +231,7 @@ in { configFile = { "${dir}/settings.toml".source = settingsFormat.generate "settings.toml" cfg.settings; - "${dir}/keymaps.toml".source = settingsFormat.generate "keymaps.toml" { keymaps = cfg.keymaps; }; + "${dir}/keymaps.toml".source = settingsFormat.generate "keymaps.toml" { inherit (cfg) keymaps; }; }; dataFile."${dir}/plugins".source = pluginsFromRegistry cfg.plugins; }; diff --git a/modules/programs/lazydocker.nix b/modules/programs/lazydocker.nix index 8da0bd187..530241595 100644 --- a/modules/programs/lazydocker.nix +++ b/modules/programs/lazydocker.nix @@ -27,7 +27,7 @@ in package = lib.mkPackageOption pkgs "lazydocker" { nullable = true; }; settings = lib.mkOption { - type = yamlFormat.type; + inherit (yamlFormat) type; default = { commandTemplates.dockerCompose = "docker compose"; # Lazydocker uses docker-compose by default which will not work }; diff --git a/modules/programs/lazygit.nix b/modules/programs/lazygit.nix index cf86aebe1..ff77b9bff 100644 --- a/modules/programs/lazygit.nix +++ b/modules/programs/lazygit.nix @@ -29,7 +29,7 @@ in package = lib.mkPackageOption pkgs "lazygit" { nullable = true; }; settings = lib.mkOption { - type = yamlFormat.type; + inherit (yamlFormat) type; default = { }; defaultText = lib.literalExpression "{ }"; example = lib.literalExpression '' diff --git a/modules/programs/lazysql.nix b/modules/programs/lazysql.nix index bc6b6eb29..b93f012b1 100644 --- a/modules/programs/lazysql.nix +++ b/modules/programs/lazysql.nix @@ -23,7 +23,7 @@ in enable = mkEnableOption "lazysql"; package = mkPackageOption pkgs "lazysql" { nullable = true; }; settings = mkOption { - type = formatter.type; + inherit (formatter) type; default = { }; example = { }; description = '' diff --git a/modules/programs/looking-glass-client.nix b/modules/programs/looking-glass-client.nix index 2d6fb416c..0dacab488 100644 --- a/modules/programs/looking-glass-client.nix +++ b/modules/programs/looking-glass-client.nix @@ -17,7 +17,7 @@ in package = lib.mkPackageOption pkgs "looking-glass-client" { nullable = true; }; settings = lib.mkOption { - type = settingsFormat.type; + inherit (settingsFormat) type; default = { }; description = "looking-glass-client settings."; example = lib.literalExpression '' diff --git a/modules/programs/lsd.nix b/modules/programs/lsd.nix index c5d3c922e..ac72ee3ab 100644 --- a/modules/programs/lsd.nix +++ b/modules/programs/lsd.nix @@ -35,7 +35,7 @@ in enableZshIntegration = lib.hm.shell.mkZshIntegrationOption { inherit config; }; settings = lib.mkOption { - type = yamlFormat.type; + inherit (yamlFormat) type; default = { }; example = { date = "relative"; diff --git a/modules/programs/mc.nix b/modules/programs/mc.nix index a91320bba..5a5632d66 100644 --- a/modules/programs/mc.nix +++ b/modules/programs/mc.nix @@ -7,7 +7,7 @@ let cfg = config.programs.mc; - type = (pkgs.formats.ini { }).type; + inherit ((pkgs.formats.ini { })) type; in { options.programs.mc = { diff --git a/modules/programs/mcfly.nix b/modules/programs/mcfly.nix index 5ff0d7580..01965e452 100644 --- a/modules/programs/mcfly.nix +++ b/modules/programs/mcfly.nix @@ -73,7 +73,7 @@ in mcflyFzfPackage = lib.mkPackageOption pkgs "mcfly-fzf" { }; settings = mkOption { - type = tomlFormat.type; + inherit (tomlFormat) type; default = { }; example = lib.literalExpression '' { diff --git a/modules/programs/meli.nix b/modules/programs/meli.nix index e001e65bb..9791e4751 100644 --- a/modules/programs/meli.nix +++ b/modules/programs/meli.nix @@ -46,7 +46,7 @@ let mkSmtp = account: { hostname = account.smtp.host; - port = account.smtp.port; + inherit (account.smtp) port; auth = { type = "auto"; username = account.userName; diff --git a/modules/programs/mercurial.nix b/modules/programs/mercurial.nix index 410229d0d..e7a303d41 100644 --- a/modules/programs/mercurial.nix +++ b/modules/programs/mercurial.nix @@ -43,7 +43,7 @@ in }; iniContent = mkOption { - type = iniFormat.type; + inherit (iniFormat) type; internal = true; }; diff --git a/modules/programs/micro.nix b/modules/programs/micro.nix index 146dff938..38401a114 100644 --- a/modules/programs/micro.nix +++ b/modules/programs/micro.nix @@ -19,7 +19,7 @@ in package = lib.mkPackageOption pkgs "micro" { nullable = true; }; settings = lib.mkOption { - type = jsonFormat.type; + inherit (jsonFormat) type; default = { }; example = lib.literalExpression '' { diff --git a/modules/programs/mistral-vibe.nix b/modules/programs/mistral-vibe.nix index 15d14a4a9..c11680259 100644 --- a/modules/programs/mistral-vibe.nix +++ b/modules/programs/mistral-vibe.nix @@ -23,7 +23,7 @@ in package = lib.mkPackageOption pkgs "mistral-vibe" { nullable = true; }; settings = lib.mkOption { - type = settingsFormat.type; + inherit (settingsFormat) type; default = { }; example = lib.literalExpression '' { diff --git a/modules/programs/mods.nix b/modules/programs/mods.nix index e73e2789d..f387974fa 100644 --- a/modules/programs/mods.nix +++ b/modules/programs/mods.nix @@ -19,7 +19,7 @@ in package = lib.mkPackageOption pkgs "mods" { }; settings = lib.mkOption { - type = yamlFormat.type; + inherit (yamlFormat) type; default = { }; example = '' { diff --git a/modules/programs/mr.nix b/modules/programs/mr.nix index ea4a48782..b6b31b7e6 100644 --- a/modules/programs/mr.nix +++ b/modules/programs/mr.nix @@ -20,7 +20,7 @@ in package = lib.mkPackageOption pkgs "mr" { nullable = true; }; settings = lib.mkOption { - type = iniFormat.type; + inherit (iniFormat) type; default = { }; description = '' Configuration written to {file}`$HOME/.mrconfig` diff --git a/modules/programs/msmtp/default.nix b/modules/programs/msmtp/default.nix index 1b00918a7..f78b54b71 100644 --- a/modules/programs/msmtp/default.nix +++ b/modules/programs/msmtp/default.nix @@ -22,7 +22,7 @@ let [ "account ${name}" ] ++ lib.mapAttrsToList (n: v: n + " " + v) ( { - host = smtp.host; + inherit (smtp) host; from = address; auth = "on"; user = userName; diff --git a/modules/programs/mypy.nix b/modules/programs/mypy.nix index 2988f6600..f13592f7d 100644 --- a/modules/programs/mypy.nix +++ b/modules/programs/mypy.nix @@ -20,7 +20,7 @@ in package = lib.mkPackageOption pkgs "mypy" { nullable = true; }; settings = lib.mkOption { - type = iniFormat.type; + inherit (iniFormat) type; default = { }; example = lib.literalExpression '' { diff --git a/modules/programs/navi.nix b/modules/programs/navi.nix index 364ef89a7..89a92ddd4 100644 --- a/modules/programs/navi.nix +++ b/modules/programs/navi.nix @@ -27,7 +27,7 @@ in package = lib.mkPackageOption pkgs "navi" { }; settings = lib.mkOption { - type = yamlFormat.type; + inherit (yamlFormat) type; default = { }; example = lib.literalExpression '' { diff --git a/modules/programs/ncspot.nix b/modules/programs/ncspot.nix index 695c4e012..33ac50660 100644 --- a/modules/programs/ncspot.nix +++ b/modules/programs/ncspot.nix @@ -20,7 +20,7 @@ in package = lib.mkPackageOption pkgs "ncspot" { nullable = true; }; settings = lib.mkOption { - type = tomlFormat.type; + inherit (tomlFormat) type; default = { }; example = lib.literalExpression '' { diff --git a/modules/programs/neomutt/default.nix b/modules/programs/neomutt/default.nix index f0a154992..5c8fe8a92 100644 --- a/modules/programs/neomutt/default.nix +++ b/modules/programs/neomutt/default.nix @@ -326,7 +326,7 @@ let notmuchSection = account: let - virtualMailboxes = account.notmuch.neomutt.virtualMailboxes; + inherit (account.notmuch.neomutt) virtualMailboxes; in '' # notmuch section diff --git a/modules/programs/neovide.nix b/modules/programs/neovide.nix index 19b21e9b4..7ac33a35f 100644 --- a/modules/programs/neovide.nix +++ b/modules/programs/neovide.nix @@ -20,7 +20,7 @@ in package = lib.mkPackageOption pkgs "neovide" { nullable = true; }; settings = lib.mkOption { - type = settingsFormat.type; + inherit (settingsFormat) type; default = { }; example = lib.literalExpression '' { diff --git a/modules/programs/nheko.nix b/modules/programs/nheko.nix index b17c2a91d..eb25ee36d 100644 --- a/modules/programs/nheko.nix +++ b/modules/programs/nheko.nix @@ -27,7 +27,7 @@ in package = lib.mkPackageOption pkgs "nheko" { nullable = true; }; settings = lib.mkOption { - type = iniFmt.type; + inherit (iniFmt) type; default = { }; example = lib.literalExpression '' { diff --git a/modules/programs/nix-init.nix b/modules/programs/nix-init.nix index 9ef202466..4ccc5aa89 100644 --- a/modules/programs/nix-init.nix +++ b/modules/programs/nix-init.nix @@ -15,7 +15,7 @@ in enable = lib.mkEnableOption "nix-init"; package = lib.mkPackageOption pkgs "nix-init" { nullable = true; }; settings = lib.mkOption { - type = tomlFormat.type; + inherit (tomlFormat) type; default = { }; example = lib.literalExpression '' { diff --git a/modules/programs/nix-search-tv.nix b/modules/programs/nix-search-tv.nix index 244fc3cc3..650c0fb16 100644 --- a/modules/programs/nix-search-tv.nix +++ b/modules/programs/nix-search-tv.nix @@ -19,7 +19,7 @@ in package = lib.mkPackageOption pkgs "nix-search-tv" { nullable = true; }; settings = lib.mkOption { - type = jsonFormat.type; + inherit (jsonFormat) type; default = { }; description = '' Configuration written to {file}`$XDG_CONFIG_HOME/nix-search-tv/config.json`. diff --git a/modules/programs/notmuch/default.nix b/modules/programs/notmuch/default.nix index f051c8cc3..077fb1f5b 100644 --- a/modules/programs/notmuch/default.nix +++ b/modules/programs/notmuch/default.nix @@ -41,8 +41,7 @@ let }; new = { - ignore = cfg.new.ignore; - tags = cfg.new.tags; + inherit (cfg.new) ignore tags; }; user = diff --git a/modules/programs/numbat.nix b/modules/programs/numbat.nix index 4da1392d6..c79a4493c 100644 --- a/modules/programs/numbat.nix +++ b/modules/programs/numbat.nix @@ -26,7 +26,7 @@ in package = lib.mkPackageOption pkgs "numbat" { nullable = true; }; settings = lib.mkOption { - type = tomlFormat.type; + inherit (tomlFormat) type; default = { }; example = { intro-banner = "short"; diff --git a/modules/programs/obs-studio.nix b/modules/programs/obs-studio.nix index ca72ea559..bfd2533d2 100644 --- a/modules/programs/obs-studio.nix +++ b/modules/programs/obs-studio.nix @@ -37,7 +37,7 @@ in config = lib.mkIf cfg.enable { home.packages = [ cfg.finalPackage ]; programs.obs-studio.finalPackage = pkgs.wrapOBS.override { obs-studio = cfg.package; } { - plugins = cfg.plugins; + inherit (cfg) plugins; }; }; } diff --git a/modules/programs/offlineimap/default.nix b/modules/programs/offlineimap/default.nix index 05bc7d651..fa57eb893 100644 --- a/modules/programs/offlineimap/default.nix +++ b/modules/programs/offlineimap/default.nix @@ -180,7 +180,7 @@ in pkgs.runCommandLocal "get_settings-compile" { nativeBuildInputs = [ cfg.package ]; - pythonFile = cfg.pythonFile; + inherit (cfg) pythonFile; passAsFile = [ "pythonFile" ]; } '' diff --git a/modules/programs/oh-my-posh.nix b/modules/programs/oh-my-posh.nix index 3501d1500..43a006be9 100644 --- a/modules/programs/oh-my-posh.nix +++ b/modules/programs/oh-my-posh.nix @@ -31,7 +31,7 @@ in package = lib.mkPackageOption pkgs "oh-my-posh" { }; settings = lib.mkOption { - type = jsonFormat.type; + inherit (jsonFormat) type; default = { }; example = lib.literalExpression ''builtins.fromJSON (builtins.unsafeDiscardStringContext (builtins.readFile "''${pkgs.oh-my-posh}/share/oh-my-posh/themes/space.omp.json"))''; description = '' diff --git a/modules/programs/onlyoffice.nix b/modules/programs/onlyoffice.nix index 9d1f7604d..b2b90715e 100644 --- a/modules/programs/onlyoffice.nix +++ b/modules/programs/onlyoffice.nix @@ -25,7 +25,7 @@ in package = mkPackageOption pkgs "onlyoffice-desktopeditors" { nullable = true; }; settings = mkOption { - type = formatter.type; + inherit (formatter) type; default = { }; example = '' UITheme = "theme-contrast-dark"; diff --git a/modules/programs/opencode.nix b/modules/programs/opencode.nix index 88615c420..2b23a8a98 100644 --- a/modules/programs/opencode.nix +++ b/modules/programs/opencode.nix @@ -19,7 +19,7 @@ let jsonFormat = pkgs.formats.json { }; transformMcpServer = name: server: { - name = name; + inherit name; value = { enabled = !(server.disabled or false); } @@ -27,9 +27,9 @@ let if server ? url then { type = "remote"; - url = server.url; + inherit (server) url; } - // (lib.optionalAttrs (server ? headers) { headers = server.headers; }) + // (lib.optionalAttrs (server ? headers) { inherit (server) headers; }) else if server ? command then { type = "local"; diff --git a/modules/programs/openstackclient.nix b/modules/programs/openstackclient.nix index 119803690..96ce3c625 100644 --- a/modules/programs/openstackclient.nix +++ b/modules/programs/openstackclient.nix @@ -69,7 +69,7 @@ in xdg.configFile."openstack/clouds.yaml".source = yamlFormat.generate "openstackclient-clouds-yaml-${config.home.username}" { - clouds = cfg.clouds; + inherit (cfg) clouds; }; xdg.configFile."openstack/clouds-public.yaml".source = diff --git a/modules/programs/pandoc.nix b/modules/programs/pandoc.nix index d8cd99cd7..dffb7b454 100644 --- a/modules/programs/pandoc.nix +++ b/modules/programs/pandoc.nix @@ -45,7 +45,7 @@ in }; defaults = mkOption { - type = jsonFormat.type; + inherit (jsonFormat) type; default = { }; example = literalExpression '' { diff --git a/modules/programs/pet.nix b/modules/programs/pet.nix index 6bf919b4f..dc30b7507 100644 --- a/modules/programs/pet.nix +++ b/modules/programs/pet.nix @@ -59,7 +59,7 @@ in package = lib.mkPackageOption pkgs "pet" { nullable = true; }; settings = mkOption { - type = format.type; + inherit (format) type; default = { }; description = '' Settings written to {file}`config.toml`. See the pet @@ -110,7 +110,7 @@ in } ); "pet/snippet.toml" = lib.mkIf (cfg.snippets != [ ]) { - source = format.generate "snippet.toml" { snippets = cfg.snippets; }; + source = format.generate "snippet.toml" { inherit (cfg) snippets; }; }; }; }; diff --git a/modules/programs/pgcli.nix b/modules/programs/pgcli.nix index 0c612af91..f8940b73d 100644 --- a/modules/programs/pgcli.nix +++ b/modules/programs/pgcli.nix @@ -27,7 +27,7 @@ in package = mkPackageOption pkgs "pgcli" { nullable = true; }; settings = mkOption { - type = iniFormat.type; + inherit (iniFormat) type; default = { }; example = literalExpression '' { diff --git a/modules/programs/piston-cli.nix b/modules/programs/piston-cli.nix index 25e6a4ad8..819d5cbfa 100644 --- a/modules/programs/piston-cli.nix +++ b/modules/programs/piston-cli.nix @@ -17,7 +17,7 @@ in package = lib.mkPackageOption pkgs "piston-cli" { }; settings = lib.mkOption { - type = yamlFormat.type; + inherit (yamlFormat) type; default = { }; example = lib.literalExpression '' { diff --git a/modules/programs/poetry.nix b/modules/programs/poetry.nix index 1f0684a5e..5c889b11d 100644 --- a/modules/programs/poetry.nix +++ b/modules/programs/poetry.nix @@ -34,7 +34,7 @@ in }; settings = mkOption { - type = tomlFormat.type; + inherit (tomlFormat) type; default = { }; example = literalExpression '' { diff --git a/modules/programs/pqiv.nix b/modules/programs/pqiv.nix index ed3be9a38..77f0b31a6 100644 --- a/modules/programs/pqiv.nix +++ b/modules/programs/pqiv.nix @@ -20,7 +20,7 @@ in package = lib.mkPackageOption pkgs "pqiv" { }; settings = lib.mkOption { - type = iniFormat.type; + inherit (iniFormat) type; default = { }; description = '' Configuration written to {file}`$XDG_CONFIG_HOME/pqivrc`. See diff --git a/modules/programs/pylint.nix b/modules/programs/pylint.nix index f8ef8d1c4..cbb7eb57a 100644 --- a/modules/programs/pylint.nix +++ b/modules/programs/pylint.nix @@ -15,7 +15,7 @@ in enable = lib.mkEnableOption "the pylint Python linter"; package = lib.mkPackageOption pkgs [ "python3Packages" "pylint" ] { }; settings = lib.mkOption { - type = iniFormat.type; + inherit (iniFormat) type; default = { }; defaultText = lib.literalExpression "{}"; description = "The pylint configuration."; diff --git a/modules/programs/radio-cli.nix b/modules/programs/radio-cli.nix index f290daa55..4f3e3a601 100644 --- a/modules/programs/radio-cli.nix +++ b/modules/programs/radio-cli.nix @@ -22,7 +22,7 @@ in enable = mkEnableOption "radio-cli"; package = mkPackageOption pkgs "radio-cli" { nullable = true; }; settings = mkOption { - type = jsonFormat.type; + inherit (jsonFormat) type; default = { }; example = { config_version = "2.3.0"; diff --git a/modules/programs/rbenv.nix b/modules/programs/rbenv.nix index fd8b16714..9ffde3666 100644 --- a/modules/programs/rbenv.nix +++ b/modules/programs/rbenv.nix @@ -72,7 +72,7 @@ in home.file.".rbenv/plugins" = mkIf (cfg.plugins != [ ]) { source = pkgs.linkFarm "rbenv-plugins" ( map (p: { - name = p.name; + inherit (p) name; path = p.src; }) cfg.plugins ); diff --git a/modules/programs/rio.nix b/modules/programs/rio.nix index 2319b3387..904ebffdd 100644 --- a/modules/programs/rio.nix +++ b/modules/programs/rio.nix @@ -35,7 +35,7 @@ in package = mkPackageOption pkgs "rio" { nullable = true; }; settings = mkOption { - type = settingsFormat.type; + inherit (settingsFormat) type; default = { }; description = '' Configuration written to {file}`$XDG_CONFIG_HOME/rio/config.toml`. See diff --git a/modules/programs/rofi.nix b/modules/programs/rofi.nix index 92cc6543b..a564bd702 100644 --- a/modules/programs/rofi.nix +++ b/modules/programs/rofi.nix @@ -347,12 +347,14 @@ in toRasi { configuration = ( { - font = cfg.font; - terminal = cfg.terminal; - cycle = cfg.cycle; + inherit (cfg) + cycle + font + terminal + xoffset + yoffset + ; location = (lib.getAttr cfg.location locationsMap); - xoffset = cfg.xoffset; - yoffset = cfg.yoffset; } // lib.optionalAttrs (modes != [ ]) { inherit modes; } // cfg.extraConfig diff --git a/modules/programs/ruff.nix b/modules/programs/ruff.nix index 436dbe6c0..299b04d0d 100644 --- a/modules/programs/ruff.nix +++ b/modules/programs/ruff.nix @@ -20,7 +20,7 @@ in package = lib.mkPackageOption pkgs "ruff" { nullable = true; }; settings = lib.mkOption { - type = settingsFormat.type; + inherit (settingsFormat) type; default = { }; example = lib.literalExpression '' { diff --git a/modules/programs/sapling.nix b/modules/programs/sapling.nix index 20a11182d..91ad87fff 100644 --- a/modules/programs/sapling.nix +++ b/modules/programs/sapling.nix @@ -47,7 +47,7 @@ in }; iniContent = mkOption { - type = iniFormat.type; + inherit (iniFormat) type; internal = true; }; }; diff --git a/modules/programs/satty.nix b/modules/programs/satty.nix index b09dec0d4..9e5815bae 100644 --- a/modules/programs/satty.nix +++ b/modules/programs/satty.nix @@ -18,7 +18,7 @@ in package = lib.mkPackageOption pkgs "satty" { nullable = true; }; settings = lib.mkOption { - type = tomlFormat.type; + inherit (tomlFormat) type; default = { }; example = lib.literalExpression '' { diff --git a/modules/programs/sketchybar.nix b/modules/programs/sketchybar.nix index bb6748b36..ef3e953ec 100644 --- a/modules/programs/sketchybar.nix +++ b/modules/programs/sketchybar.nix @@ -272,7 +272,7 @@ in home.packages = [ cfg.finalPackage ]; launchd.agents.sketchybar = { - enable = cfg.service.enable; + inherit (cfg.service) enable; config = { Program = lib.getExe cfg.finalPackage; ProcessType = "Interactive"; diff --git a/modules/programs/smug.nix b/modules/programs/smug.nix index 50a91d79a..20029a1f1 100644 --- a/modules/programs/smug.nix +++ b/modules/programs/smug.nix @@ -14,7 +14,7 @@ let lib.mkOption { type = lib.types.nullOr (lib.types.listOf lib.types.str); default = null; - description = description; + inherit description; }; mkOptionRoot = @@ -22,7 +22,7 @@ let lib.mkOption { type = lib.types.nullOr lib.types.str; default = null; - description = description; + inherit description; }; in @@ -169,7 +169,7 @@ in (lib.attrsets.nameValuePair (if name == "beforeStart" then "before_start" else name) value) ) v // { - session = v.session; + inherit (v) session; windows = lib.lists.forEach v.windows ( winprop: (lib.filterAttrsRecursive (name: value: value != null) winprop) ); diff --git a/modules/programs/sqls.nix b/modules/programs/sqls.nix index c1a314b2d..689c6b4b2 100644 --- a/modules/programs/sqls.nix +++ b/modules/programs/sqls.nix @@ -18,7 +18,7 @@ in package = lib.mkPackageOption pkgs "sqls" { nullable = true; }; settings = lib.mkOption { - type = yamlFormat.type; + inherit (yamlFormat) type; default = { }; example = lib.literalExpression '' { diff --git a/modules/programs/superfile.nix b/modules/programs/superfile.nix index 3eb21cfb3..f29cab453 100644 --- a/modules/programs/superfile.nix +++ b/modules/programs/superfile.nix @@ -62,7 +62,7 @@ in zoxidePackage = mkPackageOption pkgs "zoxide" { nullable = true; }; settings = mkOption { - type = tomlFormat.type; + inherit (tomlFormat) type; default = { }; description = '' Configuration written to {file}`$XDG_CONFIG_HOME/superfile/config.toml` @@ -77,7 +77,7 @@ in }; hotkeys = mkOption { - type = tomlFormat.type; + inherit (tomlFormat) type; default = { }; description = '' Hotkey configuration written to {file}`$XDG_CONFIG_HOME/superfile/hotkeys.toml` diff --git a/modules/programs/sway-easyfocus.nix b/modules/programs/sway-easyfocus.nix index 236c5e4a7..c3d548b03 100644 --- a/modules/programs/sway-easyfocus.nix +++ b/modules/programs/sway-easyfocus.nix @@ -22,7 +22,7 @@ in enable = mkEnableOption "sway-easyfocus"; package = mkPackageOption pkgs "sway-easyfocus" { nullable = true; }; settings = mkOption { - type = formatter.type; + inherit (formatter) type; default = { }; example = { chars = "fjghdkslaemuvitywoqpcbnxz"; diff --git a/modules/programs/swayimg.nix b/modules/programs/swayimg.nix index 3edd8b232..a5ccd8733 100644 --- a/modules/programs/swayimg.nix +++ b/modules/programs/swayimg.nix @@ -18,7 +18,7 @@ in package = lib.mkPackageOption pkgs "swayimg" { }; settings = lib.mkOption { - type = iniFormat.type; + inherit (iniFormat) type; default = { }; description = '' Configuration written to diff --git a/modules/programs/tealdeer.nix b/modules/programs/tealdeer.nix index aabdbc591..d6d5fb972 100644 --- a/modules/programs/tealdeer.nix +++ b/modules/programs/tealdeer.nix @@ -104,7 +104,7 @@ in services.tldr-update = mkIf cfg.enableAutoUpdates { enable = true; - package = cfg.package; + inherit (cfg) package; }; }; } diff --git a/modules/programs/television.nix b/modules/programs/television.nix index b273f3b9b..3dae20460 100644 --- a/modules/programs/television.nix +++ b/modules/programs/television.nix @@ -19,7 +19,7 @@ in package = lib.mkPackageOption pkgs "television" { nullable = true; }; settings = lib.mkOption { - type = tomlFormat.type; + inherit (tomlFormat) type; default = { }; description = '' Configuration written to {file}`$XDG_CONFIG_HOME/television/config.toml`. diff --git a/modules/programs/tex-fmt.nix b/modules/programs/tex-fmt.nix index abfa676b5..74d2bfbae 100644 --- a/modules/programs/tex-fmt.nix +++ b/modules/programs/tex-fmt.nix @@ -32,7 +32,7 @@ in package = mkPackageOption pkgs "tex-fmt" { nullable = true; }; settings = mkOption { - type = tomlFormat.type; + inherit (tomlFormat) type; default = { }; example = literalExpression '' { diff --git a/modules/programs/thunderbird.nix b/modules/programs/thunderbird.nix index e77d05545..7e0056647 100644 --- a/modules/programs/thunderbird.nix +++ b/modules/programs/thunderbird.nix @@ -141,7 +141,7 @@ let toThunderbirdAccount = account: profile: let - id = account.id; + inherit (account) id; addresses = [ account.address ] ++ account.aliases; in { @@ -246,7 +246,7 @@ let toThunderbirdFeed = feed: profile: let - id = feed.id; + inherit (feed) id; in { "mail.account.account_${id}.server" = "server_${id}"; @@ -496,7 +496,7 @@ in inherit (args) config; inherit lib pkgs; appName = "Thunderbird"; - package = cfg.package; + inherit (cfg) package; modulePath = [ "programs" "thunderbird" @@ -935,7 +935,7 @@ in let accountNameToId = builtins.listToAttrs ( map (a: { - name = a.name; + inherit (a) name; value = "account_${a.id}"; }) accounts ); @@ -956,7 +956,7 @@ in let accountNameToId = builtins.listToAttrs ( map (a: { - name = a.name; + inherit (a) name; value = "calendar_${a.id}"; }) calendarAccounts ); @@ -998,8 +998,7 @@ in }; "${thunderbirdProfilesPath}/${name}/search.json.mozlz4" = mkIf (profile.search.enable) { - enable = profile.search.enable; - force = profile.search.force; + inherit (profile.search) enable force; source = profile.search.file; }; diff --git a/modules/programs/tiny.nix b/modules/programs/tiny.nix index 9c13deef0..d5b1e9060 100644 --- a/modules/programs/tiny.nix +++ b/modules/programs/tiny.nix @@ -23,7 +23,7 @@ in package = lib.mkPackageOption pkgs "tiny" { }; settings = lib.mkOption { - type = format.type; + inherit (format) type; default = { }; defaultText = lib.literalExpression "{ }"; example = lib.literalExpression '' diff --git a/modules/programs/tirith.nix b/modules/programs/tirith.nix index c0fa96888..dfd0f274e 100644 --- a/modules/programs/tirith.nix +++ b/modules/programs/tirith.nix @@ -30,7 +30,7 @@ in }; policy = lib.mkOption { - type = yamlFormat.type; + inherit (yamlFormat) type; default = { }; example = lib.literalExpression '' { diff --git a/modules/programs/topgrade.nix b/modules/programs/topgrade.nix index fa108ec4f..268a1ac5b 100644 --- a/modules/programs/topgrade.nix +++ b/modules/programs/topgrade.nix @@ -19,7 +19,7 @@ in package = lib.mkPackageOption pkgs "topgrade" { }; settings = lib.mkOption { - type = tomlFormat.type; + inherit (tomlFormat) type; default = { }; defaultText = lib.literalExpression "{ }"; example = lib.literalExpression '' diff --git a/modules/programs/tray-tui.nix b/modules/programs/tray-tui.nix index 8ce399b22..fd686b264 100644 --- a/modules/programs/tray-tui.nix +++ b/modules/programs/tray-tui.nix @@ -22,7 +22,7 @@ in enable = mkEnableOption "tray-tui"; package = mkPackageOption pkgs "tray-tui" { nullable = true; }; settings = mkOption { - type = tomlFormat.type; + inherit (tomlFormat) type; default = { }; example = { sorting = false; diff --git a/modules/programs/trippy.nix b/modules/programs/trippy.nix index 391f8d549..05ed45fe8 100644 --- a/modules/programs/trippy.nix +++ b/modules/programs/trippy.nix @@ -23,7 +23,7 @@ in enable = mkEnableOption "trippy"; package = mkPackageOption pkgs "trippy" { nullable = true; }; settings = mkOption { - type = tomlFormat.type; + inherit (tomlFormat) type; default = { }; example = { theme-colors = { diff --git a/modules/programs/ttyper.nix b/modules/programs/ttyper.nix index bcb429706..257dbde7f 100644 --- a/modules/programs/ttyper.nix +++ b/modules/programs/ttyper.nix @@ -24,7 +24,7 @@ in package = lib.mkPackageOption pkgs "ttyper" { nullable = true; }; settings = mkOption { - type = tomlFormat.type; + inherit (tomlFormat) type; default = { }; description = '' Configuration written to {file}`$XDG_CONFIG_HOME/ttyper/config.toml`. diff --git a/modules/programs/twitch-tui.nix b/modules/programs/twitch-tui.nix index b11c46133..b69710089 100644 --- a/modules/programs/twitch-tui.nix +++ b/modules/programs/twitch-tui.nix @@ -22,7 +22,7 @@ in enable = mkEnableOption "twitch-tui"; package = mkPackageOption pkgs "twitch-tui" { nullable = true; }; settings = mkOption { - type = tomlFormat.type; + inherit (tomlFormat) type; default = { }; example = { twitch = { diff --git a/modules/programs/ty.nix b/modules/programs/ty.nix index b278ef7ce..19926a787 100644 --- a/modules/programs/ty.nix +++ b/modules/programs/ty.nix @@ -24,7 +24,7 @@ in package = mkPackageOption pkgs "ty" { nullable = true; }; settings = mkOption { - type = tomlFormat.type; + inherit (tomlFormat) type; default = { }; example = literalExpression '' { diff --git a/modules/programs/uv.nix b/modules/programs/uv.nix index 29e5ef854..347566333 100644 --- a/modules/programs/uv.nix +++ b/modules/programs/uv.nix @@ -27,7 +27,7 @@ in package = mkPackageOption pkgs "uv" { nullable = true; }; settings = mkOption { - type = tomlFormat.type; + inherit (tomlFormat) type; default = { }; example = literalExpression '' { diff --git a/modules/programs/vdirsyncer/default.nix b/modules/programs/vdirsyncer/default.nix index 10ef32293..9586dfde0 100644 --- a/modules/programs/vdirsyncer/default.nix +++ b/modules/programs/vdirsyncer/default.nix @@ -35,7 +35,7 @@ let filterAttrs (_: v: v != null) ( (getAttrs [ "type" "fileExt" "encoding" ] a.local) // { - path = a.local.path; + inherit (a.local) path; postHook = if a.vdirsyncer.postHook != null then (pkgs.writeShellScriptBin "post-hook" a.vdirsyncer.postHook + "/bin/post-hook") diff --git a/modules/programs/vesktop.nix b/modules/programs/vesktop.nix index b1df5c49e..6b76c8df4 100644 --- a/modules/programs/vesktop.nix +++ b/modules/programs/vesktop.nix @@ -21,7 +21,7 @@ in enable = lib.mkEnableOption "Vesktop, an alternate client for Discord with Vencord built-in"; package = lib.mkPackageOption pkgs "vesktop" { nullable = true; }; settings = lib.mkOption { - type = jsonFormat.type; + inherit (jsonFormat) type; default = { }; description = '' Vesktop settings written to @@ -64,7 +64,7 @@ in ]); }; settings = lib.mkOption { - type = jsonFormat.type; + inherit (jsonFormat) type; default = { }; description = '' Vencord settings written to diff --git a/modules/programs/vim-vint.nix b/modules/programs/vim-vint.nix index 13419d929..8fa7a70b2 100644 --- a/modules/programs/vim-vint.nix +++ b/modules/programs/vim-vint.nix @@ -20,7 +20,7 @@ in package = lib.mkPackageOption pkgs "vim-vint" { nullable = true; }; settings = lib.mkOption { - type = yamlFormat.type; + inherit (yamlFormat) type; default = { }; description = '' Configuration written to diff --git a/modules/programs/vscode/default.nix b/modules/programs/vscode/default.nix index fd7d08815..d2ac56d3e 100644 --- a/modules/programs/vscode/default.nix +++ b/modules/programs/vscode/default.nix @@ -132,7 +132,7 @@ let cleanServer = lib.filterAttrs (n: v: n != "disabled") server; in { - name = name; + inherit name; value = { enabled = !(server.disabled or false); } @@ -289,7 +289,7 @@ let }; languageSnippets = mkOption { - type = jsonFormat.type; + inherit (jsonFormat) type; default = { }; example = { haskell = { @@ -304,7 +304,7 @@ let }; globalSnippets = mkOption { - type = jsonFormat.type; + inherit (jsonFormat) type; default = { }; example = { fixme = { diff --git a/modules/programs/wallust.nix b/modules/programs/wallust.nix index 03f9a25f3..8e5f20afb 100644 --- a/modules/programs/wallust.nix +++ b/modules/programs/wallust.nix @@ -25,7 +25,7 @@ in package = mkPackageOption pkgs "wallust" { nullable = true; }; settings = mkOption { - type = tomlFormat.type; + inherit (tomlFormat) type; default = { }; example = literalExpression '' { diff --git a/modules/programs/watson.nix b/modules/programs/watson.nix index a14bfad0f..f777e92d1 100644 --- a/modules/programs/watson.nix +++ b/modules/programs/watson.nix @@ -30,7 +30,7 @@ in enableZshIntegration = lib.hm.shell.mkZshIntegrationOption { inherit config; }; settings = lib.mkOption { - type = iniFormat.type; + inherit (iniFormat) type; default = { }; description = '' Configuration written to diff --git a/modules/programs/waveterm.nix b/modules/programs/waveterm.nix index 6b5c95c32..fd906aedd 100644 --- a/modules/programs/waveterm.nix +++ b/modules/programs/waveterm.nix @@ -23,7 +23,7 @@ in enable = mkEnableOption "waveterm"; package = mkPackageOption pkgs "waveterm" { nullable = true; }; settings = mkOption { - type = formatter.type; + inherit (formatter) type; default = { }; example = { "app:dismissarchitecturewarning" = false; @@ -45,7 +45,7 @@ in }; themes = mkOption { - type = formatter.type; + inherit (formatter) type; default = { }; example = { default-dark = { @@ -82,7 +82,7 @@ in }; bookmarks = mkOption { - type = formatter.type; + inherit (formatter) type; default = { }; example = { "bookmark@google" = { diff --git a/modules/programs/waybar.nix b/modules/programs/waybar.nix index a72734797..5d2b2236a 100644 --- a/modules/programs/waybar.nix +++ b/modules/programs/waybar.nix @@ -118,7 +118,7 @@ let }; modules = mkOption { - type = jsonFormat.type; + inherit (jsonFormat) type; visible = false; default = null; description = "Modules configuration."; diff --git a/modules/programs/xplr.nix b/modules/programs/xplr.nix index f23959782..41f4fed94 100644 --- a/modules/programs/xplr.nix +++ b/modules/programs/xplr.nix @@ -26,7 +26,7 @@ let name: value: if lib.isStorePath value then pkgs.symlinkJoin { - name = name; + inherit name; paths = [ value ]; postBuild = '' mkdir '${name}' diff --git a/modules/programs/yambar.nix b/modules/programs/yambar.nix index df01a2865..170117a46 100644 --- a/modules/programs/yambar.nix +++ b/modules/programs/yambar.nix @@ -20,7 +20,7 @@ in package = lib.mkPackageOption pkgs "yambar" { nullable = true; }; settings = lib.mkOption { - type = yamlFormat.type; + inherit (yamlFormat) type; default = { }; example = lib.literalExpression '' bar = { diff --git a/modules/programs/yarn/default.nix b/modules/programs/yarn/default.nix index 5aeb5c0ea..9bc9c3f22 100644 --- a/modules/programs/yarn/default.nix +++ b/modules/programs/yarn/default.nix @@ -22,7 +22,7 @@ in enable = mkEnableOption "management of yarn config"; settings = mkOption { - type = yamlFormat.type; + inherit (yamlFormat) type; default = { }; example = lib.literalExpression '' { diff --git a/modules/programs/yazi.nix b/modules/programs/yazi.nix index 3f6983211..d1802ee45 100644 --- a/modules/programs/yazi.nix +++ b/modules/programs/yazi.nix @@ -78,7 +78,7 @@ in enableZshIntegration = lib.hm.shell.mkZshIntegrationOption { inherit config; }; keymap = mkOption { - type = tomlFormat.type; + inherit (tomlFormat) type; default = { }; example = literalExpression '' { @@ -105,7 +105,7 @@ in }; settings = mkOption { - type = tomlFormat.type; + inherit (tomlFormat) type; default = { }; example = literalExpression '' { @@ -130,7 +130,7 @@ in }; theme = mkOption { - type = tomlFormat.type; + inherit (tomlFormat) type; default = { }; example = literalExpression '' { diff --git a/modules/programs/zed-editor.nix b/modules/programs/zed-editor.nix index e61d1adea..515b4bf89 100644 --- a/modules/programs/zed-editor.nix +++ b/modules/programs/zed-editor.nix @@ -109,7 +109,7 @@ in }; userSettings = mkOption { - type = jsonFormat.type; + inherit (jsonFormat) type; default = { }; example = literalExpression '' { @@ -130,7 +130,7 @@ in }; userKeymaps = mkOption { - type = jsonFormat.type; + inherit (jsonFormat) type; default = [ ]; example = literalExpression '' [ @@ -148,7 +148,7 @@ in }; userTasks = mkOption { - type = jsonFormat.type; + inherit (jsonFormat) type; default = [ ]; example = literalExpression '' [ @@ -168,7 +168,7 @@ in }; userDebug = mkOption { - type = jsonFormat.type; + inherit (jsonFormat) type; default = [ ]; example = literalExpression '' [ diff --git a/modules/programs/zellij.nix b/modules/programs/zellij.nix index 48c4fe31c..7cb86b568 100644 --- a/modules/programs/zellij.nix +++ b/modules/programs/zellij.nix @@ -141,7 +141,7 @@ in }; settings = lib.mkOption { - type = yamlFormat.type; + inherit (yamlFormat) type; default = { }; example = lib.literalExpression '' { diff --git a/modules/programs/zk.nix b/modules/programs/zk.nix index e7f64cbb0..8522ea776 100644 --- a/modules/programs/zk.nix +++ b/modules/programs/zk.nix @@ -20,7 +20,7 @@ in package = lib.mkPackageOption pkgs "zk" { nullable = true; }; settings = lib.mkOption { - type = tomlFormat.type; + inherit (tomlFormat) type; default = { }; example = lib.literalExpression '' { diff --git a/modules/services/activitywatch.nix b/modules/services/activitywatch.nix index 9d5086429..c1529d3fa 100644 --- a/modules/services/activitywatch.nix +++ b/modules/services/activitywatch.nix @@ -77,7 +77,7 @@ let }; settings = mkOption { - type = watcherSettingsFormat.type; + inherit (watcherSettingsFormat) type; default = { }; example = { timeout = 300; @@ -154,7 +154,7 @@ in Configuration for `aw-server-rust` to be generated at {file}`$XDG_CONFIG_HOME/activitywatch/aw-server-rust/config.toml`. ''; - type = watcherSettingsFormat.type; + inherit (watcherSettingsFormat) type; default = { }; example = lib.literalExpression '' { diff --git a/modules/services/avizo.nix b/modules/services/avizo.nix index 7284dae45..065513374 100644 --- a/modules/services/avizo.nix +++ b/modules/services/avizo.nix @@ -15,7 +15,7 @@ in enable = lib.mkEnableOption "avizo, a simple notification daemon"; settings = lib.mkOption { - type = (pkgs.formats.ini { }).type; + inherit ((pkgs.formats.ini { })) type; default = { }; example = lib.literalExpression '' { diff --git a/modules/services/betterlockscreen.nix b/modules/services/betterlockscreen.nix index 487003a01..fe6591e18 100644 --- a/modules/services/betterlockscreen.nix +++ b/modules/services/betterlockscreen.nix @@ -41,7 +41,7 @@ in services.screen-locker = { enable = true; - inactiveInterval = cfg.inactiveInterval; + inherit (cfg) inactiveInterval; lockCmd = "${cfg.package}/bin/betterlockscreen --lock ${lib.concatStringsSep " " cfg.arguments}"; }; }; diff --git a/modules/services/clipcat.nix b/modules/services/clipcat.nix index dd06a6e11..f92216738 100644 --- a/modules/services/clipcat.nix +++ b/modules/services/clipcat.nix @@ -33,7 +33,7 @@ in ''; }; daemonSettings = mkOption { - type = formatter.type; + inherit (formatter) type; default = { daemonize = true; }; @@ -59,7 +59,7 @@ in ''; }; ctlSettings = mkOption { - type = formatter.type; + inherit (formatter) type; default = { }; example = '' { @@ -79,7 +79,7 @@ in ''; }; menuSettings = mkOption { - type = formatter.type; + inherit (formatter) type; default = { }; example = '' { diff --git a/modules/services/clipse.nix b/modules/services/clipse.nix index 5cb4e661b..4cbb86c56 100644 --- a/modules/services/clipse.nix +++ b/modules/services/clipse.nix @@ -72,7 +72,7 @@ in }; keyBindings = lib.mkOption { - type = jsonFormat.type; + inherit (jsonFormat) type; default = { }; @@ -104,7 +104,7 @@ in }; theme = lib.mkOption { - type = jsonFormat.type; + inherit (jsonFormat) type; default = { useCustomTheme = false; @@ -144,14 +144,12 @@ in home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; xdg.configFile."clipse/config.json".source = jsonFormat.generate "settings" { - allowDuplicates = cfg.allowDuplicates; + inherit (cfg) allowDuplicates imageDisplay keyBindings; historyFile = "clipboard_history.json"; maxHistory = cfg.historySize; logFile = "clipse.log"; themeFile = "custom_theme.json"; tempDir = "tmp_files"; - keyBindings = cfg.keyBindings; - imageDisplay = cfg.imageDisplay; }; xdg.configFile."clipse/custom_theme.json".source = jsonFormat.generate "theme" cfg.theme; diff --git a/modules/services/davmail.nix b/modules/services/davmail.nix index 5d2f378a8..05839aa60 100644 --- a/modules/services/davmail.nix +++ b/modules/services/davmail.nix @@ -41,7 +41,7 @@ in }; settings = mkOption { - type = javaProperties.type; + inherit (javaProperties) type; default = { }; description = '' Davmail configuration. Refer to diff --git a/modules/services/dunst.nix b/modules/services/dunst.nix index fe8cfb1fc..6823f3dae 100644 --- a/modules/services/dunst.nix +++ b/modules/services/dunst.nix @@ -162,7 +162,7 @@ in themes = [ cfg.iconTheme ] - ++ optional useCustomTheme (hicolorTheme // { size = cfg.iconTheme.size; }); + ++ optional useCustomTheme (hicolorTheme // { inherit (cfg.iconTheme) size; }); categories = [ "actions" diff --git a/modules/services/dwm-status.nix b/modules/services/dwm-status.nix index fb2db86b8..5306bfe12 100644 --- a/modules/services/dwm-status.nix +++ b/modules/services/dwm-status.nix @@ -43,7 +43,7 @@ in }; extraConfig = mkOption { - type = jsonFormat.type; + inherit (jsonFormat) type; default = { }; example = lib.literalExpression '' { diff --git a/modules/services/espanso.nix b/modules/services/espanso.nix index 414c15d62..29ac2a2df 100644 --- a/modules/services/espanso.nix +++ b/modules/services/espanso.nix @@ -83,7 +83,7 @@ in }; configs = mkOption { - type = yaml.type; + inherit (yaml) type; default = { default = { }; }; @@ -106,7 +106,7 @@ in }; matches = mkOption { - type = yaml.type; + inherit (yaml) type; default = { default.matches = [ ]; }; diff --git a/modules/services/fnott.nix b/modules/services/fnott.nix index d1b1d31fb..e848ed5ef 100644 --- a/modules/services/fnott.nix +++ b/modules/services/fnott.nix @@ -51,7 +51,7 @@ in }; settings = mkOption { - type = iniFormat.type; + inherit (iniFormat) type; default = { }; description = '' Configuration written to diff --git a/modules/services/fusuma.nix b/modules/services/fusuma.nix index d200636c8..99c669586 100644 --- a/modules/services/fusuma.nix +++ b/modules/services/fusuma.nix @@ -71,7 +71,7 @@ in package = lib.mkPackageOption pkgs "fusuma" { }; settings = mkOption { - type = yamlFormat.type; + inherit (yamlFormat) type; example = literalExpression '' { threshold = { diff --git a/modules/services/glance.nix b/modules/services/glance.nix index 3a3d8d2a0..308153be1 100644 --- a/modules/services/glance.nix +++ b/modules/services/glance.nix @@ -31,7 +31,7 @@ in package = mkPackageOption pkgs "glance" { }; settings = mkOption { - type = settingsFormat.type; + inherit (settingsFormat) type; default = { pages = [ { diff --git a/modules/services/grobi.nix b/modules/services/grobi.nix index 64344548f..7748847c8 100644 --- a/modules/services/grobi.nix +++ b/modules/services/grobi.nix @@ -102,7 +102,7 @@ in xdg.configFile."grobi.conf".text = builtins.toJSON { execute_after = cfg.executeAfter; - rules = cfg.rules; + inherit (cfg) rules; }; }; } diff --git a/modules/services/hyprshell.nix b/modules/services/hyprshell.nix index 4ecbd5da3..69e81d9b7 100644 --- a/modules/services/hyprshell.nix +++ b/modules/services/hyprshell.nix @@ -25,7 +25,7 @@ in package = mkPackageOption pkgs "hyprshell" { nullable = true; }; settings = mkOption { - type = jsonFormat.type; + inherit (jsonFormat) type; default = { }; description = '' Configuration settings for hyprshell. All the available diff --git a/modules/services/imapnotify/default.nix b/modules/services/imapnotify/default.nix index 73fc01480..b33d16b6a 100644 --- a/modules/services/imapnotify/default.nix +++ b/modules/services/imapnotify/default.nix @@ -96,7 +96,7 @@ let else 143; - toJSON = builtins.toJSON; + inherit (builtins) toJSON; in toJSON ( { diff --git a/modules/services/jellyfin-mpv-shim.nix b/modules/services/jellyfin-mpv-shim.nix index 31f2da6df..58e73de23 100644 --- a/modules/services/jellyfin-mpv-shim.nix +++ b/modules/services/jellyfin-mpv-shim.nix @@ -45,7 +45,7 @@ in package = lib.mkPackageOption pkgs "jellyfin-mpv-shim" { }; settings = lib.mkOption { - type = jsonFormat.type; + inherit (jsonFormat) type; default = { }; example = lib.literalExpression '' { diff --git a/modules/services/listenbrainz-mpd.nix b/modules/services/listenbrainz-mpd.nix index 6aaf8e19c..6d8b0c18d 100644 --- a/modules/services/listenbrainz-mpd.nix +++ b/modules/services/listenbrainz-mpd.nix @@ -24,7 +24,7 @@ in package = mkPackageOption pkgs "listenbrainz-mpd" { nullable = true; }; settings = mkOption { - type = tomlFormat.type; + inherit (tomlFormat) type; default = { }; description = '' Configuration for listenbrainz-mpd written to diff --git a/modules/services/ludusavi.nix b/modules/services/ludusavi.nix index ab5602dce..c2807bdf6 100644 --- a/modules/services/ludusavi.nix +++ b/modules/services/ludusavi.nix @@ -45,7 +45,7 @@ in }; settings = lib.mkOption { - type = settingsFormat.type; + inherit (settingsFormat) type; default = { manifest.url = "https://raw.githubusercontent.com/mtkennerly/ludusavi-manifest/master/data/manifest.yaml"; roots = [ ]; diff --git a/modules/services/mopidy.nix b/modules/services/mopidy.nix index 30adfb808..b7b1b6a69 100644 --- a/modules/services/mopidy.nix +++ b/modules/services/mopidy.nix @@ -90,7 +90,7 @@ in }; settings = mkOption { - type = settingsFormat.type; + inherit (settingsFormat) type; default = { }; example = lib.literalExpression '' { diff --git a/modules/services/mpd-discord-rpc.nix b/modules/services/mpd-discord-rpc.nix index 8c86a1d74..3a304bff5 100644 --- a/modules/services/mpd-discord-rpc.nix +++ b/modules/services/mpd-discord-rpc.nix @@ -16,7 +16,7 @@ in enable = lib.mkEnableOption "the mpd-discord-rpc service"; settings = lib.mkOption { - type = tomlFormat.type; + inherit (tomlFormat) type; default = { }; example = lib.literalExpression '' { diff --git a/modules/services/mpd.nix b/modules/services/mpd.nix index 5cf1c8e76..d7c8b7a2e 100644 --- a/modules/services/mpd.nix +++ b/modules/services/mpd.nix @@ -195,7 +195,7 @@ in musicDirectory = lib.mkOptionDefault "${config.home.homeDirectory}/music"; }) - { generatedConfig = generatedConfig; } + { inherit generatedConfig; } ]; systemd.user = { diff --git a/modules/services/mpdris2-rs.nix b/modules/services/mpdris2-rs.nix index e02bc8c05..f7da18560 100644 --- a/modules/services/mpdris2-rs.nix +++ b/modules/services/mpdris2-rs.nix @@ -111,7 +111,7 @@ in explicitBool = false; }; args = lib.cli.toCommandLineShell optionFormat { - host = cfg.host; + inherit (cfg) host; no-notification = !cfg.notifications.enable; notification-timeout = cfg.notifications.timeout; notification-summary = cfg.notifications.summary; diff --git a/modules/services/mpdris2.nix b/modules/services/mpdris2.nix index e2f52af3a..9e75cbd23 100644 --- a/modules/services/mpdris2.nix +++ b/modules/services/mpdris2.nix @@ -20,12 +20,11 @@ let mpdris2Conf = { Connection = { - host = cfg.mpd.host; - port = cfg.mpd.port; + inherit (cfg.mpd) host port; music_dir = cfg.mpd.musicDirectory; } // lib.optionalAttrs (cfg.mpd.password != null) { - password = cfg.mpd.password; + inherit (cfg.mpd) password; }; Bling = { diff --git a/modules/services/pantalaimon.nix b/modules/services/pantalaimon.nix index ce90ec7c9..7b7da082b 100644 --- a/modules/services/pantalaimon.nix +++ b/modules/services/pantalaimon.nix @@ -19,7 +19,7 @@ in package = lib.mkPackageOption pkgs "pantalaimon" { }; settings = lib.mkOption { - type = iniFmt.type; + inherit (iniFmt) type; default = { }; defaultText = lib.literalExpression "{ }"; example = lib.literalExpression '' diff --git a/modules/services/picom.nix b/modules/services/picom.nix index 723e27c6c..a5c0cdcd0 100644 --- a/modules/services/picom.nix +++ b/modules/services/picom.nix @@ -386,7 +386,7 @@ in fade-exclude = cfg.fadeExclude; # shadows - shadow = cfg.shadow; + inherit (cfg) shadow; shadow-offset-x = elemAt cfg.shadowOffsets 0; shadow-offset-y = elemAt cfg.shadowOffsets 1; shadow-opacity = cfg.shadowOpacity; @@ -395,13 +395,10 @@ in # opacity active-opacity = cfg.activeOpacity; inactive-opacity = cfg.inactiveOpacity; - - wintypes = cfg.wintypes; - opacity-rule = cfg.opacityRules; # other options - backend = cfg.backend; + inherit (cfg) backend wintypes; vsync = cfg.vSync; }; diff --git a/modules/services/plex-mpv-shim.nix b/modules/services/plex-mpv-shim.nix index d7e89c7b3..e646b94ee 100644 --- a/modules/services/plex-mpv-shim.nix +++ b/modules/services/plex-mpv-shim.nix @@ -20,7 +20,7 @@ in package = lib.mkPackageOption pkgs "plex-mpv-shim" { }; settings = lib.mkOption { - type = jsonFormat.type; + inherit (jsonFormat) type; default = { }; example = lib.literalExpression '' { diff --git a/modules/services/podman/default.nix b/modules/services/podman/default.nix index ad0cc70b6..adab38768 100644 --- a/modules/services/podman/default.nix +++ b/modules/services/podman/default.nix @@ -27,13 +27,13 @@ in settings = { containers = lib.mkOption { - type = toml.type; + inherit (toml) type; default = { }; description = "containers.conf configuration"; }; storage = lib.mkOption { - type = toml.type; + inherit (toml) type; description = "storage.conf configuration"; }; diff --git a/modules/services/podman/linux/containers.nix b/modules/services/podman/linux/containers.nix index fa7bfe659..6aac7805d 100644 --- a/modules/services/podman/linux/containers.nix +++ b/modules/services/podman/linux/containers.nix @@ -166,7 +166,7 @@ let in { assertions = podman-lib.buildConfigAsserts name containerDef.extraConfig; - dependencies = src.dependencies; + inherit (src) dependencies; resourceType = "container"; serviceName = "podman-${src.attrs.Container.ContainerName}"; # generated service name: 'podman-.service' source = podman-lib.removeBlankLines src.text; diff --git a/modules/services/pueue.nix b/modules/services/pueue.nix index bb98c36a8..297152377 100644 --- a/modules/services/pueue.nix +++ b/modules/services/pueue.nix @@ -21,7 +21,7 @@ in package = lib.mkPackageOption pkgs "pueue" { nullable = true; }; settings = lib.mkOption { - type = yamlFormat.type; + inherit (yamlFormat) type; default = { }; example = lib.literalExpression '' { diff --git a/modules/services/recoll.nix b/modules/services/recoll.nix index 0f74d9c0f..96a1ad2f7 100644 --- a/modules/services/recoll.nix +++ b/modules/services/recoll.nix @@ -123,7 +123,7 @@ in }; settings = mkOption { - type = settingsFormat.type; + inherit (settingsFormat) type; default = { }; description = '' The configuration to be written at {file}`$RECOLL_CONFDIR/recoll.conf`. diff --git a/modules/services/shikane.nix b/modules/services/shikane.nix index 095192b31..e216f4f95 100644 --- a/modules/services/shikane.nix +++ b/modules/services/shikane.nix @@ -18,7 +18,7 @@ in package = lib.mkPackageOption pkgs "shikane" { }; settings = lib.mkOption { - type = tomlFormat.type; + inherit (tomlFormat) type; default = { }; example = lib.literalExpression '' { diff --git a/modules/services/shpool.nix b/modules/services/shpool.nix index 75760e50f..4eaaa9365 100644 --- a/modules/services/shpool.nix +++ b/modules/services/shpool.nix @@ -25,7 +25,7 @@ in package = mkPackageOption pkgs "shpool" { nullable = true; }; settings = lib.mkOption { - type = format.type; + inherit (format) type; default = { }; example = { prompt_prefix = "[$SHPOOL_SESSION_NAME]"; diff --git a/modules/services/spotifyd.nix b/modules/services/spotifyd.nix index d46df4240..917f19aa6 100644 --- a/modules/services/spotifyd.nix +++ b/modules/services/spotifyd.nix @@ -27,7 +27,7 @@ in }; settings = lib.mkOption { - type = tomlFormat.type; + inherit (tomlFormat) type; default = { }; description = "Configuration for spotifyd"; example = literalExpression '' diff --git a/modules/services/swaync.nix b/modules/services/swaync.nix index 7bf3a4fb2..f35e97941 100644 --- a/modules/services/swaync.nix +++ b/modules/services/swaync.nix @@ -54,7 +54,7 @@ in }; settings = lib.mkOption { - type = jsonFormat.type; + inherit (jsonFormat) type; default = { }; example = lib.literalExpression '' { diff --git a/modules/services/syncthing.nix b/modules/services/syncthing.nix index ac6056f85..cdb26d1de 100644 --- a/modules/services/syncthing.nix +++ b/modules/services/syncthing.nix @@ -169,7 +169,7 @@ let devicesWithSecrets = lib.pipe folder.devices [ (lib.filter (device: (builtins.isAttrs device) && device ? encryptionPasswordFile)) (map (device: { - deviceId = device.deviceId; + inherit (device) deviceId; variableName = "secret_${builtins.hashString "sha256" device.encryptionPasswordFile}"; secretPath = device.encryptionPasswordFile; })) diff --git a/modules/services/twmn.nix b/modules/services/twmn.nix index e419bb6bb..6c259af73 100644 --- a/modules/services/twmn.nix +++ b/modules/services/twmn.nix @@ -335,7 +335,7 @@ in opacity = toString cfg.window.opacity; out_animation = toString cfg.window.animation.easeOut.curve; out_animation_duration = toString cfg.window.animation.easeOut.duration; - position = cfg.window.position; + inherit (cfg.window) position; screen = toString cfg.screen; }; # map null values to empty strings because formats.toml generator fails @@ -343,7 +343,7 @@ in icons = lib.mapAttrs (_: toString) cfg.icons; main = { duration = toString cfg.duration; - host = cfg.host; + inherit (cfg) host; port = toString cfg.port; sound_command = cfg.soundCommand; }; diff --git a/modules/services/udiskie.nix b/modules/services/udiskie.nix index c878bc8ca..22f547449 100644 --- a/modules/services/udiskie.nix +++ b/modules/services/udiskie.nix @@ -47,7 +47,7 @@ in package = lib.mkPackageOption pkgs "udiskie" { }; settings = mkOption { - type = yaml.type; + inherit (yaml) type; default = { }; example = lib.literalExpression '' { @@ -112,7 +112,7 @@ in xdg.configFile."udiskie/config.yml".source = yaml.generate "udiskie-config.yml" (mergeSets [ { program_options = { - automount = cfg.automount; + inherit (cfg) automount; tray = if cfg.tray == "always" then true @@ -120,7 +120,7 @@ in false else "auto"; - notify = cfg.notify; + inherit (cfg) notify; }; } cfg.settings diff --git a/modules/services/window-managers/i3-sway/sway.nix b/modules/services/window-managers/i3-sway/sway.nix index 57ed27294..c20ff4113 100644 --- a/modules/services/window-managers/i3-sway/sway.nix +++ b/modules/services/window-managers/i3-sway/sway.nix @@ -532,8 +532,7 @@ in package = mkOption { type = with types; nullOr package; default = pkgs.sway.override { - extraSessionCommands = cfg.extraSessionCommands; - extraOptions = cfg.extraOptions; + inherit (cfg) extraOptions extraSessionCommands; withBaseWrapper = cfg.wrapperFeatures.base; withGtkWrapper = cfg.wrapperFeatures.gtk; }; diff --git a/modules/services/window-managers/labwc/function.nix b/modules/services/window-managers/labwc/function.nix index 0c2020893..e5142b17b 100644 --- a/modules/services/window-managers/labwc/function.nix +++ b/modules/services/window-managers/labwc/function.nix @@ -42,7 +42,7 @@ let let labelAttr = " label=\"${escape item.label}\""; iconAttr = if item ? icon then " icon=\"${escape item.icon}\"" else ""; - action = item.action; + inherit (item) action; nameAttr = " name=\"${escape action.name}\""; toAttr = if action ? to then " to=\"${escape action.to}\"" else ""; commandAttr = if action ? command then " command=\"${escape action.command}\"" else ""; @@ -150,5 +150,5 @@ let in { - generateXML = generateXML; + inherit generateXML; } diff --git a/modules/services/window-managers/wayfire.nix b/modules/services/window-managers/wayfire.nix index d8b0dfefe..a1f1a19df 100644 --- a/modules/services/window-managers/wayfire.nix +++ b/modules/services/window-managers/wayfire.nix @@ -9,7 +9,7 @@ options.wayland.windowManager.wayfire = let - types = lib.types; + inherit (lib) types; configIniType = with types; @@ -157,7 +157,7 @@ finalPackage = pkgs.wayfire-with-plugins.override { wayfire = cfg.package; - plugins = cfg.plugins; + inherit (cfg) plugins; }; in lib.mkIf cfg.enable { diff --git a/modules/services/window-managers/xmonad.nix b/modules/services/window-managers/xmonad.nix index 58fddede0..dfe9d57b9 100644 --- a/modules/services/window-managers/xmonad.nix +++ b/modules/services/window-managers/xmonad.nix @@ -10,7 +10,7 @@ let cfg = config.xsession.windowManager.xmonad; xmonad = pkgs.xmonad-with-packages.override { - ghcWithPackages = cfg.haskellPackages.ghcWithPackages; + inherit (cfg.haskellPackages) ghcWithPackages; packages = self: cfg.extraPackages self diff --git a/modules/services/wluma.nix b/modules/services/wluma.nix index 01ab4b206..f2afb975e 100644 --- a/modules/services/wluma.nix +++ b/modules/services/wluma.nix @@ -18,7 +18,7 @@ in package = lib.mkPackageOption pkgs "wluma" { }; settings = lib.mkOption { - type = format.type; + inherit (format) type; default = { }; example = { als.iio = { diff --git a/modules/services/wob.nix b/modules/services/wob.nix index 288511cc8..5bd48f96c 100644 --- a/modules/services/wob.nix +++ b/modules/services/wob.nix @@ -29,7 +29,7 @@ in package = mkPackageOption pkgs "wob" { nullable = true; }; settings = mkOption { - type = settingsFormat.type; + inherit (settingsFormat) type; default = { }; example = literalExpression '' { diff --git a/modules/services/wpaperd.nix b/modules/services/wpaperd.nix index 8b68292be..dd2d6aad0 100644 --- a/modules/services/wpaperd.nix +++ b/modules/services/wpaperd.nix @@ -40,7 +40,7 @@ in package = lib.mkPackageOption pkgs "wpaperd" { nullable = true; }; settings = lib.mkOption { - type = tomlFormat.type; + inherit (tomlFormat) type; default = { }; example = lib.literalExpression '' { diff --git a/modules/services/xsuspender.nix b/modules/services/xsuspender.nix index aed36fcc1..ad7435e1c 100644 --- a/modules/services/xsuspender.nix +++ b/modules/services/xsuspender.nix @@ -147,7 +147,7 @@ in }; iniContent = mkOption { - type = iniFormat.type; + inherit (iniFormat) type; internal = true; }; }; diff --git a/modules/targets/generic-linux.nix b/modules/targets/generic-linux.nix index 6ebf5d9c1..1af74ecf0 100644 --- a/modules/targets/generic-linux.nix +++ b/modules/targets/generic-linux.nix @@ -9,7 +9,7 @@ let cfg = config.targets.genericLinux; - profileDirectory = config.home.profileDirectory; + inherit (config.home) profileDirectory; nixPkg = if config.nix.package == null then pkgs.nix else config.nix.package; diff --git a/modules/targets/generic-linux/gpu/default.nix b/modules/targets/generic-linux/gpu/default.nix index 0c1ff8cec..1152d82fc 100644 --- a/modules/targets/generic-linux/gpu/default.nix +++ b/modules/targets/generic-linux/gpu/default.nix @@ -93,7 +93,7 @@ # This builds the driver archive downloaded from download.nvidia.com nvidia = (cfg.packages.linuxPackages.nvidiaPackages.mkDriver { - version = cfg.nvidia.version; + inherit (cfg.nvidia) version; sha256_64bit = cfg.nvidia.sha256; sha256_aarch64 = cfg.nvidia.sha256; useSettings = false; diff --git a/modules/targets/generic-linux/nixgl.nix b/modules/targets/generic-linux/nixgl.nix index a81d2f3de..c207fed79 100644 --- a/modules/targets/generic-linux/nixgl.nix +++ b/modules/targets/generic-linux/nixgl.nix @@ -220,7 +220,7 @@ in # Leave the name unchanged and rely on the hash to differentiate # from the original package. Some modules rely on the package name # to e.g. compute config directory paths. - name = pkg.name; + inherit (pkg) name; # Make sure this is false for the wrapper derivation, so nix doesn't expect # a new debug output to be produced. We won't be producing any debug info diff --git a/statix.toml b/statix.toml new file mode 100644 index 000000000..0e09f572d --- /dev/null +++ b/statix.toml @@ -0,0 +1,20 @@ +disabled = [ + "bool_comparison", + "bool_simplification", + "collapsible_let_in", + "deprecated_is_null", + "deprecated_to_path", + "empty_list_concat", + "empty_inherit", + "empty_let_in", + "empty_pattern", + "eta_reduction", + "faster_groupby", + "faster_zipattrswith", + "legacy_let_syntax", + "repeated_keys", + "redundant_pattern_bind", + "unquoted_uri", + "useless_has_attr", + "useless_parens", +] diff --git a/tests/default.nix b/tests/default.nix index 7933419b6..162d07b80 100644 --- a/tests/default.nix +++ b/tests/default.nix @@ -152,8 +152,8 @@ let ) ]; - isDarwin = pkgs.stdenv.hostPlatform.isDarwin; - isLinux = pkgs.stdenv.hostPlatform.isLinux; + inherit (pkgs.stdenv.hostPlatform) isDarwin; + inherit (pkgs.stdenv.hostPlatform) isLinux; in import nmtSrc { inherit lib pkgs modules; diff --git a/tests/lib/generators/tohyprconf.nix b/tests/lib/generators/tohyprconf.nix index 60953ae5d..45dde4f8a 100644 --- a/tests/lib/generators/tohyprconf.nix +++ b/tests/lib/generators/tohyprconf.nix @@ -16,7 +16,7 @@ int = 5; float = 0.8; bool = true; - null = null; + inherit null; }; nested-attrs-section = { diff --git a/tests/lib/types/dag-merge.nix b/tests/lib/types/dag-merge.nix index e0a906276..74d0ce760 100644 --- a/tests/lib/types/dag-merge.nix +++ b/tests/lib/types/dag-merge.nix @@ -16,7 +16,7 @@ let types ; - dag = lib.hm.dag; + inherit (lib.hm) dag; result = let diff --git a/tests/lib/types/dag-submodule.nix b/tests/lib/types/dag-submodule.nix index f9b83ab8d..ccf63aa89 100644 --- a/tests/lib/types/dag-submodule.nix +++ b/tests/lib/types/dag-submodule.nix @@ -13,7 +13,7 @@ let types ; - dag = lib.hm.dag; + inherit (lib.hm) dag; result = let diff --git a/tests/modules/programs/borgmatic/basic-configuration.nix b/tests/modules/programs/borgmatic/basic-configuration.nix index a829e0921..90e75dbbe 100644 --- a/tests/modules/programs/borgmatic/basic-configuration.nix +++ b/tests/modules/programs/borgmatic/basic-configuration.nix @@ -3,7 +3,7 @@ let boolToString = bool: if bool then "true" else "false"; - backups = config.programs.borgmatic.backups; + inherit (config.programs.borgmatic) backups; in { diff --git a/tests/modules/programs/borgmatic/patterns-configuration.nix b/tests/modules/programs/borgmatic/patterns-configuration.nix index 88981451b..ab555f73e 100644 --- a/tests/modules/programs/borgmatic/patterns-configuration.nix +++ b/tests/modules/programs/borgmatic/patterns-configuration.nix @@ -2,7 +2,7 @@ let - backups = config.programs.borgmatic.backups; + inherit (config.programs.borgmatic) backups; in { diff --git a/tests/modules/programs/sbt/credentials.nix b/tests/modules/programs/sbt/credentials.nix index 50b7f051c..315aa6251 100644 --- a/tests/modules/programs/sbt/credentials.nix +++ b/tests/modules/programs/sbt/credentials.nix @@ -28,7 +28,7 @@ in config = { programs.sbt = { enable = true; - credentials = credentials; + inherit credentials; package = pkgs.writeScriptBin "sbt" ""; }; diff --git a/tests/modules/programs/sbt/plugins.nix b/tests/modules/programs/sbt/plugins.nix index c07118c25..a74a04624 100644 --- a/tests/modules/programs/sbt/plugins.nix +++ b/tests/modules/programs/sbt/plugins.nix @@ -31,8 +31,8 @@ in config = { programs.sbt = { enable = true; - plugins = plugins; - pluginsExtra = pluginsExtra; + inherit plugins; + inherit pluginsExtra; package = pkgs.writeScriptBin "sbt" ""; }; diff --git a/tests/modules/programs/sbt/repositories.nix b/tests/modules/programs/sbt/repositories.nix index 58df66886..1e04f8640 100644 --- a/tests/modules/programs/sbt/repositories.nix +++ b/tests/modules/programs/sbt/repositories.nix @@ -26,7 +26,7 @@ in config = { programs.sbt = { enable = true; - repositories = repositories; + inherit repositories; package = pkgs.writeScriptBin "sbt" ""; }; diff --git a/tests/modules/programs/sbt/user-config-path.nix b/tests/modules/programs/sbt/user-config-path.nix index ca0de7db3..49ac67942 100644 --- a/tests/modules/programs/sbt/user-config-path.nix +++ b/tests/modules/programs/sbt/user-config-path.nix @@ -26,9 +26,9 @@ in config = { programs.sbt = { enable = true; - plugins = plugins; - credentials = credentials; - repositories = repositories; + inherit plugins; + inherit credentials; + inherit repositories; baseUserConfigPath = ".config/sbt"; package = pkgs.writeScriptBin "sbt" ""; }; diff --git a/tests/modules/programs/thunderbird/thunderbird-native-messaging-host.nix b/tests/modules/programs/thunderbird/thunderbird-native-messaging-host.nix index d58f3f35a..719a2fad2 100644 --- a/tests/modules/programs/thunderbird/thunderbird-native-messaging-host.nix +++ b/tests/modules/programs/thunderbird/thunderbird-native-messaging-host.nix @@ -6,7 +6,7 @@ ... }: let - isDarwin = pkgs.stdenv.hostPlatform.isDarwin; + inherit (pkgs.stdenv.hostPlatform) isDarwin; nativeHostsDir = if isDarwin then "Library/Mozilla/NativeMessagingHosts" else ".mozilla/native-messaging-hosts"; in diff --git a/tests/modules/programs/thunderbird/thunderbird.nix b/tests/modules/programs/thunderbird/thunderbird.nix index 6c74aeba6..7193a0c47 100644 --- a/tests/modules/programs/thunderbird/thunderbird.nix +++ b/tests/modules/programs/thunderbird/thunderbird.nix @@ -186,7 +186,7 @@ nmt.script = let - isDarwin = pkgs.stdenv.hostPlatform.isDarwin; + inherit (pkgs.stdenv.hostPlatform) isDarwin; configDir = if isDarwin then "Library/Thunderbird" else ".thunderbird"; profilesDir = if isDarwin then "${configDir}/Profiles" else "${configDir}"; platform = if isDarwin then "darwin" else "linux"; diff --git a/tests/modules/services/i3/i3-keybindings.nix b/tests/modules/services/i3/i3-keybindings.nix index 62da17571..7a491299f 100644 --- a/tests/modules/services/i3/i3-keybindings.nix +++ b/tests/modules/services/i3/i3-keybindings.nix @@ -8,7 +8,7 @@ config.keybindings = let - modifier = config.xsession.windowManager.i3.config.modifier; + inherit (config.xsession.windowManager.i3.config) modifier; in lib.mkOptionDefault { "${modifier}+Left" = "overridden-command"; diff --git a/treefmt.toml b/treefmt.toml index d48c45508..fa52bbbb6 100644 --- a/treefmt.toml +++ b/treefmt.toml @@ -5,6 +5,10 @@ tree-root-file = "release.json" command = "nixfmt" includes = [ "*.nix" ] +[formatter.statix] +command = "treefmt-statix" +includes = [ "*.nix" ] + [formatter.deadnix] command = "deadnix" options = [ "--edit", "--no-lambda-arg", "--no-lambda-pattern-names" ]