mirror of
https://github.com/daylinmorgan/oizys.git
synced 2025-01-22 07:07:32 -06:00
apply nixfmt
This commit is contained in:
parent
5acda7664c
commit
565082fd13
9 changed files with 62 additions and 57 deletions
|
@ -101,6 +101,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
nixConfig = {
|
nixConfig = {
|
||||||
|
|
||||||
extra-substituters = [
|
extra-substituters = [
|
||||||
"https://attic.dayl.in/oizys"
|
"https://attic.dayl.in/oizys"
|
||||||
"https://nixpkgs-wayland.cachix.org"
|
"https://nixpkgs-wayland.cachix.org"
|
||||||
|
|
|
@ -166,15 +166,14 @@ let
|
||||||
{
|
{
|
||||||
hostName,
|
hostName,
|
||||||
pkgs,
|
pkgs,
|
||||||
flake ? flakeFromSystem pkgs.system
|
flake ? flakeFromSystem pkgs.system,
|
||||||
}:
|
}:
|
||||||
hostName
|
hostName
|
||||||
|> pathFromHostName
|
|> pathFromHostName
|
||||||
|> (p: "${p}/settings/pkgs")
|
|> (p: "${p}/settings/pkgs")
|
||||||
|> tryReadLinesNoComment
|
|> tryReadLinesNoComment
|
||||||
|> map (
|
|> map (
|
||||||
line:
|
line: if hasPrefix "flake:" line then (line |> removePrefix "flake:" |> flake.pkg) else pkgs.${line}
|
||||||
if hasPrefix "flake:" line then (line |> removePrefix "flake:" |> flake.pkg) else pkgs.${line}
|
|
||||||
);
|
);
|
||||||
|
|
||||||
in
|
in
|
||||||
|
|
|
@ -7,7 +7,13 @@
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
inherit (lib) mkEnableOption mkOption loadOverlays oizysSettings tryPkgsFromFile;
|
inherit (lib)
|
||||||
|
mkEnableOption
|
||||||
|
mkOption
|
||||||
|
loadOverlays
|
||||||
|
oizysSettings
|
||||||
|
tryPkgsFromFile
|
||||||
|
;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
imports = with self.nixosModules; [
|
imports = with self.nixosModules; [
|
||||||
|
|
|
@ -21,7 +21,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||||
dontConfigure = true;
|
dontConfigure = true;
|
||||||
dontBuild = true;
|
dontBuild = true;
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper installShellFiles];
|
nativeBuildInputs = [
|
||||||
|
makeWrapper
|
||||||
|
installShellFiles
|
||||||
|
];
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
runHook preInstall
|
runHook preInstall
|
||||||
|
@ -43,7 +46,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||||
echo 'container_additional_volumes="/nix:/nix"' > $out/share/distrobox/distrobox.conf
|
echo 'container_additional_volumes="/nix:/nix"' > $out/share/distrobox/distrobox.conf
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
ls completions/zsh
|
ls completions/zsh
|
||||||
installShellCompletion --cmd distrbox --zsh completions/zsh/_distrobox
|
installShellCompletion --cmd distrbox --zsh completions/zsh/_distrobox
|
||||||
|
|
|
@ -37,5 +37,4 @@ buildNimPackage (finalAttrs: {
|
||||||
license = lib.licenses.bsd3;
|
license = lib.licenses.bsd3;
|
||||||
mainProgram = "nimble";
|
mainProgram = "nimble";
|
||||||
};
|
};
|
||||||
}
|
})
|
||||||
)
|
|
||||||
|
|
|
@ -12,5 +12,4 @@ buildNimPackage( finalAttrs: {
|
||||||
|
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
lockFile = ./lock.json;
|
lockFile = ./lock.json;
|
||||||
}
|
})
|
||||||
)
|
|
||||||
|
|
|
@ -11,5 +11,4 @@ buildNimPackage( finalAttrs: {
|
||||||
|
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
lockFile = ./lock.json;
|
lockFile = ./lock.json;
|
||||||
}
|
})
|
||||||
)
|
|
||||||
|
|
Loading…
Reference in a new issue