chore: Use nixfmt reformat all nix source code
This commit is contained in:
parent
1cdf00cefe
commit
11337b8f9e
184 changed files with 2349 additions and 1943 deletions
|
|
@ -3,28 +3,29 @@
|
|||
buildNpmPackage,
|
||||
importNpmLock,
|
||||
...
|
||||
}: let
|
||||
}:
|
||||
let
|
||||
inherit (srcs.OuterWildsTextAdventure) src date version;
|
||||
in
|
||||
buildNpmPackage {
|
||||
pname = "OuterWildsTextAdventure";
|
||||
version = "0-unstable.${date}-git${version}";
|
||||
inherit src;
|
||||
buildNpmPackage {
|
||||
pname = "OuterWildsTextAdventure";
|
||||
version = "0-unstable.${date}-git${version}";
|
||||
inherit src;
|
||||
|
||||
npmDeps = importNpmLock {
|
||||
npmRoot = src;
|
||||
};
|
||||
npmDeps = importNpmLock {
|
||||
npmRoot = src;
|
||||
};
|
||||
|
||||
npmBuildScript = "bundle";
|
||||
npmBuildScript = "bundle";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out
|
||||
cp -rt $out/ index.html data p5.min.js bundle.js bundle.js.map
|
||||
mkdir -p $out
|
||||
cp -rt $out/ index.html data p5.min.js bundle.js bundle.js.map
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
npmConfigHook = importNpmLock.npmConfigHook;
|
||||
}
|
||||
npmConfigHook = importNpmLock.npmConfigHook;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
}:
|
||||
symlinkJoin {
|
||||
name = "QQ";
|
||||
paths = [qq];
|
||||
paths = [ qq ];
|
||||
inherit (qq) meta;
|
||||
buildInputs = [
|
||||
makeWrapper
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{srcs}: let
|
||||
{ srcs }:
|
||||
let
|
||||
inherit (srcs) TrackersListCollection;
|
||||
in
|
||||
TrackersListCollection.src
|
||||
TrackersListCollection.src
|
||||
|
|
|
|||
|
|
@ -79,5 +79,5 @@ buildEnv {
|
|||
ty
|
||||
imagemagick
|
||||
];
|
||||
postBuild = '''';
|
||||
postBuild = "";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,12 +4,14 @@
|
|||
callPackage,
|
||||
buildEnv,
|
||||
lib,
|
||||
}: let
|
||||
}:
|
||||
let
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
inherit (inputs.helix.packages."${system}") helix;
|
||||
runtime = callPackage ./runtime.nix {};
|
||||
runtime = callPackage ./runtime.nix { };
|
||||
helix' = helix.overrideAttrs (
|
||||
_final: prev: let
|
||||
_final: prev:
|
||||
let
|
||||
helix-runtime = buildEnv {
|
||||
name = "helix-runtime";
|
||||
paths = [
|
||||
|
|
@ -17,25 +19,22 @@
|
|||
prev.env.HELIX_DEFAULT_RUNTIME
|
||||
];
|
||||
};
|
||||
in {
|
||||
in
|
||||
{
|
||||
env.HELIX_DEFAULT_RUNTIME = toString helix-runtime;
|
||||
cargoBuildFeatures =
|
||||
(prev.cargoBuildFeatures or [])
|
||||
++ [
|
||||
"git"
|
||||
"steel"
|
||||
];
|
||||
cargoBuildFeatures = (prev.cargoBuildFeatures or [ ]) ++ [
|
||||
"git"
|
||||
"steel"
|
||||
];
|
||||
}
|
||||
);
|
||||
in
|
||||
helix'
|
||||
// {
|
||||
passthru =
|
||||
(helix'.passthru or {})
|
||||
// {
|
||||
languages = lib.pipe "${helix.src}/languages.toml" [
|
||||
builtins.readFile
|
||||
fromTOML
|
||||
];
|
||||
};
|
||||
}
|
||||
helix'
|
||||
// {
|
||||
passthru = (helix'.passthru or { }) // {
|
||||
languages = lib.pipe "${helix.src}/languages.toml" [
|
||||
builtins.readFile
|
||||
fromTOML
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,8 +3,10 @@
|
|||
srcs,
|
||||
stdenv,
|
||||
runCommandLocal,
|
||||
}: let
|
||||
buildGrammar = grammar:
|
||||
}:
|
||||
let
|
||||
buildGrammar =
|
||||
grammar:
|
||||
stdenv.mkDerivation {
|
||||
pname = "helix-tree-sitter-${grammar.name}";
|
||||
version = grammar.version;
|
||||
|
|
@ -58,9 +60,10 @@
|
|||
runHook postFixup
|
||||
'';
|
||||
};
|
||||
grammars = with lib; pipe srcs [(filterAttrs (key: _: hasPrefix "tree-sitter-" key))];
|
||||
grammars = with lib; pipe srcs [ (filterAttrs (key: _: hasPrefix "tree-sitter-" key)) ];
|
||||
|
||||
queries = with lib;
|
||||
queries =
|
||||
with lib;
|
||||
pipe grammars [
|
||||
(mapAttrsToList (
|
||||
_: value: ''
|
||||
|
|
@ -70,7 +73,8 @@
|
|||
''
|
||||
))
|
||||
];
|
||||
grammarLinks = with lib;
|
||||
grammarLinks =
|
||||
with lib;
|
||||
pipe grammars [
|
||||
(builtins.mapAttrs (
|
||||
_: v: {
|
||||
|
|
@ -80,20 +84,20 @@
|
|||
))
|
||||
(mapAttrsToList (_: value: "ln -s ${value.value}/${value.name}.so $out/${value.name}.so"))
|
||||
];
|
||||
grammarDir = runCommandLocal "helix-grammars" {} ''
|
||||
grammarDir = runCommandLocal "helix-grammars" { } ''
|
||||
mkdir -p $out
|
||||
|
||||
${builtins.concatStringsSep "\n" grammarLinks}
|
||||
'';
|
||||
queryDir = runCommandLocal "helix-query" {} ''
|
||||
queryDir = runCommandLocal "helix-query" { } ''
|
||||
mkdir -p $out
|
||||
|
||||
${builtins.concatStringsSep "\n" queries}
|
||||
'';
|
||||
in
|
||||
runCommandLocal "helix-runtime" {} ''
|
||||
mkdir -p $out
|
||||
runCommandLocal "helix-runtime" { } ''
|
||||
mkdir -p $out
|
||||
|
||||
ln -s ${grammarDir} $out/grammars
|
||||
ln -s ${queryDir} $out/queries
|
||||
''
|
||||
ln -s ${grammarDir} $out/grammars
|
||||
ln -s ${queryDir} $out/queries
|
||||
''
|
||||
|
|
|
|||
|
|
@ -1,11 +1,12 @@
|
|||
{
|
||||
srcs,
|
||||
vimUtils,
|
||||
}: let
|
||||
}:
|
||||
let
|
||||
inherit (srcs.nvim_vim-startuptime) src version date;
|
||||
in
|
||||
vimUtils.buildVimPlugin {
|
||||
pname = "vim-startuptime";
|
||||
version = "0-unstable-${date}-git${version}";
|
||||
inherit src;
|
||||
}
|
||||
vimUtils.buildVimPlugin {
|
||||
pname = "vim-startuptime";
|
||||
version = "0-unstable-${date}-git${version}";
|
||||
inherit src;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,5 +6,10 @@
|
|||
jdk25,
|
||||
}:
|
||||
prismlauncher.override {
|
||||
jdks = [jdk17 jdk21 jdk8 jdk25];
|
||||
jdks = [
|
||||
jdk17
|
||||
jdk21
|
||||
jdk8
|
||||
jdk25
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,10 +26,8 @@
|
|||
}
|
||||
];
|
||||
}).overrideAttrs
|
||||
(prev: {
|
||||
postInstall =
|
||||
(prev.postInstall or "")
|
||||
+ ''
|
||||
(prev: {
|
||||
postInstall = (prev.postInstall or "") + ''
|
||||
ln -s ${
|
||||
rootPath + "/assets/radicle-explorer/youthlic-seed-header.png"
|
||||
} $out/images/youthlic-seed-header.png
|
||||
|
|
@ -37,4 +35,4 @@
|
|||
rootPath + "/assets/radicle-explorer/youthlic-seed-avatar.jpg"
|
||||
} $out/images/youthlic-seed-avatar.jpg
|
||||
'';
|
||||
})
|
||||
})
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ vim-full.customize {
|
|||
vim-one
|
||||
vim-airline
|
||||
];
|
||||
opt = [];
|
||||
opt = [ ];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
runCommandLocal,
|
||||
rootPath,
|
||||
}:
|
||||
runCommandLocal "wallpapers" {} ''
|
||||
runCommandLocal "wallpapers" { } ''
|
||||
mkdir -p $out
|
||||
|
||||
cp ${rootPath + "/assets/wallpaper/01.png"} $out/01.png
|
||||
|
|
|
|||
|
|
@ -1,13 +1,14 @@
|
|||
{
|
||||
srcs,
|
||||
wshowkeys,
|
||||
}: let
|
||||
}:
|
||||
let
|
||||
inherit (srcs) wshowkeys-mao;
|
||||
in
|
||||
wshowkeys.overrideAttrs (
|
||||
_final: _prev: {
|
||||
inherit (wshowkeys-mao) src;
|
||||
pname = "wshowkeys-mao";
|
||||
version = wshowkeys-mao.date + "-" + wshowkeys-mao.version;
|
||||
}
|
||||
)
|
||||
wshowkeys.overrideAttrs (
|
||||
_final: _prev: {
|
||||
inherit (wshowkeys-mao) src;
|
||||
pname = "wshowkeys-mao";
|
||||
version = wshowkeys-mao.date + "-" + wshowkeys-mao.version;
|
||||
}
|
||||
)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue