mirror of
https://codeberg.org/leana8959/.files.git
synced 2025-12-06 06:39:14 +00:00
style: run statix
This commit is contained in:
parent
5b7fe1dae8
commit
ebabf4f335
7 changed files with 25 additions and 25 deletions
|
|
@ -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
|
||||
];
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
];
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
];
|
||||
})
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
'');
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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'
|
||||
'');
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue