Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: replace lib.pipe with the pipe operator #11

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,15 @@
inputs.nixpkgs.follows = "nixpkgs";
};

nil = {
url = "github:oxalica/nil";
inputs = {
flake-utils.follows = "flake-utils";
nixpkgs.follows = "nixpkgs";
rust-overlay.follows = "rust-overlay";
};
};

disko = {
url = "github:nix-community/disko";
inputs.nixpkgs.follows = "nixpkgs";
Expand Down
2 changes: 1 addition & 1 deletion git-hooks.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
settings.excludes = ["flake.lock"];

settings.hooks = {
alejandra.enable = true;
# alejandra.enable = true; FIXME: wait for the pipe operator support
deadnix.enable = true;
};
};
Expand Down
46 changes: 20 additions & 26 deletions home/niksne/programs/editors/jetbrains.nix
Original file line number Diff line number Diff line change
@@ -1,30 +1,24 @@
{
lib,
pkgs,
...
}: let
ides =
lib.pipe (with pkgs.custom.jetbrains; [
idea-ultimate
# pycharm-professional
# webstorm
# rust-rover
# goland
# phpstorm
# clion
]) [
(builtins.map (
ide:
ide.override {
vmopts = ''
--add-opens=java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED
--add-opens=java.base/jdk.internal.org.objectweb.asm.tree=ALL-UNNAMED
{pkgs, ...}: let
ides = mkIdesList (with pkgs.custom.jetbrains; [
idea-ultimate
# pycharm-professional
# webstorm
# rust-rover
# goland
# phpstorm
# clion
]);

-javaagent:${pkgs.custom.ja-netfilter}/ja-netfilter.jar=jetbrains
'';
}
))
];
mkIdesList = map (ide:
ide.override {
vmopts = ''
--add-opens=java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED
--add-opens=java.base/jdk.internal.org.objectweb.asm.tree=ALL-UNNAMED

-javaagent:${pkgs.custom.ja-netfilter}/ja-netfilter.jar=jetbrains
'';
}
);
in {
programs.jetbrains-remote = {
enable = true;
Expand Down
41 changes: 20 additions & 21 deletions home/niksne/programs/editors/niksvim/binds.nix
Original file line number Diff line number Diff line change
@@ -1,33 +1,32 @@
{lib, ...}: let
mkKeymaps = lib.mapAttrsToList (
name: value: let
keymap = {
key = name;
action = value;
options.silent = true;
};
in (
mkKeymaps = lib.mapAttrsToList (name: value:
{
key = name;
action = value;
options.silent = true;
}
|> (keymap:
if builtins.isString value
then keymap
else
(
keymap
// value
// (
if value ? "mode" && builtins.isString value.mode
then {mode = lib.stringToCharacters value.mode;}
else {}
)
else (
keymap
// value
// (
if value ? "mode" && builtins.isString value.mode
then {mode = lib.stringToCharacters value.mode;}
else {}
)
)
)
);
mkDisabledKeymaps = mode: keymaps:
mkKeymaps (builtins.listToAttrs (builtins.map (key:
lib.nameValuePair key {
keymaps
|> map (key: lib.nameValuePair key {
action = "";
inherit mode;
})
keymaps));
})
|> builtins.listToAttrs
|> mkKeymaps;
in {
programs.nixvim.keymaps =
(mkKeymaps {
Expand Down
12 changes: 8 additions & 4 deletions home/niksne/programs/editors/niksvim/plugins/barbar.nix
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
{lib, ...}: let
goTos =
(lib.pipe 9 [
(builtins.genList (num: lib.nameValuePair "goTo${toString (num + 1)}" {key = "<A-${toString (num + 1)}>";}))
builtins.listToAttrs
])
(
9
|> builtins.genList (num:
toString (num + 1)
|> (n: lib.nameValuePair "goTo${n}" {key = "<A-${n}>";})
)
|> builtins.listToAttrs
)
// {
first.key = "<A-f>";
last.key = "<A-0>";
Expand Down
9 changes: 4 additions & 5 deletions home/niksne/programs/editors/niksvim/plugins/cmp.nix
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
let
mkSources = builtins.map (
source:
if builtins.isString source
then {name = source;}
else source
mkSources = map (source:
if builtins.isString source
then {name = source;}
else source
);
in {
programs.nixvim.plugins = {
Expand Down
35 changes: 16 additions & 19 deletions home/niksne/programs/editors/niksvim/plugins/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,12 @@
...
}: let
mkPluginsList = plugins:
lib.pipe plugins [
(builtins.map (plugin: lib.nameValuePair plugin {enable = true;}))
builtins.listToAttrs
];
plugins
|> map (plugin: lib.nameValuePair plugin {enable = true;})
|> builtins.listToAttrs;

mkExtraPluginsList = lib.mapAttrsToList (
name: {
mkExtraPluginsList = lib.mapAttrsToList (name:
{
package ? null,
owner ? null,
repo ? name,
Expand All @@ -22,8 +21,7 @@
...
}: {
inherit config optional;
plugin =
if package != null
plugin = if package != null
then package
else
pkgs.vimUtils.buildVimPlugin {
Expand All @@ -34,17 +32,16 @@
);

mkExtraPluginsLua = extraPlugins:
lib.pipe extraPlugins [
(lib.filterAttrs (_: {activate ? false, ...}: activate))
(lib.mapAttrsToList (
name: {
setup ? name,
settings ? {},
...
}: "require('${setup}').setup(${config.lib.nixvim.toLuaObject settings})"
))
(builtins.concatStringsSep "\n")
];
extraPlugins
|> lib.filterAttrs (_: {activate ? false, ...}: activate)
|> lib.mapAttrsToList (name:
{
setup ? name,
settings ? {},
...
}: "require('${setup}').setup(${config.lib.nixvim.toLuaObject settings})"
)
|> builtins.concatStringsSep "\n";
in {
imports = [
./barbar.nix
Expand Down
18 changes: 12 additions & 6 deletions home/niksne/programs/editors/niksvim/plugins/lsp.nix
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
{lib, ...}: let
{
inputs,
lib,
pkgs,
...
}: let
mkServersList = servers:
lib.pipe servers [
(builtins.map (server: lib.nameValuePair server {enable = true;}))
builtins.listToAttrs
];
servers
|> map (server: lib.nameValuePair server {enable = true;})
|> builtins.listToAttrs;
in {
programs.nixvim.plugins = {
lsp = {
Expand Down Expand Up @@ -35,13 +39,15 @@ in {
"sqls"
"svelte"
"tailwindcss"
"volar"
"yamlls"
"zls"
])
// {
nil_ls = {
enable = true;
settings.formatting.command = ["alejandra"];
package = inputs.nil.packages.${pkgs.system}.nil;
# settings.formatting.command = ["alejandra"];
};
};
};
Expand Down
7 changes: 3 additions & 4 deletions home/niksne/programs/editors/niksvim/plugins/neotest.nix
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{lib, ...}: let
mkServersList = servers:
lib.pipe servers [
(builtins.map (server: lib.nameValuePair server {enable = true;}))
builtins.listToAttrs
];
servers
|> map (server: lib.nameValuePair server {enable = true;})
|> builtins.listToAttrs;
in {
programs.nixvim.plugins.neotest = {
enable = true;
Expand Down
11 changes: 9 additions & 2 deletions home/niksne/programs/editors/vscodium/settings.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,15 @@
lib,
...
}: let
mkUpper = str:
(lib.toUpper (builtins.substring 0 1 str)) + (builtins.substring 1 (builtins.stringLength str) str);
mkUpper = str: (
str
|> builtins.substring 0 1
|> lib.toUpper
) + (
str
|> builtins.stringLength
|> (l: builtins.substring 1 l str)
);
flavour = mkUpper config.theme.flavor;
in {
programs.vscode.userSettings = {
Expand Down
47 changes: 22 additions & 25 deletions home/niksne/programs/social/nixcord.nix
Original file line number Diff line number Diff line change
Expand Up @@ -210,29 +210,27 @@
};

mkEnabledPluginsFromList = plugins:
lib.pipe plugins [
(builtins.map (
plugin: let
value = {enable = true;};
in
if builtins.isString plugin
then {
name = plugin;
inherit value;
}
else {
inherit (plugin) name;
value = (builtins.removeAttrs plugin ["name"]) // value;
}
))
builtins.listToAttrs
];
plugins
|> map (
plugin: {enable = true;}
|> (value:
if builtins.isString plugin
then {
name = plugin;
inherit value;
}
else {
inherit (plugin) name;
value = (builtins.removeAttrs plugin ["name"]) // value;
}
)
)
|> builtins.listToAttrs;

mkUserPlugins = p:
lib.pipe p [
(p: lib.filterAttrs (_: {platform ? "vencord", ...}: platform == p) plugins.user)
(builtins.mapAttrs (_: {settings ? {}, ...}: settings // {enable = true;}))
];
(_: {platform ? "vencord", ...}: platform == p)
|> (condition: lib.filterAttrs condition plugins.user)
|> builtins.mapAttrs (_: {settings ? {}, ...}: settings // {enable = true;});
in {
imports = [inputs.nixcord.homeManagerModules.nixcord];

Expand All @@ -250,10 +248,9 @@ in {
plugins = mkEnabledPluginsFromList plugins.vencord;
};
userPlugins = builtins.mapAttrs (_: {source, ...}: source) plugins.user;
parseRules.lowerPluginTitles = lib.pipe plugins.user [
(lib.filterAttrs (_: {lowerNamed ? false, ...}: lowerNamed))
(lib.mapAttrsToList (name: _: name))
];
parseRules.lowerPluginTitles = plugins.user
|> lib.filterAttrs (_: {lowerNamed ? false, ...}: lowerNamed)
|> lib.mapAttrsToList (name: _: name);
extraConfig.plugins = mkUserPlugins "vencord";
vencordConfig.plugins = (mkEnabledPluginsFromList plugins.discord) // (mkUserPlugins "discord");
vesktopConfig.plugins = (mkEnabledPluginsFromList plugins.vesktop) // (mkUserPlugins "vesktop");
Expand Down
Loading