From ebabf4f3356113785ac0ca5b0eadb37d3992db9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Sat, 28 Jun 2025 16:41:11 +0200 Subject: [PATCH] style: run statix --- nix/configurations/tungsten.nix | 6 +++--- nix/configurations/vanadium.nix | 6 +++--- nix/configurations/vanadium/overlay.nix | 4 ++-- nix/homeModules/common/cmus/default.nix | 18 +++++++++--------- nix/homeModules/common/packages.nix | 2 +- nix/homeModules/common/tmux/default.nix | 10 +++++----- nix/lib/mkNerdFont.nix | 4 ++-- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/nix/configurations/tungsten.nix b/nix/configurations/tungsten.nix index d506da06..a8e54d66 100644 --- a/nix/configurations/tungsten.nix +++ b/nix/configurations/tungsten.nix @@ -89,11 +89,11 @@ in (sources.agenix + "/modules/age.nix") - ((import sources.url-eater).nixosModules.default) + (import sources.url-eater).nixosModules.default (sources.nixos-hardware + "/apple/macbook-air/6") - (import (sources.lix-module + "/module.nix") {lix = sources.lix;}) + (import (sources.lix-module + "/module.nix") {inherit (sources) lix;}) # # home-manager @@ -156,7 +156,7 @@ in # Extern modules # (sources.agenix + "/modules/age-home.nix") - ((import sources.wired-notify).homeManagerModules.default) + (import sources.wired-notify).homeManagerModules.default ]; } diff --git a/nix/configurations/vanadium.nix b/nix/configurations/vanadium.nix index 203dc8a2..45c3b166 100644 --- a/nix/configurations/vanadium.nix +++ b/nix/configurations/vanadium.nix @@ -107,11 +107,11 @@ in (sources.agenix + "/modules/age.nix") - ((import sources.url-eater).nixosModules.default) + (import sources.url-eater).nixosModules.default (sources.nixos-hardware + "/framework/13-inch/7040-amd") - (import (sources.lix-module + "/module.nix") {lix = sources.lix;}) + (import (sources.lix-module + "/module.nix") {inherit (sources) lix;}) # # home-manager @@ -177,7 +177,7 @@ in # Extern modules # (sources.agenix + "/modules/age-home.nix") - ((import sources.wired-notify).homeManagerModules.default) + (import sources.wired-notify).homeManagerModules.default ]; } diff --git a/nix/configurations/vanadium/overlay.nix b/nix/configurations/vanadium/overlay.nix index 14bedb4f..504bb084 100644 --- a/nix/configurations/vanadium/overlay.nix +++ b/nix/configurations/vanadium/overlay.nix @@ -10,7 +10,7 @@ let infuse = lib.flip infuse-lib.v1.infuse; in # Why shouldn't I go crazy with overlays? - (final: + final: infuse { cmus.__input.alsaSupport = _: false; @@ -48,4 +48,4 @@ in ./patches/fcitx5-chinese-addons/disable-fullwidth.patch # Note: disabling pinyin helper breaks canjie ]; - }) + } diff --git a/nix/homeModules/common/cmus/default.nix b/nix/homeModules/common/cmus/default.nix index 90312a3a..07c185db 100644 --- a/nix/homeModules/common/cmus/default.nix +++ b/nix/homeModules/common/cmus/default.nix @@ -45,22 +45,22 @@ ''; }; in - (builtins.readFile ./rc) - + (lib.optionalString pkgs.stdenv.isLinux '' + builtins.readFile ./rc + + lib.optionalString pkgs.stdenv.isLinux '' set status_display_program=${lib.getExe callback-script} - '') - + (lib.optionalString pkgs.stdenv.isDarwin '' + '' + + lib.optionalString pkgs.stdenv.isDarwin '' set status_display_program=${lib.getExe pkgs.cmusfm} - '') + '' # This handles volume better # Alsa backend has this behavior where system volume button will unsync two channels - + (lib.optionalString pkgs.stdenv.isLinux '' + + lib.optionalString pkgs.stdenv.isLinux '' set output_plugin=pulse - '') + '' # When switching over bluetooth, toggle the output device to coreaudio # and back to ao would fix the no sound issue. - + (lib.optionalString pkgs.stdenv.isDarwin '' + + lib.optionalString pkgs.stdenv.isDarwin '' # distortion fix https://github.com/cmus/cmus/issues/1130#issuecomment-1003324193 set output_plugin=ao - ''); + ''; } diff --git a/nix/homeModules/common/packages.nix b/nix/homeModules/common/packages.nix index 2f950f1f..470c527d 100644 --- a/nix/homeModules/common/packages.nix +++ b/nix/homeModules/common/packages.nix @@ -18,5 +18,5 @@ pkgs.jq ] # coreutils for darwin - ++ (lib.optional pkgs.stdenv.isDarwin pkgs.uutils-coreutils-noprefix); + ++ lib.optional pkgs.stdenv.isDarwin pkgs.uutils-coreutils-noprefix; } diff --git a/nix/homeModules/common/tmux/default.nix b/nix/homeModules/common/tmux/default.nix index 283d9989..7efa8f11 100644 --- a/nix/homeModules/common/tmux/default.nix +++ b/nix/homeModules/common/tmux/default.nix @@ -4,13 +4,13 @@ ... }: { programs.tmux.extraConfig = - (builtins.readFile ./tmux.conf) - + (lib.optionalString pkgs.stdenv.isDarwin '' + builtins.readFile ./tmux.conf + + lib.optionalString pkgs.stdenv.isDarwin '' bind-key -T copy-mode-vi 'y' send -X copy-pipe-and-cancel 'pbcopy' bind-key -T copy-mode-vi Enter send -X copy-pipe-and-cancel 'pbcopy' - '') - + (lib.optionalString pkgs.stdenv.isLinux '' + '' + + lib.optionalString pkgs.stdenv.isLinux '' bind-key -T copy-mode-vi 'y' send -X copy-pipe-and-cancel 'xclip -in -selection clipboard' bind-key -T copy-mode-vi Enter send -X copy-pipe-and-cancel 'xclip -in -selection clipboard' - ''); + ''; } diff --git a/nix/lib/mkNerdFont.nix b/nix/lib/mkNerdFont.nix index efbfd96b..1c9e72a2 100644 --- a/nix/lib/mkNerdFont.nix +++ b/nix/lib/mkNerdFont.nix @@ -26,12 +26,12 @@ stdenvNoCC.mkDerivation { buildPhase = let args = - (lib.optionals useDefaultsArgs [ + lib.optionals useDefaultsArgs [ "--careful" "--complete" "--quiet" "--no-progressbars" - ]) + ] ++ extraArgs; in '' mkdir -p nerd-font