Luj/snowfield
1
0
Fork 0
mirror of https://github.com/JulienMalka/snowfield.git synced 2025-04-04 03:01:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merged utils with lib

Browse source
This commit is contained in:
Julien Malka 2021-12-29 16:41:31 +01:00
parent 35817544b1
commit 9889a415df
No known key found for this signature in database
GPG key ID: 3C68E13964FEA07F
3 changed files with 9 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
flake.nix
View file

@ -30,10 +30,10 @@
outputs = { self, home-manager, nixpkgs, unstable, sops-nix, neovim-nightly-overlay, nur, ... }@inputs: outputs = { self, home-manager, nixpkgs, unstable, sops-nix, neovim-nightly-overlay, nur, ... }@inputs:
let let
utils = import ./utils.nix { inherit nixpkgs sops-nix home-manager inputs; nixpkgs-unstable = unstable; };
pkgs = import nixpkgs { system = "x86_64-linux"; }; pkgs = import nixpkgs { system = "x86_64-linux"; };
lib = nixpkgs.lib.extend (import ./lib inputs);
in in
with utils; with lib;
{ {
nixosModules = builtins.listToAttrs (map nixosModules = builtins.listToAttrs (map
(x: { (x: {

12
lib/default.nix
View file

@ -1,5 +1,6 @@
{ nixpkgs, home-manager, sops-nix, nixpkgs-unstable, inputs }: inputs: final: prev:
with builtins;
with builtins; with inputs;
let let
overlay-unstable = final: prev: { overlay-unstable = final: prev: {
@ -14,7 +15,7 @@ in
inherit inputs; inherit inputs;
}; };
modules = builtins.attrValues modules ++ [ modules = builtins.attrValues modules ++ [
./base.nix ../base.nix
sops-nix.nixosModules.sops sops-nix.nixosModules.sops
host-config host-config
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
@ -25,8 +26,8 @@ in
overlay-unstable overlay-unstable
(final: prev: (final: prev:
{ {
tinystatus = prev.pkgs.callPackage ./packages/tinystatus {}; tinystatus = prev.pkgs.callPackage ../packages/tinystatus {};
mosh = prev.pkgs.callPackage ./packages/mosh {}; mosh = prev.pkgs.callPackage ../packages/mosh {};
}) })
]; ];
} }
@ -36,3 +37,4 @@ in
importConfig = with builtins; path: (mapAttrs (name: value: import (path + "/${name}/default.nix")) (readDir path)); importConfig = with builtins; path: (mapAttrs (name: value: import (path + "/${name}/default.nix")) (readDir path));
} }

38
utils.nix
View file

@ -1,38 +0,0 @@
{ nixpkgs, home-manager, sops-nix, nixpkgs-unstable, inputs }:
with builtins;
let
overlay-unstable = final: prev: {
unstable = nixpkgs-unstable.legacyPackages.x86_64-linux;
};
in
{
mkMachine = host: host-config: modules: nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = {
inherit inputs;
};
modules = builtins.attrValues modules ++ [
./base.nix
sops-nix.nixosModules.sops
host-config
home-manager.nixosModules.home-manager
{
home-manager.useUserPackages = true;
nixpkgs.overlays = [
inputs.neovim-nightly-overlay.overlay
overlay-unstable
(final: prev:
{
tinystatus = prev.pkgs.callPackage ./packages/tinystatus {};
mosh = prev.pkgs.callPackage ./packages/mosh {};
})
];
}
];
};
importConfig = with builtins; path: (mapAttrs (name: value: import (path + "/${name}/default.nix")) (readDir path));
}