primrose/.files
1
0
Fork 0
mirror of https://codeberg.org/leana8959/.files.git synced 2025-12-06 06:39:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

style: run statix

Browse source
This commit is contained in:
Primrose 2025-06-28 16:41:11 +02:00
parent 5b7fe1dae8
commit ebabf4f335
Signed by: primrose
GPG key ID: 4E887A4CA9714ADA
7 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

6
nix/configurations/tungsten.nix
View file

@ -89,11 +89,11 @@ in
(sources.agenix + "/modules/age.nix") (sources.agenix + "/modules/age.nix")
((import sources.url-eater).nixosModules.default) (import sources.url-eater).nixosModules.default
(sources.nixos-hardware + "/apple/macbook-air/6") (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 # home-manager
@ -156,7 +156,7 @@ in
# Extern modules # Extern modules
# #
(sources.agenix + "/modules/age-home.nix") (sources.agenix + "/modules/age-home.nix")
((import sources.wired-notify).homeManagerModules.default) (import sources.wired-notify).homeManagerModules.default
]; ];
} }

6
nix/configurations/vanadium.nix
View file

@ -107,11 +107,11 @@ in
(sources.agenix + "/modules/age.nix") (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") (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 # home-manager
@ -177,7 +177,7 @@ in
# Extern modules # Extern modules
# #
(sources.agenix + "/modules/age-home.nix") (sources.agenix + "/modules/age-home.nix")
((import sources.wired-notify).homeManagerModules.default) (import sources.wired-notify).homeManagerModules.default
]; ];
} }

4
nix/configurations/vanadium/overlay.nix
View file

@ -10,7 +10,7 @@ let
infuse = lib.flip infuse-lib.v1.infuse; infuse = lib.flip infuse-lib.v1.infuse;
in in
# Why shouldn't I go crazy with overlays? # Why shouldn't I go crazy with overlays?
(final: final:
infuse { infuse {
cmus.__input.alsaSupport = _: false; cmus.__input.alsaSupport = _: false;
@ -48,4 +48,4 @@ in
./patches/fcitx5-chinese-addons/disable-fullwidth.patch ./patches/fcitx5-chinese-addons/disable-fullwidth.patch
# Note: disabling pinyin helper breaks canjie # Note: disabling pinyin helper breaks canjie
]; ];
}) }

18
nix/homeModules/common/cmus/default.nix
View file

@ -45,22 +45,22 @@
''; '';
}; };
in in
(builtins.readFile ./rc) builtins.readFile ./rc
+ (lib.optionalString pkgs.stdenv.isLinux '' + lib.optionalString pkgs.stdenv.isLinux ''
set status_display_program=${lib.getExe callback-script} 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} set status_display_program=${lib.getExe pkgs.cmusfm}
'') ''
# This handles volume better # This handles volume better
# Alsa backend has this behavior where system volume button will unsync two channels # 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 set output_plugin=pulse
'') ''
# When switching over bluetooth, toggle the output device to coreaudio # When switching over bluetooth, toggle the output device to coreaudio
# and back to ao would fix the no sound issue. # 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 # distortion fix https://github.com/cmus/cmus/issues/1130#issuecomment-1003324193
set output_plugin=ao set output_plugin=ao
''); '';
} }

2
nix/homeModules/common/packages.nix
View file

@ -18,5 +18,5 @@
pkgs.jq pkgs.jq
] ]
# coreutils for darwin # coreutils for darwin
++ (lib.optional pkgs.stdenv.isDarwin pkgs.uutils-coreutils-noprefix); ++ lib.optional pkgs.stdenv.isDarwin pkgs.uutils-coreutils-noprefix;
} }

10
nix/homeModules/common/tmux/default.nix
View file

@ -4,13 +4,13 @@
... ...
}: { }: {
programs.tmux.extraConfig = programs.tmux.extraConfig =
(builtins.readFile ./tmux.conf) builtins.readFile ./tmux.conf
+ (lib.optionalString pkgs.stdenv.isDarwin '' + 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 'y' send -X copy-pipe-and-cancel 'pbcopy'
bind-key -T copy-mode-vi Enter 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 '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' bind-key -T copy-mode-vi Enter send -X copy-pipe-and-cancel 'xclip -in -selection clipboard'
''); '';
} }

4
nix/lib/mkNerdFont.nix
View file

@ -26,12 +26,12 @@ stdenvNoCC.mkDerivation {
buildPhase = let buildPhase = let
args = args =
(lib.optionals useDefaultsArgs [ lib.optionals useDefaultsArgs [
"--careful" "--careful"
"--complete" "--complete"
"--quiet" "--quiet"
"--no-progressbars" "--no-progressbars"
]) ]
++ extraArgs; ++ extraArgs;
in '' in ''
mkdir -p nerd-font mkdir -p nerd-font