mirror of
https://codeberg.org/leana8959/.files.git
synced 2025-12-06 06:39:14 +00:00
nix: format with alejandra
This commit is contained in:
parent
d5cad148da
commit
95eb4b71e0
118 changed files with 1291 additions and 1703 deletions
|
|
@ -3,8 +3,7 @@
|
|||
hostname,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{
|
||||
}: {
|
||||
programs.fish = {
|
||||
shellAbbrs = lib.mergeAttrsList [
|
||||
{
|
||||
|
|
@ -54,8 +53,7 @@
|
|||
(lib.optionalAttrs pkgs.stdenv.isDarwin (
|
||||
let
|
||||
cmds = builtins.concatStringsSep ";";
|
||||
in
|
||||
{
|
||||
in {
|
||||
reset_launchpad = cmds [
|
||||
"defaults write com.apple.dock ResetLaunchPad -bool true"
|
||||
"killall Dock"
|
||||
|
|
|
|||
|
|
@ -3,15 +3,11 @@
|
|||
config,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
}: let
|
||||
cfg = config.programs.fish;
|
||||
|
||||
fishExe = "${lib.getExe cfg.package}";
|
||||
in
|
||||
|
||||
{
|
||||
in {
|
||||
imports = [
|
||||
./aliasesAbbrs.nix
|
||||
./sourcePaths.nix
|
||||
|
|
@ -60,7 +56,6 @@ in
|
|||
}) (builtins.readDir ./functions);
|
||||
|
||||
programs.fish = {
|
||||
|
||||
sourcePaths =
|
||||
[
|
||||
# Make sure wrapper comes first
|
||||
|
|
@ -79,7 +74,6 @@ in
|
|||
"/nix/var/nix/profiles/default/bin"
|
||||
"/run/current-system/sw/bin"
|
||||
]
|
||||
|
||||
# Add brew, but as fallback
|
||||
++ (lib.optional pkgs.stdenv.isDarwin "/opt/homebrew/bin");
|
||||
|
||||
|
|
@ -105,7 +99,5 @@ in
|
|||
};
|
||||
}
|
||||
];
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
{ config, lib, ... }:
|
||||
|
||||
{
|
||||
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
options.programs.fish.sourcePaths = lib.mkOption {
|
||||
type = with lib.types; nonEmptyListOf str;
|
||||
description = ''
|
||||
|
|
@ -27,5 +28,4 @@
|
|||
end
|
||||
end
|
||||
'';
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue