matt1432/nixos-configs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: restructure my custom nix functions
All checks were successful
Discord / discord commits (push) Has been skipped
Details

Browse source
This commit is contained in:
matt1432 2024-08-07 14:47:32 -04:00
parent dafb2cf8ce
commit f06b0d9c5b
10 changed files with 94 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/home/neovim/langs/markdown.nix
View file

@ -9,7 +9,7 @@
inherit (config.vars) neovimIde;
inherit (pkgs) vimPlugins;
inherit (import "${self}/lib.nix" {inherit pkgs;}) buildPlugin;
inherit (import "${self}/lib" {inherit pkgs;}) buildPlugin;
in
lib.mkIf neovimIde {
programs = {

2
common/home/neovim/langs/web.nix
View file

@ -9,7 +9,7 @@
inherit (config.vars) neovimIde;
inherit (pkgs) vimPlugins;
inherit (import "${self}/lib.nix" {inherit pkgs;}) buildPlugin;
inherit (import "${self}/lib" {inherit pkgs;}) buildPlugin;
in
lib.mkIf neovimIde {
programs = {

2
homeManagerModules/firefox/default.nix
View file

@ -9,7 +9,7 @@ self: {
firefox-gx = pkgs.callPackage ./gx-theme.nix {
inherit (self.inputs) firefox-gx-src;
inherit (import "${self}/lib.nix" {}) mkVersion;
inherit (import "${self}/lib" {}) mkVersion;
};
in {
config = {

35
inputs.nix
View file

@ -1,37 +1,6 @@
let
lock = builtins.fromJSON (builtins.readFile ./flake.lock);
lib = import "${builtins.fetchTarball {
url = "https://github.com/NixOS/nixpkgs/archive/${lock.nodes.nixpkgs.locked.rev}.tar.gz";
sha256 = lock.nodes.nixpkgs.locked.narHash;
}}/lib";
inherit (lib) attrValues findFirst foldl' hasAttr listToAttrs matchAttrs map optionalAttrs recursiveUpdate removeAttrs;
recursiveUpdateList = list: foldl' recursiveUpdate {} list;
# Misc functions
mkInput = {type ? "github", ...} @ info: let
input =
findFirst
(x: matchAttrs (removeAttrs info ["inputs"]) (x.original or {})) {}
(attrValues lock.nodes);
mkOverride = i:
optionalAttrs
(hasAttr i (input.inputs or {}))
{inputs.${i}.follows = i;};
in
recursiveUpdateList [
info
{inherit type;}
(mkOverride "systems")
(mkOverride "flake-utils")
(mkOverride "lib-aggregate")
];
mkDep = info: mkInput (recursiveUpdate info {inputs.nixpkgs.follows = "nixpkgs";});
mkHyprDep = info: mkInput (recursiveUpdate info {inputs.hyprland.follows = "hyprland";});
mkSrc = info: mkInput (info // {flake = false;});
inherit (import ./lib {}) lib mkDep mkInput mkHyprDep mkSrc;
inherit (lib) listToAttrs map removeAttrs;
# Inputs
nixTools = {

19
lib/default.nix Normal file
View file

@ -0,0 +1,19 @@
{
inputs ? {},
pkgs ? {},
}: let
lock = builtins.fromJSON (builtins.readFile ../flake.lock);
lib = import "${builtins.fetchTarball {
url = "https://github.com/NixOS/nixpkgs/archive/${lock.nodes.nixpkgs.locked.rev}.tar.gz";
sha256 = lock.nodes.nixpkgs.locked.narHash;
}}/lib";
inherit (lib) optionalAttrs;
mkVersion = src: "0.0.0+" + src.shortRev;
in
{inherit lib mkVersion;}
// (import ./inputs.nix lib lock)
// optionalAttrs (inputs != {}) (import ./flake-lib.nix inputs)
// optionalAttrs (pkgs != {}) (import ./pkgs.nix pkgs mkVersion)

37
lib.nix → lib/flake-lib.nix
View file

@ -1,32 +1,7 @@
{...} @ inputs: rec {
mkVersion = src: "0.0.0+" + src.shortRev;
buildPlugin = pname: src:
inputs.pkgs.vimUtils.buildVimPlugin {
inherit pname src;
version = mkVersion src;
};
buildNodeModules = dir: npmDepsHash: let
pkg = inputs.pkgs.callPackage ({buildNpmPackage, ...}: let
inherit (builtins) readFile fromJSON;
packageJSON = fromJSON (readFile (dir + /package.json));
in
buildNpmPackage {
pname = packageJSON.name;
inherit (packageJSON) version;
src = dir;
inherit npmDepsHash;
dontNpmBuild = true;
}) {};
in "${pkg}/lib/node_modules/${pkg.pname}/node_modules";
# Import pkgs from a nixpkgs
mkPkgs = system: input:
import input {
inputs: rec {
# Import pkgs from a nixpkgs instance
mkPkgs = system: nixpkgs:
import nixpkgs {
inherit system;
config.allowUnfree = true;
overlays =
@ -56,7 +31,7 @@
modules =
[
{home-manager.extraSpecialArgs = specialArgs;}
./common
../common
]
++ mods;
};
@ -77,7 +52,7 @@
};
}
{home-manager = {inherit extraSpecialArgs;};}
./common/nix-on-droid.nix
../common/nix-on-droid.nix
]
++ mods;
};

38
lib/inputs.nix Normal file
View file

@ -0,0 +1,38 @@
lib: lock: let
inherit (lib) attrValues findFirst foldl' hasAttr matchAttrs optionalAttrs recursiveUpdate removeAttrs;
recursiveUpdateList = list: foldl' recursiveUpdate {} list;
in rec {
/**
From an attrset, returns a flake input that has its type defaulted
to `github` and has some of its inputs following this flake's input
of the same name.
It gets information from the `flake.lock` file and can be used thanks
to flakegen
*/
mkInput = {type ? "github", ...} @ info: let
input =
findFirst
(x: matchAttrs (removeAttrs info ["inputs"]) (x.original or {})) {}
(attrValues lock.nodes);
mkOverride = i:
optionalAttrs
(hasAttr i (input.inputs or {}))
{inputs.${i}.follows = i;};
in
recursiveUpdateList [
info
{inherit type;}
(mkOverride "systems")
(mkOverride "flake-utils")
(mkOverride "lib-aggregate")
];
mkDep = info: mkInput (recursiveUpdate info {inputs.nixpkgs.follows = "nixpkgs";});
mkHyprDep = info: mkInput (recursiveUpdate info {inputs.hyprland.follows = "hyprland";});
mkSrc = info: mkInput (info // {flake = false;});
}

24
lib/pkgs.nix Normal file
View file

@ -0,0 +1,24 @@
pkgs: mkVersion: {
buildPlugin = pname: src:
pkgs.vimUtils.buildVimPlugin {
inherit pname src;
version = mkVersion src;
};
buildNodeModules = dir: npmDepsHash: let
pkg = pkgs.callPackage ({buildNpmPackage, ...}: let
inherit (builtins) readFile fromJSON;
packageJSON = fromJSON (readFile (dir + /package.json));
in
buildNpmPackage {
pname = packageJSON.name;
inherit (packageJSON) version;
src = dir;
inherit npmDepsHash;
dontNpmBuild = true;
}) {};
in "${pkg}/lib/node_modules/${pkg.pname}/node_modules";
}

2
nixosModules/ags/default.nix
View file

@ -68,7 +68,7 @@ in {
home = {
file = let
inherit (import "${self}/lib.nix" {inherit pkgs;}) buildNodeModules;
inherit (import "${self}/lib" {inherit pkgs;}) buildNodeModules;
mkType = package: girName: {
"${agsConfigDir}/config/types/@girs/${toLower girName}".source =

2
outputs.nix
View file

@ -53,7 +53,7 @@
systems,
...
}: let
inherit (import "${self}/lib.nix" inputs) mkVersion mkNixOS mkNixOnDroid mkPkgs;
inherit (import ./lib {inherit inputs;}) mkVersion mkNixOS mkNixOnDroid mkPkgs;
perSystem = attrs:
nixpkgs.lib.genAttrs (import systems) (system: