Revert "fix: Remove |> operator to fix ci"
This reverts commit 6a7b5838bc.
This commit is contained in:
parent
ff78d71406
commit
4205a8bcb3
13 changed files with 122 additions and 167 deletions
1
.github/workflows/test.yml
vendored
1
.github/workflows/test.yml
vendored
|
|
@ -21,6 +21,7 @@ jobs:
|
||||||
extra_nix_config: |
|
extra_nix_config: |
|
||||||
trusted-public-keys = youthlic.cachix.org-1:zkUZ/ZGGF5fZxvg5WO3K8XAsUAPFmQKWbnAFb3W5x+Y= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= niri.cachix.org-1:Wv0OmO7PsuocRKzfDoJ3mulSl7Z6oezYhGhR+3W2964= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs= chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=
|
trusted-public-keys = youthlic.cachix.org-1:zkUZ/ZGGF5fZxvg5WO3K8XAsUAPFmQKWbnAFb3W5x+Y= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= niri.cachix.org-1:Wv0OmO7PsuocRKzfDoJ3mulSl7Z6oezYhGhR+3W2964= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs= chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=
|
||||||
substituters = https://youthlic.cachix.org/ https://niri.cachix.org/ https://nix-community.cachix.org/ https://chaotic-nyx.cachix.org/ https://cache.nixos.org/
|
substituters = https://youthlic.cachix.org/ https://niri.cachix.org/ https://nix-community.cachix.org/ https://chaotic-nyx.cachix.org/ https://cache.nixos.org/
|
||||||
|
experimental-features = nix-command flakes pipe-operator
|
||||||
- uses: cachix/cachix-action@v14
|
- uses: cachix/cachix-action@v14
|
||||||
with:
|
with:
|
||||||
name: youthlic
|
name: youthlic
|
||||||
|
|
|
||||||
|
|
@ -39,20 +39,16 @@ in
|
||||||
};
|
};
|
||||||
config = {
|
config = {
|
||||||
flake.deploy.nodes =
|
flake.deploy.nodes =
|
||||||
with lib;
|
|
||||||
pipe
|
|
||||||
[
|
[
|
||||||
"Cape"
|
"Cape"
|
||||||
"Akun"
|
"Akun"
|
||||||
]
|
]
|
||||||
[
|
|> map (
|
||||||
(map (
|
|
||||||
hostName:
|
hostName:
|
||||||
mkDeployNode {
|
mkDeployNode {
|
||||||
inherit hostName;
|
inherit hostName;
|
||||||
}
|
}
|
||||||
))
|
)
|
||||||
(foldr (a: b: a // b) { })
|
|> lib.foldr (a: b: a // b) { };
|
||||||
];
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -9,20 +9,18 @@ let
|
||||||
inherit (self) outputs;
|
inherit (self) outputs;
|
||||||
homeModules =
|
homeModules =
|
||||||
(
|
(
|
||||||
with lib;
|
(rootPath + "/home")
|
||||||
pipe (rootPath + "/home") [
|
|> builtins.readDir
|
||||||
builtins.readDir
|
|> lib.filterAttrs (_key: value: value == "directory")
|
||||||
(filterAttrs (_key: value: value == "directory"))
|
|> lib.filterAttrs (
|
||||||
(filterAttrs (
|
|
||||||
key: _value:
|
key: _value:
|
||||||
!builtins.elem key [
|
!builtins.elem key [
|
||||||
"modules"
|
"modules"
|
||||||
"extra"
|
"extra"
|
||||||
]
|
]
|
||||||
))
|
)
|
||||||
builtins.attrNames
|
|> builtins.attrNames
|
||||||
(flip genAttrs (name: import (rootPath + "/home/${name}/modules")))
|
|> (with lib; flip genAttrs (name: import (rootPath + "/home/${name}/modules")))
|
||||||
]
|
|
||||||
)
|
)
|
||||||
// {
|
// {
|
||||||
default = import "${toString rootPath}/home/modules";
|
default = import "${toString rootPath}/home/modules";
|
||||||
|
|
@ -71,14 +69,11 @@ let
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
flake = {
|
flake = {
|
||||||
homeConfigurations =
|
homeConfigurations = lib.foldr (a: b: a // b) { } (
|
||||||
with lib;
|
|
||||||
foldr (a: b: a // b) { } (
|
|
||||||
pipe
|
|
||||||
[
|
[
|
||||||
# Hostname
|
# Hostname
|
||||||
]
|
]
|
||||||
[ (map (hostName: makeHomeConfiguration { inherit hostName; })) ]
|
|> map (hostName: makeHomeConfiguration { inherit hostName; })
|
||||||
);
|
);
|
||||||
inherit homeModules;
|
inherit homeModules;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -30,13 +30,11 @@ in
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
with lib;
|
|
||||||
pipe
|
|
||||||
[
|
[
|
||||||
"Tytonidae"
|
"Tytonidae"
|
||||||
"Cape"
|
"Cape"
|
||||||
"Akun"
|
"Akun"
|
||||||
]
|
]
|
||||||
[ (flip genAttrs makeNixosConfiguration) ];
|
|> (with lib; flip genAttrs makeNixosConfiguration);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -11,11 +11,9 @@ let
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
flake.overlays =
|
flake.overlays =
|
||||||
with lib;
|
|
||||||
pipe
|
|
||||||
[
|
[
|
||||||
"modifications"
|
"modifications"
|
||||||
"additions"
|
"additions"
|
||||||
]
|
]
|
||||||
[ (flip genAttrs (name: importWithArgs (rootPath + "/overlays/${name}"))) ];
|
|> (with lib; flip genAttrs (name: importWithArgs (rootPath + "/overlays/${name}")));
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -17,15 +17,7 @@ in
|
||||||
programs.alacritty = {
|
programs.alacritty = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.alacritty_git;
|
package = pkgs.alacritty_git;
|
||||||
settings =
|
settings = (./alacritty.toml |> builtins.readFile |> builtins.fromTOML) // {
|
||||||
(
|
|
||||||
with lib;
|
|
||||||
pipe ./alacritty.toml [
|
|
||||||
builtins.readFile
|
|
||||||
builtins.fromTOML
|
|
||||||
]
|
|
||||||
)
|
|
||||||
// {
|
|
||||||
colors = lib.mkForce { };
|
colors = lib.mkForce { };
|
||||||
font.size = lib.mkForce 16;
|
font.size = lib.mkForce 16;
|
||||||
window.opacity = lib.mkForce 0.8;
|
window.opacity = lib.mkForce 0.8;
|
||||||
|
|
|
||||||
|
|
@ -56,12 +56,7 @@ in
|
||||||
enable = true;
|
enable = true;
|
||||||
defaultEditor = true;
|
defaultEditor = true;
|
||||||
extraPackages = cfg.extraPackages;
|
extraPackages = cfg.extraPackages;
|
||||||
settings =
|
settings = ./config.toml |> builtins.readFile |> builtins.fromTOML;
|
||||||
with lib;
|
|
||||||
pipe ./config.toml [
|
|
||||||
builtins.readFile
|
|
||||||
builtins.fromTOML
|
|
||||||
];
|
|
||||||
languages = lib.recursiveUpdate {
|
languages = lib.recursiveUpdate {
|
||||||
language-server = {
|
language-server = {
|
||||||
neocmakelsp = {
|
neocmakelsp = {
|
||||||
|
|
|
||||||
|
|
@ -9,15 +9,13 @@
|
||||||
{
|
{
|
||||||
config = {
|
config = {
|
||||||
environment.etc =
|
environment.etc =
|
||||||
with lib;
|
inputs
|
||||||
pipe inputs [
|
|> lib.mapAttrs' (
|
||||||
(mapAttrs' (
|
|
||||||
name: value:
|
name: value:
|
||||||
lib.nameValuePair "nix/inputs/${name}" {
|
lib.nameValuePair "nix/inputs/${name}" {
|
||||||
source = value;
|
source = value;
|
||||||
}
|
}
|
||||||
))
|
);
|
||||||
];
|
|
||||||
nixpkgs = {
|
nixpkgs = {
|
||||||
config = {
|
config = {
|
||||||
allowUnfree = true;
|
allowUnfree = true;
|
||||||
|
|
@ -74,7 +72,9 @@
|
||||||
experimental-features = [
|
experimental-features = [
|
||||||
"nix-command"
|
"nix-command"
|
||||||
"flakes"
|
"flakes"
|
||||||
];
|
]
|
||||||
|
++ (lib.optional config.lix.enable "pipe-operator")
|
||||||
|
++ (lib.optional (!config.lix.enable) "pipe-operators");
|
||||||
warn-dirty = false;
|
warn-dirty = false;
|
||||||
system-features = [
|
system-features = [
|
||||||
"kvm"
|
"kvm"
|
||||||
|
|
@ -85,17 +85,15 @@
|
||||||
};
|
};
|
||||||
package = pkgs.nix;
|
package = pkgs.nix;
|
||||||
registry =
|
registry =
|
||||||
with lib;
|
inputs
|
||||||
pipe inputs [
|
|> lib.filterAttrs (name: _value: name != "nixpkgs")
|
||||||
(filterAttrs (name: _value: name != "nixpkgs"))
|
|> lib.mapAttrs (
|
||||||
(mapAttrs (
|
|
||||||
_name: value: {
|
_name: value: {
|
||||||
flake = lib.mkForce {
|
flake = lib.mkForce {
|
||||||
outPath = value;
|
outPath = value;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
))
|
);
|
||||||
];
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -3,9 +3,7 @@ final: prev:
|
||||||
let
|
let
|
||||||
inherit (prev) lib;
|
inherit (prev) lib;
|
||||||
in
|
in
|
||||||
with lib;
|
[
|
||||||
pipe
|
|
||||||
[
|
|
||||||
./TrackersListCollection.nix
|
./TrackersListCollection.nix
|
||||||
./OuterWildsTextAdventure.nix
|
./OuterWildsTextAdventure.nix
|
||||||
./editor-runtime.nix
|
./editor-runtime.nix
|
||||||
|
|
@ -17,8 +15,6 @@ pipe
|
||||||
./osu-lazer-bin.nix # typochecker: disable-line
|
./osu-lazer-bin.nix # typochecker: disable-line
|
||||||
|
|
||||||
./pkgsNoCuda.nix
|
./pkgsNoCuda.nix
|
||||||
]
|
]
|
||||||
[
|
|> map (file: import file args)
|
||||||
(map (file: import file args))
|
|> (overlays: (lib.composeManyExtensions overlays) final prev)
|
||||||
(overlays: (lib.composeManyExtensions overlays) final prev)
|
|
||||||
]
|
|
||||||
|
|
|
||||||
|
|
@ -3,9 +3,7 @@ final: prev:
|
||||||
let
|
let
|
||||||
inherit (prev) lib;
|
inherit (prev) lib;
|
||||||
in
|
in
|
||||||
with lib;
|
[
|
||||||
pipe
|
|
||||||
[
|
|
||||||
./niri.nix
|
./niri.nix
|
||||||
./spotifyx.nix
|
./spotifyx.nix
|
||||||
./radicle-explorer.nix
|
./radicle-explorer.nix
|
||||||
|
|
@ -21,8 +19,6 @@ pipe
|
||||||
|
|
||||||
# Nur
|
# Nur
|
||||||
./nur.nix
|
./nur.nix
|
||||||
]
|
]
|
||||||
[
|
|> map (file: import file args)
|
||||||
(map (file: import file args))
|
|> (overlays: (lib.composeManyExtensions overlays) final prev)
|
||||||
(overlays: (lib.composeManyExtensions overlays) final prev)
|
|
||||||
]
|
|
||||||
|
|
|
||||||
|
|
@ -60,30 +60,26 @@ let
|
||||||
runHook postFixup
|
runHook postFixup
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
grammars = with lib; pipe srcs [ (filterAttrs (key: _: hasPrefix "tree-sitter-" key)) ];
|
grammars = srcs |> lib.filterAttrs (key: _: lib.hasPrefix "tree-sitter-" key);
|
||||||
|
|
||||||
queries =
|
queries =
|
||||||
with lib;
|
grammars
|
||||||
pipe grammars [
|
|> lib.mapAttrsToList (
|
||||||
(mapAttrsToList (
|
|
||||||
_: value: ''
|
_: value: ''
|
||||||
mkdir -p $out/${value.name}
|
mkdir -p $out/${value.name}
|
||||||
|
|
||||||
ln -s ${value.src}/queries/* $out/${value.name}/
|
ln -s ${value.src}/queries/* $out/${value.name}/
|
||||||
''
|
''
|
||||||
))
|
);
|
||||||
];
|
|
||||||
grammarLinks =
|
grammarLinks =
|
||||||
with lib;
|
grammars
|
||||||
pipe grammars [
|
|> builtins.mapAttrs (
|
||||||
(builtins.mapAttrs (
|
|
||||||
_: v: {
|
_: v: {
|
||||||
inherit (v) name;
|
inherit (v) name;
|
||||||
value = buildGrammar v;
|
value = buildGrammar v;
|
||||||
}
|
}
|
||||||
))
|
)
|
||||||
(mapAttrsToList (_: value: "ln -s ${value.value}/${value.name}.so $out/${value.name}.so"))
|
|> lib.mapAttrsToList (_: value: "ln -s ${value.value}/${value.name}.so $out/${value.name}.so");
|
||||||
];
|
|
||||||
grammarDir = runCommandLocal "helix-grammars" { } ''
|
grammarDir = runCommandLocal "helix-grammars" { } ''
|
||||||
mkdir -p $out
|
mkdir -p $out
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,10 +7,9 @@
|
||||||
let
|
let
|
||||||
wallpapers =
|
wallpapers =
|
||||||
with lib;
|
with lib;
|
||||||
pipe srcs [
|
srcs
|
||||||
(filterAttrs (name: _value: hasPrefix "wallpaper" name))
|
|> filterAttrs (name: _value: hasPrefix "wallpaper" name)
|
||||||
(concatMapAttrsStringSep "\n" (name: value: "ln -s ${value.src} $out/${name}"))
|
|> concatMapAttrsStringSep "\n" (name: value: "ln -s ${value.src} $out/${name}");
|
||||||
];
|
|
||||||
in
|
in
|
||||||
runCommandLocal "wallpapers" { } ''
|
runCommandLocal "wallpapers" { } ''
|
||||||
mkdir -p $out
|
mkdir -p $out
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
perSystem =
|
perSystem =
|
||||||
{ pkgs, lib, ... }:
|
{ pkgs, ... }:
|
||||||
{
|
{
|
||||||
treefmt = {
|
treefmt = {
|
||||||
programs = {
|
programs = {
|
||||||
|
|
@ -41,12 +41,7 @@
|
||||||
};
|
};
|
||||||
typos =
|
typos =
|
||||||
let
|
let
|
||||||
config =
|
config = ./.typos.toml |> builtins.readFile |> builtins.fromTOML;
|
||||||
with lib;
|
|
||||||
pipe ./.typos.toml [
|
|
||||||
builtins.readFile
|
|
||||||
builtins.fromTOML
|
|
||||||
];
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue